Merge pull request #167 from 3arthqu4ke/1.11

Set Offline username
3arthqu4ke · Jul 28, 2024 · 8362acd · 8362acd
2 parents 61bd902 + c5118c7
commit 8362acd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/LauncherProperties.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/LauncherProperties.java
@@ -49,9 +49,16 @@ public interface LauncherProperties extends HmcProperties {
     Property<String> PROFILE_PROPERTIES = string("hmc.profileproperties");
 
     Property<String> FABRIC_URL = string("hmc.fabric.url");
-    Property<Boolean> OFFLINE = bool("hmc.offline");
     Property<Boolean> RE_THROW_LAUNCH_EXCEPTIONS = bool("hmc.rethrow.launch.exceptions");
 
+    Property<Boolean> OFFLINE = bool("hmc.offline");
+    Property<String> OFFLINE_USERNAME = string("hmc.offline.username");
+    Property<String> OFFLINE_UUID = string("hmc.offline.uuid");
+    Property<String> OFFLINE_TOKEN = string("hmc.offline.token");
+    Property<String> OFFLINE_REFRESH_TOKEN = string("hmc.offline.refresh.token");
+    Property<String> OFFLINE_XUID = string("hmc.offline.xuid");
+    Property<String> OFFLINE_CLIENT_ID = string("hmc.offline.client.id");
+
     // TODO: also check hashes for the libraries?
     Property<Long> ASSETS_DELAY = number("hmc.assets.delay");
     Property<Long> ASSETS_RETRIES = number("hmc.assets.retries");

diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/AccountManager.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/AccountManager.java
@@ -44,7 +44,13 @@ public Account login(Config config) throws AuthException {
         }
 
         if (offlineChecker.isOffline()) {
-            return new Account("Offline", OFFLINE_UUID, "", "", "", "");
+            return new Account(
+                config.get(LauncherProperties.OFFLINE_USERNAME, "Offline"),
+                config.get(LauncherProperties.OFFLINE_UUID, OFFLINE_UUID),
+                config.get(LauncherProperties.OFFLINE_TOKEN, ""),
+                config.get(LauncherProperties.OFFLINE_REFRESH_TOKEN, ""),
+                config.get(LauncherProperties.OFFLINE_XUID, ""),
+                config.get(LauncherProperties.OFFLINE_CLIENT_ID, ""));
         }
 
         log.warning("No valid account found!");

diff --git a/...smc-launcher/src/main/java/me/earth/headlessmc/launcher/command/forge/ForgeInstaller.java b/...smc-launcher/src/main/java/me/earth/headlessmc/launcher/command/forge/ForgeInstaller.java
@@ -4,7 +4,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import lombok.var;
-import me.earth.headlessmc.api.command.CommandException;
 import me.earth.headlessmc.launcher.Launcher;
 import me.earth.headlessmc.launcher.files.FileManager;
 import me.earth.headlessmc.launcher.instrumentation.ResourceExtractor;

diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/InMemoryLauncher.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/InMemoryLauncher.java
@@ -3,7 +3,6 @@
 import lombok.CustomLog;
 import lombok.RequiredArgsConstructor;
 import me.earth.headlessmc.api.config.HasConfig;
-import me.earth.headlessmc.launcher.Main;
 import me.earth.headlessmc.launcher.auth.AuthException;
 import me.earth.headlessmc.launcher.files.FileManager;
 import me.earth.headlessmc.launcher.os.OS;