diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java index 8a145082e..2fca79c2f 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java @@ -1,5 +1,8 @@ package net.kdt.pojavlaunch; +import androidx.annotation.Keep; + +@Keep public class JAssetInfo { public String hash; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java index 2f166583d..dc987fad6 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java @@ -1,9 +1,12 @@ package net.kdt.pojavlaunch; +import androidx.annotation.Keep; + import com.google.gson.annotations.SerializedName; import java.util.Map; +@Keep public class JAssets { @SerializedName("map_to_resources") public boolean mapToResources; public Map objects; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java index 0f32bebb1..c0a37a63c 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java @@ -75,6 +75,7 @@ public class JMinecraftVersionList { public String features; public ArgOS os; + @Keep public static class ArgOS { public String name; public String version; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/AccountSkin.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/AccountSkin.java deleted file mode 100644 index b9965d1f5..000000000 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/AccountSkin.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.kdt.pojavlaunch.value; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.util.Base64; -import java.io.File; -import java.io.IOException; -import java.util.Map; -import net.kdt.pojavlaunch.Tools; -import net.kdt.pojavlaunch.utils.DownloadUtils; - -public class AccountSkin { - public static Bitmap getSkin(String uuid) throws IOException { - Profile p = Tools.GLOBAL_GSON.fromJson(DownloadUtils.downloadString("https://sessionserver.mojang.com/session/minecraft/profile/" + uuid), Profile.class); - for (Property property : p.properties) { - if (property.name.equals("textures")) { - return getSkinFromProperty(Tools.GLOBAL_GSON.fromJson(new String(Base64.decode(property.value, Base64.DEFAULT), "UTF-8"), SkinProperty.class)); - } - } - - return null; - } - - private static Bitmap getSkinFromProperty(SkinProperty p) throws IOException { - for (Map.Entry texture : p.textures.entrySet()) { - if (texture.getKey().equals("SKIN")) { - String skinFile = File.createTempFile("skin", ".png", new File(Tools.DIR_DATA, "cache")).getAbsolutePath(); - Tools.downloadFile(texture.getValue().url.replace("http://","https://"), skinFile); - return BitmapFactory.decodeFile(skinFile); - } - } - - return null; - } - - public static class Texture { - public String url; - } - - public static class SkinProperty { - public Map textures; - } - - public static class Property { - public String name, value; - } - - public static class Profile { - public Property[] properties; - } -} - diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java index f79d37c0e..86d62a666 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/ForgeInstallProfile.java @@ -1,12 +1,16 @@ package net.kdt.pojavlaunch.value; +import androidx.annotation.Keep; + import net.kdt.pojavlaunch.*; +@Keep public class ForgeInstallProfile { // ----- < 1.12.2 Forge Install Profile ----- public ForgeInstallProperties install; public JMinecraftVersionList.Version versionInfo; - + + @Keep public static class ForgeInstallProperties { public String profileName; public String target; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java index d0966f760..f3a66d86b 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java @@ -9,10 +9,13 @@ import java.io.*; import com.google.gson.*; import android.graphics.Bitmap; import android.util.Base64; + +import androidx.annotation.Keep; + import org.apache.commons.io.IOUtils; -public class MinecraftAccount -{ +@Keep +public class MinecraftAccount { public String accessToken = "0"; // access token public String clientToken = "0"; // clientID: refresh and invalidate public String profileId = "00000000-0000-0000-0000-000000000000"; // profile UUID, for obtaining skin diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java index 9d5ead320..653d289ff 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java @@ -1,7 +1,9 @@ package net.kdt.pojavlaunch.value; -public class MinecraftClientInfo -{ +import androidx.annotation.Keep; + +@Keep +public class MinecraftClientInfo { public String sha1; public int size; public String url; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java index c55d43b00..ca81364af 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java @@ -1,6 +1,8 @@ package net.kdt.pojavlaunch.value; -public class MinecraftLibraryArtifact extends MinecraftClientInfo -{ +import androidx.annotation.Keep; + +@Keep +public class MinecraftLibraryArtifact extends MinecraftClientInfo { public String path; } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/PerVersionConfig.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/PerVersionConfig.java index d657de552..5b8837188 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/PerVersionConfig.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/PerVersionConfig.java @@ -1,5 +1,7 @@ package net.kdt.pojavlaunch.value; +import androidx.annotation.Keep; + import com.google.gson.JsonSyntaxException; import com.google.gson.reflect.TypeToken; @@ -10,6 +12,7 @@ import java.io.File; import java.io.IOException; import java.util.HashMap; +@Keep public class PerVersionConfig { static File pvcFile; public static HashMap configMap; @@ -37,6 +40,8 @@ public class PerVersionConfig { public static boolean exists() { return new File(Tools.DIR_GAME_HOME,"per-version-config.json").exists(); } + + @Keep public static class VersionConfig { public String jvmArgs; public String gamePath; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java index b4293b6c6..d370920fe 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java @@ -3,8 +3,7 @@ import com.google.gson.*; import net.kdt.pojavlaunch.*; import java.io.*; -public class LauncherProfiles -{ +public class LauncherProfiles { public static MinecraftLauncherProfiles mainProfileJson; public static File launcherProfilesFile = new File(Tools.DIR_GAME_NEW + "/launcher_profiles.json"); public static MinecraftLauncherProfiles update() { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java index 401572d1d..d1c70619e 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java @@ -1,7 +1,9 @@ package net.kdt.pojavlaunch.value.launcherprofiles; -public class MinecraftAuthenticationDatabase -{ +import androidx.annotation.Keep; + +@Keep +public class MinecraftAuthenticationDatabase { public String accessToken; public String displayName; public String username; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java index c3f1e54e8..c9b8fcea8 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java @@ -1,9 +1,11 @@ package net.kdt.pojavlaunch.value.launcherprofiles; +import androidx.annotation.Keep; + import java.util.*; import net.kdt.pojavlaunch.*; -public class MinecraftLauncherProfiles -{ +@Keep +public class MinecraftLauncherProfiles { public Map profiles = new HashMap<>(); public boolean profilesWereMigrated; public String clientToken; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java index 91604dce9..14330b3e6 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java @@ -1,7 +1,9 @@ package net.kdt.pojavlaunch.value.launcherprofiles; -public class MinecraftLauncherSettings -{ +import androidx.annotation.Keep; + +@Keep +public class MinecraftLauncherSettings { public boolean enableSnapshots; public boolean enableAdvanced; public boolean keepLauncherOpen; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java index 6736cc89b..ce0cf0f0d 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java @@ -1,7 +1,9 @@ package net.kdt.pojavlaunch.value.launcherprofiles; -public class MinecraftProfile -{ +import androidx.annotation.Keep; + +@Keep +public class MinecraftProfile { public String name; public String type; public String created; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java index 3a9d95210..33bed42b0 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java @@ -1,7 +1,9 @@ package net.kdt.pojavlaunch.value.launcherprofiles; -public class MinecraftResolution -{ +import androidx.annotation.Keep; + +@Keep +public class MinecraftResolution { public int width; public int height; } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java index 0bf96e8b6..cc92c978f 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java @@ -1,7 +1,9 @@ package net.kdt.pojavlaunch.value.launcherprofiles; -public class MinecraftSelectedUser -{ +import androidx.annotation.Keep; + +@Keep +public class MinecraftSelectedUser { public String account; public String profile; }