From 9cebcd2cf4b5f8ec947f6facadfb968c7289d3d8 Mon Sep 17 00:00:00 2001
From: artdeell <ultramaksim@gmail.com>
Date: Sun, 13 Nov 2022 14:51:44 +0300
Subject: [PATCH] Add xuid to MinecraftAccount

---
 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java   | 1 +
 .../authenticator/microsoft/MicrosoftBackgroundLogin.java        | 1 +
 .../main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
index 62697792f..350cee200 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -325,6 +325,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.xuid);
         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_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftBackgroundLogin.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftBackgroundLogin.java
index b68173d8d..b6b670745 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftBackgroundLogin.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftBackgroundLogin.java
@@ -78,6 +78,7 @@ public class MicrosoftBackgroundLogin {
                 MinecraftAccount acc = MinecraftAccount.load(mcName);
                 if(acc == null) acc = new MinecraftAccount();
                 if (doesOwnGame) {
+                    acc.xuid = xsts[0];
                     acc.clientToken = "0"; /* FIXME */
                     acc.accessToken = mcToken;
                     acc.username = mcName;
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 6bb2c9ec0..7bbb20d25 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
@@ -23,6 +23,7 @@ public class MinecraftAccount {
     public String selectedVersion = "1.7.10";
     public boolean isMicrosoft = false;
     public String msaRefreshToken = "0";
+    public String xuid;
     public String skinFaceBase64;
     public long expiresAt;