feat:修改快速启动的彻底方法

Author: Mine-diamond

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

@@ -25,20 +25,20 @@
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.event.EventManager;
+import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.mod.ModpackProvider;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.util.FileSaver;
 import org.jackhuang.hmcl.setting.VersionIconType;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.FileSaver;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.platform.SystemInfo;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
@@ -55,11 +55,12 @@
 import java.util.stream.Stream;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public final class HMCLGameRepository extends DefaultGameRepository {
     private final Profile profile;
+    private QuickPlayOption quickPlayOption;
 
     // local version settings
     private final Map<String, VersionSetting> localVersionSettings = new HashMap<>();
@@ -110,6 +111,14 @@ 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() {
         localVersionSettings.clear();
@@ -434,6 +443,15 @@ public LaunchOptions getLaunchOptions(String version, JavaRuntime javaVersion, P
                 .setJavaAgents(javaAgents)
                 .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);
+            }
+            quickPlayOption = null;
+        }
+
         if (config().hasProxy()) {
             builder.setProxyType(config().getProxyType());
             builder.setProxyHost(config().getProxyHost());

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

@@ -113,7 +113,8 @@ public void setKeep() {
     }
 
     public void setQuickEnterWorld(String worldFolderName) {
-        this.worldFolderName = worldFolderName;
+        //this.worldFolderName = worldFolderName;
+        profile.getRepository().setQuickPlayOption(new QuickPlayOption(QuickPlayOption.Type.SINGLEPLAYER, worldFolderName));
     }
 
     public void launch() {
@@ -208,9 +209,6 @@ private void launch0() {
                                     : new HMCLProcessListener(repository, version.get(), authInfo, launchOptions, launchingLatch, gameVersion.isPresent())
                     );
                 }).thenComposeAsync(launcher -> { // launcher is prev task's result
-                    if (worldFolderName != null) {
-                        launcher.setQuickEnterWorld(worldFolderName);
-                    }
                     if (scriptFile == null) {
                         return Task.supplyAsync(launcher::launch);
                     } else {

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

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

HMCLCore/src/main/java/org/jackhuang/hmcl/game/LaunchOptions.java

@@ -48,6 +48,8 @@ public class LaunchOptions implements Serializable {
     private Integer height;
     private boolean fullscreen;
     private String serverIp;
+    private String worldFolderName;
+    private String realmID;
     private String wrapper;
     private Proxy.Type proxyType;
     private String proxyHost;
@@ -187,6 +189,18 @@ public String getServerIp() {
         return serverIp;
     }
 
+    /**
+     * The folder name of a local world
+     */
+
+    public String getWorldFolderName() {
+        return worldFolderName;
+    }
+
+    public String getRealmID() {
+        return realmID;
+    }
+
     /**
      * i.e. optirun
      */
@@ -412,6 +426,16 @@ public Builder setServerIp(String serverIp) {
             return this;
         }
 
+        public Builder setWorldFolderName(String worldFolderName) {
+            options.worldFolderName = worldFolderName;
+            return this;
+        }
+
+        public Builder setRealmID(String realmID) {
+            options.realmID = realmID;
+            return this;
+        }
+
         public Builder setWrapper(String wrapper) {
             options.wrapper = wrapper;
             return this;

HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java

@@ -50,7 +50,6 @@
 public class DefaultLauncher extends Launcher {
 
     private final LibraryAnalyzer analyzer;
-    private String worldFolderName;
 
     public DefaultLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options) {
         this(repository, version, authInfo, options, null);
@@ -66,9 +65,6 @@ public DefaultLauncher(GameRepository repository, Version version, AuthInfo auth
         this.analyzer = LibraryAnalyzer.analyze(version, repository.getGameVersion(version).orElse(null));
     }
 
-    public void setQuickEnterWorld(String worldFolderName) {
-        this.worldFolderName = worldFolderName;
-    }
 
     private Command generateCommandLine(Path nativeFolder) throws IOException {
         CommandBuilder res = new CommandBuilder();
@@ -314,7 +310,7 @@ private Command generateCommandLine(Path nativeFolder) throws IOException {
 
             try {
                 ServerAddress parsed = ServerAddress.parse(address);
-                if (!GameVersionNumber.asGameVersion(gameVersion).isAtLeast("1.13", "23w14a")) {
+                if (!GameVersionNumber.asGameVersion(gameVersion).isAtLeast("1.20", "23w14a")) {
                     res.add("--server");
                     res.add(parsed.getHost());
                     res.add("--port");
@@ -328,9 +324,14 @@ private Command generateCommandLine(Path nativeFolder) throws IOException {
             }
         }
 
-        if (worldFolderName != null && GameVersionNumber.asGameVersion(gameVersion).isAtLeast("1.20", "23w14a")) {
+        if (StringUtils.isNotBlank(options.getWorldFolderName()) && GameVersionNumber.asGameVersion(gameVersion).isAtLeast("1.20", "23w14a")) {
             res.add("--quickPlaySingleplayer");
-            res.add(worldFolderName);
+            res.add(options.getWorldFolderName());
+        }
+
+        if (StringUtils.isNotBlank(options.getRealmID()) && GameVersionNumber.asGameVersion(gameVersion).isAtLeast("1.20", "23w14a")) {
+            res.add("--quickPlayRealms");
+            res.add(options.getRealmID());
         }
 
         if (options.isFullscreen())