[Android] Remove usage of MCProtocolLib Base64 in SkinUtils + more (#…

…1237) * Remove usage of MCProtocolLib Base64 in SkinUtils * Fix path resolution for downloading locales
GeyserMC · Sep 16, 2020 · 1a49e88 · 1a49e88
1 parent 3c1d4aa
commit 1a49e88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java b/connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java
@@ -133,7 +133,7 @@ public static void downloadAndLoadLocale(String locale) {
      * @param locale Locale to download
      */
     private static void downloadLocale(String locale) {
-        File localeFile = Paths.get(GeyserConnector.getInstance().getBootstrap().getConfigFolder().toString(),"locales",locale + ".json").toFile();
+        File localeFile = GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("locales/" + locale + ".json").toFile();
 
         // Check if we have already downloaded the locale file
         if (localeFile.exists()) {

diff --git a/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java b/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
@@ -270,7 +270,7 @@ public static void handleBedrockSkin(PlayerEntity playerEntity, BedrockClientDat
         GeyserConnector.getInstance().getLogger().info(LanguageUtils.getLocaleStringLog("geyser.skin.bedrock.register", playerEntity.getUsername(), playerEntity.getUuid()));
 
         try {
-            byte[] skinBytes = com.github.steveice10.mc.auth.util.Base64.decode(clientData.getSkinData().getBytes("UTF-8"));
+            byte[] skinBytes = Base64.getDecoder().decode(clientData.getSkinData().getBytes("UTF-8"));
             byte[] capeBytes = clientData.getCapeData();
 
             byte[] geometryNameBytes = Base64.getDecoder().decode(clientData.getGeometryName().getBytes("UTF-8"));