From cacbbfc8edb6fc363e9599d6487061ad497c83c1 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Fri, 13 Jun 2025 17:11:18 +0700
Subject: [PATCH] [FIX] initAfterGson selectedJava and fix texture upload

---
 .../runtime/backend/ProfileSettingsImpl.java   | 18 +++++++++++++++++-
 .../base/request/RequestFeatureAPIImpl.java    |  7 ++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Launcher/src/main/java/pro/gravit/launcher/runtime/backend/ProfileSettingsImpl.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/backend/ProfileSettingsImpl.java
index aee84871..a42c6097 100644
--- a/Launcher/src/main/java/pro/gravit/launcher/runtime/backend/ProfileSettingsImpl.java
+++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/backend/ProfileSettingsImpl.java
@@ -26,7 +26,7 @@ public class ProfileSettingsImpl implements LauncherBackendAPI.ClientProfileSett
     @LauncherNetworkAPI
     private String saveJavaPath;
     transient OptionalView view;
-    transient JavaHelper.JavaVersion selectedJava;
+    transient volatile JavaHelper.JavaVersion selectedJava;
 
     public ProfileSettingsImpl() {
     }
@@ -203,5 +203,21 @@ public void initAfterGson(ClientProfile profile, LauncherBackendImpl backend) {
             }
             enableOptional(opt, (var1, var2) -> {});
         }
+        if(this.saveJavaPath != null) {
+            backend.getAvailableJava().thenAccept((javas) -> {
+                for(var java : javas) {
+                    if(!isCompatible(java)) {
+                        continue;
+                    }
+                    if(java.getPath() == null) {
+                        continue;
+                    }
+                    if(java.getPath().toAbsolutePath().toString().equals(this.saveJavaPath)) {
+                        this.selectedJava = (JavaHelper.JavaVersion) java;
+                        return;
+                    }
+                }
+            });
+        }
     }
 }
diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestFeatureAPIImpl.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestFeatureAPIImpl.java
index 8d6621f8..21fb8bb6 100644
--- a/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestFeatureAPIImpl.java
+++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestFeatureAPIImpl.java
@@ -1,6 +1,7 @@
 package pro.gravit.launcher.base.request;
 
 import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
 import pro.gravit.launcher.base.events.request.VerifySecureLevelKeyRequestEvent;
 import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launcher.base.request.auth.*;
@@ -62,7 +63,10 @@ public CompletableFuture<AuthResponse> auth(String login, AuthMethodPassword pas
             connectType = AuthRequest.ConnectTypes.CLIENT;
         }
         return request.request(new AuthRequest(login, convertAuthPasswordAll(password), authId, false, connectType))
-                .thenApply(response -> new AuthResponse(response.makeUserInfo(), response.oauth));
+                .thenApply(response -> {
+                    Request.setOAuth(authId, response.oauth);
+                    return new AuthResponse(response.makeUserInfo(), response.oauth);
+                });
     }
 
     private AuthRequest.AuthPasswordInterface convertAuthPasswordAll(AuthMethodPassword password) {
@@ -166,6 +170,7 @@ public CompletableFuture<SelfUser> restore(String accessToken, boolean fetchUser
         }
         return request.request(new RestoreRequest(authId, accessToken, extended, fetchUser)).thenApply(e -> {
             // TODO: invalidToken process
+            Request.setOAuth(authId, new AuthRequestEvent.OAuthRequestEvent(accessToken, null, 0));
             return e.userInfo;
         });
     }