From 5cfa1c33eb13b71608fc780aa5c1a6adfd742dfe Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Sun, 20 Nov 2022 15:56:46 +0700
Subject: [PATCH] Add xuid to MinecraftAccount

---
 JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java     | 2 +-
 .../java/net/kdt/pojavlaunch/value/MinecraftAccount.java | 9 +++------
 Natives/authenticator/MicrosoftAuthenticator.m           | 1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
index 1adb49b7..69967199 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -162,7 +162,7 @@ public final class Tools
         varArgMap.put("auth_access_token", profile.accessToken);
         varArgMap.put("auth_player_name", username);
         varArgMap.put("auth_uuid", profile.profileId);
-        // varArgMap.put("auth_xuid", profile.profileId); // TODO!!!
+        varArgMap.put("auth_xuid", profile.xuid);
         varArgMap.put("assets_root", Tools.ASSETS_PATH);
         varArgMap.put("assets_index_name", versionInfo.assets);
         varArgMap.put("clientid", profile.clientToken);
diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
index c7f1e63b..f5125680 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
@@ -9,8 +9,7 @@ public class MinecraftAccount
     public String clientToken = "0"; // clientID: refresh and invalidate
     public String profileId = "00000000-0000-0000-0000-000000000000"; // authenticate UUID
     public String username = "Steve";
-    public String selectedVersion = "1.7.10";
-    public String msaRefreshToken = "0";
+    public String xuid;
     
     public String save(String outPath) throws IOException {
         Tools.write(outPath, Tools.GLOBAL_GSON.toJson(this));
@@ -35,10 +34,8 @@ public class MinecraftAccount
             acc.profileId = "0";
         } if (acc.username == null) {
             acc.username = "0";
-        } if (acc.selectedVersion == null) {
-            acc.selectedVersion = "1.7.10";
-        } if (acc.msaRefreshToken == null) {
-            acc.msaRefreshToken = "0";
+        } if (acc.xuid == null) {
+            acc.xuid = "0";
         }
         return acc;
     }
diff --git a/Natives/authenticator/MicrosoftAuthenticator.m b/Natives/authenticator/MicrosoftAuthenticator.m
index e15c7596..0fd95ea2 100644
--- a/Natives/authenticator/MicrosoftAuthenticator.m
+++ b/Natives/authenticator/MicrosoftAuthenticator.m
@@ -56,6 +56,7 @@ typedef void(^XSTSCallback)(NSString *xsts, NSString *uhs);
                     callback(NO);
                     return;
                 }
+                self.authData[@"xuid"] = uhs;
                 [self acquireMinecraftToken:uhs xstsToken:xsts callback:callback];
             }];
         };