add access token for login

Author: Simeon Kummer

launch.py

@@ -8,10 +8,11 @@ def parse_arguments():
     parser = argparse.ArgumentParser(description="Minecraft Launcher Script")
     parser.add_argument('--uuid', type=str, required=True, help='MCID (UUID) der Person')
     parser.add_argument('--name', type=str, required=True, help='Name des Spielers')
+    parser.add_argument('--token', type=str, required=False, help='Access Token für Online-Server')
     parser.add_argument('--launch-only', action='store_true', help='Nur Spiel starten, keine Installation')
     return parser.parse_args()
 
-# Zufälliges Token generieren (kann auch immer 0 sein, wenn gewünscht)
+# Zufälliges Token generieren (nur als Fallback für Offline-Modus)
 def generate_token():
     return str(random.randint(0, 1000000))  # Beispiel für zufälliges Token, hier eine Zufallszahl
 
@@ -32,9 +33,15 @@ def main():
     options = {
         "username": args.name,
         "uuid": args.uuid,
-        "token": generate_token(),  # Token generieren
+        "token": args.token if args.token else generate_token(),  # Verwende echten Token oder Fallback
     }
 
+    # Log token status for debugging
+    if args.token:
+        print(f"Using fresh Microsoft access token for online server support")
+    else:
+        print(f"No access token provided - using offline mode (cracked account)")
+
     # Minecraft-Startbefehl holen
     minecraft_command = minecraft_launcher_lib.command.get_minecraft_command("fabric-loader-0.16.14-1.21.5", minecraft_directory, options)
     print(" ".join(minecraft_command))  # Kommando ausgeben

src/main.js

@@ -101,7 +101,8 @@ ipcMain.handle('login-microsoft', async () => {
       // Extract necessary data from the Minecraft profile
       const accountData = {
         uuid: minecraftProfile.profile.id,
-        name: minecraftProfile.profile.name
+        name: minecraftProfile.profile.name,
+        refreshToken: xbox.save() // Save refresh token instead of access token
       };
 
       // Save account data - ensure directory exists first
@@ -138,7 +139,11 @@ ipcMain.handle('login-cracked', async () => {
   const uuid = uuidv4();
   const name = "dev";
 
-  const accountData = { uuid, name };
+  const accountData = { 
+    uuid, 
+    name,
+    refreshToken: null // Cracked accounts don't have refresh tokens
+  };
 
   // Save account data - ensure directory exists first
   const accountsDirectory = path.dirname(INSTALL_DIR);
@@ -158,6 +163,33 @@ ipcMain.handle('launch-minecraft', async (event, { uuid, name }) => {
   try {
     const minecraftStarter = new MinecraftStarter();
 
+    // Get fresh access token if this is a Microsoft account
+    let accessToken = null;
+    const accountsPath = path.join(path.dirname(INSTALL_DIR), 'accounts.json');
+    
+    if (fs.existsSync(accountsPath)) {
+      try {
+        const accountData = JSON.parse(fs.readFileSync(accountsPath, 'utf8'));
+        
+        // Check if this is a Microsoft account with a refresh token
+        if (accountData.refreshToken) {
+          try {
+            // Use refresh token to get fresh access token
+            const authManager = new Auth("select_account");
+            const xbox = await authManager.refresh(accountData.refreshToken);
+            const minecraftProfile = await xbox.getMinecraft();
+            accessToken = minecraftProfile.access_token;
+            console.log('Got fresh access token using refresh token');
+          } catch (error) {
+            console.warn('Failed to refresh access token, launching in offline mode:', error);
+            // Continue without token - will work for offline servers
+          }
+        }
+      } catch (error) {
+        console.warn('Could not load account data:', error);
+      }
+    }
+    
     // Check if BlitzClient directory exists
     const blitzClientPath = path.dirname(INSTALL_DIR);
     const minecraftPath = path.join(blitzClientPath, 'minecraft');
@@ -177,7 +209,7 @@ ipcMain.handle('launch-minecraft', async (event, { uuid, name }) => {
     }
 
     // Launch Minecraft
-    const minecraftProcess = minecraftStarter.run(uuid, name);
+    const minecraftProcess = minecraftStarter.run(uuid, name, accessToken);
 
     // If minecraft directory doesn't exist, download mods after startup
     if (!fs.existsSync(minecraftPath)) {

src/minecraftStarter.js

@@ -300,7 +300,7 @@ class MinecraftStarter {
     }
   }
 
-  async run(uuid, name) {
+  async run(uuid, name, accessToken) {
     try {
       const installDir = path.resolve(this.INSTALL_DIR);
       const parentDir = path.dirname(installDir);
@@ -317,6 +317,12 @@ class MinecraftStarter {
         name ? name : 'Whyareyoureadingthis'
       ];
 
+      // Add access token if available
+      if (accessToken) {
+        args.push('--token');
+        args.push(accessToken);
+      }
+
       // If minecraft directory exists, append --launch-only
       if (fs.existsSync(minecraftDir)) {
         args.push('--launch-only');