Merge branch 'fix3540/multimc-patch-json' of https://github.com/burningtnt/HMCL into prs

Author: burningtnt

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

@@ -437,6 +437,10 @@ public Version setJar(String jar) {
         return new Version(resolved, id, version, priority, minecraftArguments, arguments, mainClass, inheritsFrom, jar, assetIndex, assets, complianceLevel, javaVersion, libraries, compatibilityRules, downloads, logging, type, time, releaseTime, minimumLauncherVersion, hidden, root, patches);
     }
 
+    public Version setAssetIndex(AssetIndexInfo assetIndex) {
+        return new Version(resolved, id, version, priority, minecraftArguments, arguments, mainClass, inheritsFrom, jar, assetIndex, assets, complianceLevel, javaVersion, libraries, compatibilityRules, downloads, logging, type, time, releaseTime, minimumLauncherVersion, hidden, root, patches);
+    }
+
     public Version setLibraries(List<Library> libraries) {
         return new Version(resolved, id, version, priority, minecraftArguments, arguments, mainClass, inheritsFrom, jar, assetIndex, assets, complianceLevel, javaVersion, libraries, compatibilityRules, downloads, logging, type, time, releaseTime, minimumLauncherVersion, hidden, root, patches);
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCInstancePatch.java

@@ -18,11 +18,13 @@
 package org.jackhuang.hmcl.mod.multimc;
 
 import com.google.gson.annotations.SerializedName;
-import org.jackhuang.hmcl.game.Library;
+import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.util.Immutable;
 import org.jackhuang.hmcl.util.Lang;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -35,6 +37,7 @@ public final class MultiMCInstancePatch {
     private final String name;
     private final String version;
     private final int order;
+    private final AssetIndexInfo assetIndex;
 
     private final String minecraftArguments;
 
@@ -63,10 +66,11 @@ public final class MultiMCInstancePatch {
     @Nullable
     private final List<Library> jarMods;
 
-    public MultiMCInstancePatch(String name, String version, int order, String minecraftArguments, String gameVersion, String mainClass, int[] javaMajors, @Nullable List<String> tweakers, @Nullable List<String> jvmArgs, @Nullable List<Library> _libraries, @Nullable List<Library> libraries, @Nullable List<Library> jarMods) {
+    public MultiMCInstancePatch(String name, String version, int order, AssetIndexInfo assetIndex, String minecraftArguments, String gameVersion, String mainClass, int[] javaMajors, @Nullable List<String> tweakers, @Nullable List<String> jvmArgs, @Nullable List<Library> _libraries, @Nullable List<Library> libraries, @Nullable List<Library> jarMods) {
         this.name = name;
         this.version = version;
         this.order = order;
+        this.assetIndex = assetIndex;
         this.minecraftArguments = minecraftArguments;
         this.gameVersion = gameVersion;
         this.mainClass = mainClass;
@@ -86,6 +90,10 @@ public String getVersion() {
         return version;
     }
 
+    public AssetIndexInfo getAssetIndex() {
+        return assetIndex;
+    }
+
     public String getMinecraftArguments() {
         return minecraftArguments;
     }
@@ -121,4 +129,38 @@ public List<Library> getLibraries() {
     public List<Library> getJarMods() {
         return jarMods != null ? Collections.unmodifiableList(jarMods) : Collections.emptyList();
     }
+
+    public Version asVersion(String patchID) {
+        List<String> arguments = new ArrayList<>();
+        for (String arg : getTweakers()) {
+            arguments.add("--tweakClass");
+            arguments.add(arg);
+        }
+
+        Version version = new Version(patchID)
+                .setVersion(getVersion())
+                .setArguments(new Arguments().addGameArguments(arguments).addJVMArguments(getJvmArgs()))
+                .setMainClass(getMainClass())
+                .setMinecraftArguments(getMinecraftArguments())
+                .setLibraries(getLibraries())
+                .setAssetIndex(getAssetIndex());
+
+        /* TODO: Official Version Json can only store one GameJavaVersion, not a array of all suitable java versions.
+            For compatibility with official launcher and any other launchers, a transform is made between int[] and GameJavaVersion. */
+        int[] majors = getJavaMajors();
+        if (majors != null) {
+            majors = majors.clone();
+            Arrays.sort(majors);
+
+            for (int i = majors.length - 1; i >= 0; i--) {
+                GameJavaVersion jv = GameJavaVersion.get(majors[i]);
+                if (jv != null) {
+                    version = version.setJavaVersion(jv);
+                    break;
+                }
+            }
+        }
+
+        return version;
+    }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackInstallTask.java

@@ -23,7 +23,6 @@
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.game.Arguments;
 import org.jackhuang.hmcl.game.DefaultGameRepository;
-import org.jackhuang.hmcl.game.GameJavaVersion;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.mod.MinecraftInstanceTask;
 import org.jackhuang.hmcl.mod.Modpack;
@@ -194,8 +193,8 @@ public void execute() throws Exception {
             String componentID = entry.getKey();
             String patchJson = Objects.requireNonNull(entry.getValue().getResult());
 
-            if (components.put(componentID, Pair.pair(convertPatchToVersion(
-                    readPatch(patchJson), componentID), null
+            if (components.put(componentID, Pair.pair(readPatch(patchJson).asVersion(
+                    componentID), null
             )) != null) {
                 throw new IllegalArgumentException("Duplicate libraries: " + componentID);
             }
@@ -277,7 +276,7 @@ public void execute() throws Exception {
                         FileUtils.copyDirectory(jm.getPath("/"), mc.getPath("/"));
                     }
                 } else {
-                    Version tc, pp = jp == null ? null : convertPatchToVersion(jp, componentID);
+                    Version tc, pp = jp == null ? null : jp.asVersion(componentID);
 
                     if (original == null) {
                         tc = Objects.requireNonNull(pp, "Original and Json-Patch shouldn't be empty at the same time.");
@@ -300,46 +299,10 @@ public void execute() throws Exception {
     }
 
     private MultiMCInstancePatch readPatch(String patchJson) {
-        MultiMCInstancePatch patch;
         try {
-            patch = JsonUtils.GSON.fromJson(patchJson, MultiMCInstancePatch.class);
+            return JsonUtils.GSON.fromJson(patchJson, MultiMCInstancePatch.class);
         } catch (JsonParseException e) {
             throw new IllegalArgumentException("Cannot parse MultiMC patch json: " + patchJson, e);
         }
-        return patch;
-    }
-
-    private Version convertPatchToVersion(MultiMCInstancePatch patch, String patchID) {
-        List<String> arguments = new ArrayList<>();
-        for (String arg : patch.getTweakers()) {
-            arguments.add("--tweakClass");
-            arguments.add(arg);
-        }
-
-        Version version = new Version(patchID)
-                .setVersion(patch.getVersion())
-                .setArguments(new Arguments().addGameArguments(arguments).addJVMArguments(patch.getJvmArgs()))
-                .setMainClass(patch.getMainClass())
-                .setMinecraftArguments(patch.getMinecraftArguments())
-                .setLibraries(patch.getLibraries());
-
-        // Workaround: Official Version Json can only store one GameJavaVersion, not a array of all suitable java versions.
-        // For compatibility with official launcher and any other launchers,
-        // a transform is made between int[] and GameJavaVersion.
-        int[] majors = patch.getJavaMajors();
-        if (majors != null) {
-            majors = majors.clone();
-            Arrays.sort(majors);
-
-            for (int i = majors.length - 1; i >= 0; i--) {
-                GameJavaVersion jv = GameJavaVersion.get(majors[i]);
-                if (jv != null) {
-                    version = version.setJavaVersion(jv);
-                    break;
-                }
-            }
-        }
-
-        return version;
     }
 }