diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index b9123853b..84d07d181 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -146,9 +146,9 @@ public final class Tools gameDir.mkdirs(); Map varArgMap = new ArrayMap(); - varArgMap.put("auth_access_token", profile.accessToken == null ? "0" : profile.accessToken); + varArgMap.put("auth_access_token", profile.accessToken); varArgMap.put("auth_player_name", username); - varArgMap.put("auth_uuid", profile.profileId == null ? "0" : profile.profileId); + varArgMap.put("auth_uuid", profile.profileId); varArgMap.put("assets_root", Tools.ASSETS_PATH); varArgMap.put("assets_index_name", versionInfo.assets); varArgMap.put("game_assets", Tools.ASSETS_PATH); diff --git a/app/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/app/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java index f9f1d8141..725286379 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java +++ b/app/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java @@ -5,13 +5,13 @@ import com.google.gson.*; public class MinecraftAccount { - public String accessToken; // access token - public String clientToken; // clientID: refresh and invalidate - public String profileId; // authenticate UUID - public String username; + public String accessToken = "0"; // access token + public String clientToken = "0"; // clientID: refresh and invalidate + public String profileId = "0"; // authenticate UUID + public String username = "Steve"; public String selectedVersion = "1.7.10"; - public boolean isMicrosoft; - public String msaRefreshToken; + public boolean isMicrosoft = false; + public String msaRefreshToken = "0"; public String save(String outPath) throws IOException { Tools.write(outPath, Tools.GLOBAL_GSON.toJson(this)); @@ -27,7 +27,13 @@ public class MinecraftAccount } public static MinecraftAccount load(String path) throws IOException, JsonSyntaxException { - return parse(Tools.read(path)); + MinecraftAccount acc = parse(Tools.read(path)); + if (acc.accessToken == null) { + acc.accessToken = "0"; + } if (acc.profileId == null) { + acc.profileId = "0"; + } + return acc; } public static void clearTempAccount() {