feat: 优化代码

Author: Mine-diamond

HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java

@@ -60,7 +60,6 @@
 
 public final class HMCLGameRepository extends DefaultGameRepository {
     private final Profile profile;
-    private QuickPlayOption quickPlayOption;
 
     // local version settings
     private final Map<String, VersionSetting> localVersionSettings = new HashMap<>();
@@ -111,13 +110,6 @@ public Stream<Version> getDisplayVersions() {
                         .thenComparing(v -> VersionNumber.asVersion(v.getId())));
     }
 
-    public QuickPlayOption getQuickPlayOption() {
-        return quickPlayOption;
-    }
-
-    public void setQuickPlayOption(QuickPlayOption quickPlayOption) {
-        this.quickPlayOption = quickPlayOption;
-    }
 
     @Override
     protected void refreshVersionsImpl() {
@@ -397,6 +389,11 @@ public void globalizeVersionSetting(String id) {
     }
 
     public LaunchOptions getLaunchOptions(String version, JavaRuntime javaVersion, Path gameDir, List<String> javaAgents, List<String> javaArguments, boolean makeLaunchScript) {
+        return getLaunchOptions(version, javaVersion, gameDir, javaAgents, javaArguments, makeLaunchScript, null);
+    }
+
+
+    public LaunchOptions getLaunchOptions(String version, JavaRuntime javaVersion, Path gameDir, List<String> javaAgents, List<String> javaArguments, boolean makeLaunchScript, QuickPlayOption quickPlayOption) {
         VersionSetting vs = getVersionSetting(version);
 
         LaunchOptions.Builder builder = new LaunchOptions.Builder()
@@ -444,10 +441,10 @@ public LaunchOptions getLaunchOptions(String version, JavaRuntime javaVersion, P
                 .setJavaArguments(javaArguments);
 
         if (quickPlayOption != null) {
-            switch (quickPlayOption.type) {
-                case SINGLEPLAYER -> builder.setWorldFolderName(quickPlayOption.target);
-                case MULTIPLAYER -> builder.setServerIp(quickPlayOption.target);
-                case REALM -> builder.setRealmID(quickPlayOption.target);
+            switch (quickPlayOption.type()) {
+                case SINGLEPLAYER -> builder.setWorldFolderName(quickPlayOption.target());
+                case MULTIPLAYER -> builder.setServerIp(quickPlayOption.target());
+                case REALM -> builder.setRealmID(quickPlayOption.target());
             }
             quickPlayOption = null;
         }

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -81,7 +81,7 @@ public final class LauncherHelper {
     private final VersionSetting setting;
     private LauncherVisibility launcherVisibility;
     private boolean showLogs;
-    private String worldFolderName;
+    private QuickPlayOption quickPlayOption;
 
     public LauncherHelper(Profile profile, Account account, String selectedVersion) {
         this.profile = Objects.requireNonNull(profile);
@@ -113,8 +113,7 @@ public void setKeep() {
     }
 
     public void setQuickEnterWorld(String worldFolderName) {
-        //this.worldFolderName = worldFolderName;
-        profile.getRepository().setQuickPlayOption(new QuickPlayOption(QuickPlayOption.Type.SINGLEPLAYER, worldFolderName));
+        quickPlayOption = new QuickPlayOption(QuickPlayOption.Type.SINGLEPLAYER, worldFolderName);
     }
 
     public void launch() {
@@ -195,7 +194,7 @@ private void launch0() {
                 .thenComposeAsync(() -> logIn(account).withStage("launch.state.logging_in"))
                 .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
                     LaunchOptions launchOptions = repository.getLaunchOptions(
-                            selectedVersion, javaVersionRef.get(), profile.getGameDir(), javaAgents, javaArguments, scriptFile != null);
+                            selectedVersion, javaVersionRef.get(), profile.getGameDir(), javaAgents, javaArguments, scriptFile != null, quickPlayOption);
 
                     LOG.info("Here's the structure of game mod directory:\n" + FileUtils.printFileStructure(repository.getModsDirectory(selectedVersion), 10));
 

HMCL/src/main/java/org/jackhuang/hmcl/game/QuickPlayOption.java

@@ -1,13 +1,6 @@
 package org.jackhuang.hmcl.game;
 
-public class QuickPlayOption {
-    Type type;
-    String target;
-
-    public QuickPlayOption(Type type, String target) {
-        this.type = type;
-        this.target = target;
-    }
+public record QuickPlayOption(Type type, String target) {
 
     enum Type {
         SINGLEPLAYER, MULTIPLAYER, REALM