Fix #3540 MultiMC 整合包安装问题

HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java

@@ -281,7 +281,13 @@ public InstallerItemGroup(String gameVersion, Style style) {
 
             for (InstallerItem item : all) {
                 if (!item.resolvedStateProperty.isBound()) {
-                    item.resolvedStateProperty.bind(item.versionProperty);
+                    item.resolvedStateProperty.bind(Bindings.createObjectBinding(() -> {
+                        InstalledState itemVersion = item.versionProperty.get();
+                        if (itemVersion != null) {
+                            return itemVersion;
+                        }
+                        return InstallableState.INSTANCE;
+                    }, item.versionProperty));
                 }
             }
 
@@ -385,7 +391,10 @@ private static final class InstallerItemSkin extends SkinBase<InstallerItem> {
             if (control.id.equals(MINECRAFT.getPatchId())) {
                 removeButton.setVisible(false);
             } else {
-                removeButton.visibleProperty().bind(Bindings.createBooleanBinding(() -> control.resolvedStateProperty.get() instanceof InstalledState, control.resolvedStateProperty));
+                removeButton.visibleProperty().bind(Bindings.createBooleanBinding(() -> {
+                    State state = control.resolvedStateProperty.get();
+                    return state instanceof InstalledState && !((InstalledState) state).external;
+                }, control.resolvedStateProperty));
             }
             removeButton.managedProperty().bind(removeButton.visibleProperty());
             removeButton.setOnAction(e -> {

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricInstallTask.java

@@ -124,7 +124,7 @@ private Version getPatch(FabricInfo fabricInfo, String gameVersion, String loade
         libraries.add(new Library(Artifact.fromDescriptor(fabricInfo.intermediary.maven), "https://maven.fabricmc.net/", null));
         libraries.add(new Library(Artifact.fromDescriptor(fabricInfo.loader.maven), "https://maven.fabricmc.net/", null));
 
-        return new Version(LibraryAnalyzer.LibraryType.FABRIC.getPatchId(), loaderVersion, 30000, arguments, mainClass, libraries);
+        return new Version(LibraryAnalyzer.LibraryType.FABRIC.getPatchId(), loaderVersion, Version.PRIORITY_LOADER, arguments, mainClass, libraries);
     }
 
     public static class FabricInfo {

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeNewInstallTask.java

@@ -410,7 +410,7 @@ public void execute() throws Exception {
                         dependencyManager.checkLibraryCompletionAsync(forgeVersion, true)));
 
         setResult(forgeVersion
-                .setPriority(30000)
+                .setPriority(Version.PRIORITY_LOADER)
                 .setId(LibraryAnalyzer.LibraryType.FORGE.getPatchId())
                 .setVersion(selfVersion));
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeOldInstallTask.java

@@ -82,7 +82,7 @@ public void execute() throws Exception {
             }
 
             setResult(installProfile.getVersionInfo()
-                    .setPriority(30000)
+                    .setPriority(Version.PRIORITY_LOADER)
                     .setId(LibraryAnalyzer.LibraryType.FORGE.getPatchId())
                     .setVersion(selfVersion));
             dependencies.add(dependencyManager.checkLibraryCompletionAsync(installProfile.getVersionInfo(), true));

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameInstallTask.java

@@ -65,7 +65,7 @@ public boolean isRelyingOnDependencies() {
     @Override
     public void execute() throws Exception {
         Version patch = JsonUtils.fromNonNullJson(downloadTask.getResult(), Version.class)
-                .setId(MINECRAFT.getPatchId()).setVersion(remote.getGameVersion()).setJar(null).setPriority(0);
+                .setId(MINECRAFT.getPatchId()).setVersion(remote.getGameVersion()).setJar(null).setPriority(Version.PRIORITY_MC);
         setResult(patch);
 
         Version version = new Version(this.version.getId()).addPatch(patch);

HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeOldInstallTask.java

@@ -406,7 +406,7 @@ public void execute() throws Exception {
                         dependencyManager.checkLibraryCompletionAsync(neoForgeVersion, true)));
 
         setResult(neoForgeVersion
-                .setPriority(30000)
+                .setPriority(Version.PRIORITY_LOADER)
                 .setId(LibraryAnalyzer.LibraryType.NEO_FORGE.getPatchId())
                 .setVersion(selfVersion));
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltInstallTask.java

@@ -120,7 +120,7 @@ private Version getPatch(QuiltInfo quiltInfo, String gameVersion, String loaderV
         libraries.add(new Library(Artifact.fromDescriptor(quiltInfo.intermediary.maven), getMavenRepositoryByGroup(quiltInfo.intermediary.maven), null));
         libraries.add(new Library(Artifact.fromDescriptor(quiltInfo.loader.maven), getMavenRepositoryByGroup(quiltInfo.loader.maven), null));
 
-        return new Version(LibraryAnalyzer.LibraryType.QUILT.getPatchId(), loaderVersion, 30000, arguments, mainClass, libraries);
+        return new Version(LibraryAnalyzer.LibraryType.QUILT.getPatchId(), loaderVersion, Version.PRIORITY_LOADER, arguments, mainClass, libraries);
     }
 
     private static String getMavenRepositoryByGroup(String maven) {

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

@@ -79,8 +79,12 @@ public Arguments addJVMArguments(String... jvmArguments) {
     }
 
     public Arguments addJVMArguments(List<String> jvmArguments) {
-        List<Argument> list = jvmArguments.stream().map(StringArgument::new).collect(Collectors.toList());
-        return new Arguments(getGame(), Lang.merge(getJvm(), list));
+        return addJVMArgumentsDirect(jvmArguments.stream().map(StringArgument::new).collect(Collectors.toList()));
+    }
+
+    // TODO: How to distinguish addJVMArgumentsDirect from addJVMArguments? Naming is hard :)
+    public Arguments addJVMArgumentsDirect(List<Argument> jvmArguments) {
+        return new Arguments(getGame(), Lang.merge(getJvm(), jvmArguments));
     }
 
     public static Arguments merge(Arguments a, Arguments b) {

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

@@ -95,10 +95,15 @@ public File getLibrariesDirectory(Version version) {
 
     @Override
     public File getLibraryFile(Version version, Library lib) {
-        if ("local".equals(lib.getHint()) && lib.getFileName() != null)
-            return new File(getVersionRoot(version.getId()), "libraries/" + lib.getFileName());
-        else
-            return new File(getLibrariesDirectory(version), lib.getPath());
+        if ("local".equals(lib.getHint())) {
+            if (lib.getFileName() != null) {
+                return new File(getVersionRoot(version.getId()), "libraries/" + lib.getFileName());
+            }
+
+            return new File(getVersionRoot(version.getId()), "libraries/" + lib.getArtifact().getFileName());
+        }
+
+        return new File(getLibrariesDirectory(version), lib.getPath());
     }
 
     public Path getArtifactFile(Version version, Artifact artifact) {

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

@@ -17,21 +17,19 @@
  */
 package org.jackhuang.hmcl.game;
 
-import com.google.gson.*;
+import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.Immutable;
+import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.gson.TolerableValidationException;
 import org.jackhuang.hmcl.util.gson.Validation;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * A class that describes a Minecraft dependency.
@@ -40,6 +38,40 @@
  */
 @Immutable
 public class Library implements Comparable<Library>, Validation {
+    /**
+     * <p>A possible native descriptors can be: [variant-]os[-key]</p>
+     *
+     * <p>
+     * Variant can be empty string, 'native', or 'natives'.
+     * Key can be empty string, system arch, or system arch bit count.
+     * </p>
+     */
+    private static final String[] POSSIBLE_NATIVE_DESCRIPTORS;
+
+    static {
+        String[] keys = {
+                "",
+                Architecture.SYSTEM_ARCH.name().toLowerCase(Locale.ROOT),
+                Architecture.SYSTEM_ARCH.getBits().getBit()
+        }, variants = {"", "native", "natives"};
+
+        POSSIBLE_NATIVE_DESCRIPTORS = new String[keys.length * variants.length];
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < keys.length; i++) {
+            for (int j = 0; j < variants.length; j++) {
+                if (!variants[j].isEmpty()) {
+                    builder.append(variants[j]).append('-');
+                }
+                builder.append(OperatingSystem.CURRENT_OS.getMojangName());
+                if (!keys[i].isEmpty()) {
+                    builder.append('-').append(keys[i]);
+                }
+
+                POSSIBLE_NATIVE_DESCRIPTORS[i * variants.length + j] = builder.toString();
+                builder.setLength(0);
+            }
+        }
+    }
 
     @SerializedName("name")
     private final Artifact artifact;
@@ -93,13 +125,27 @@ public String getVersion() {
     }
 
     public String getClassifier() {
-        if (artifact.getClassifier() == null)
-            if (natives != null && natives.containsKey(OperatingSystem.CURRENT_OS.getMojangName()))
-                return natives.get(OperatingSystem.CURRENT_OS.getMojangName()).replace("${arch}", Architecture.SYSTEM_ARCH.getBits().getBit());
-            else
-                return null;
-        else
+        if (artifact.getClassifier() == null) {
+            if (natives != null) {
+                for (String nativeDescriptor : POSSIBLE_NATIVE_DESCRIPTORS) {
+                    String nd = natives.get(nativeDescriptor);
+                    if (nd != null) {
+                        return nd.replace("${arch}", Architecture.SYSTEM_ARCH.getBits().getBit());
+                    }
+                }
+            } else if (downloads != null && downloads.getClassifiers() != null) {
+                for (String nativeDescriptor : POSSIBLE_NATIVE_DESCRIPTORS) {
+                    LibraryDownloadInfo info = downloads.getClassifiers().get(nativeDescriptor);
+                    if (info != null) {
+                        return nativeDescriptor;
+                    }
+                }
+            }
+
+            return null;
+        } else {
             return artifact.getClassifier();
+        }
     }
 
     public ExtractRules getExtract() {
@@ -111,10 +157,17 @@ public boolean appliesToCurrentEnvironment() {
     }
 
     public boolean isNative() {
-        return natives != null && appliesToCurrentEnvironment();
+        if (!appliesToCurrentEnvironment()) {
+            return false;
+        }
+        if (natives != null) {
+            return true;
+        }
+
+        return downloads != null && downloads.getClassifiers().keySet().stream().anyMatch(s -> s.startsWith("native"));
     }
 
-    protected LibraryDownloadInfo getRawDownloadInfo() {
+    public LibraryDownloadInfo getRawDownloadInfo() {
         if (downloads != null) {
             if (isNative())
                 return downloads.getClassifiers().get(getClassifier());
@@ -125,6 +178,10 @@ protected LibraryDownloadInfo getRawDownloadInfo() {
         }
     }
 
+    public Artifact getArtifact() {
+        return artifact;
+    }
+
     public String getPath() {
         LibraryDownloadInfo temp = getRawDownloadInfo();
         if (temp != null && temp.getPath() != null)
@@ -137,12 +194,28 @@ public LibraryDownloadInfo getDownload() {
         LibraryDownloadInfo temp = getRawDownloadInfo();
         String path = getPath();
         return new LibraryDownloadInfo(path,
-                Optional.ofNullable(temp).map(LibraryDownloadInfo::getUrl).orElse(Optional.ofNullable(url).orElse(Constants.DEFAULT_LIBRARY_URL) + path),
+                computePath(temp, path),
                 temp != null ? temp.getSha1() : null,
                 temp != null ? temp.getSize() : 0
         );
     }
 
+    private String computePath(LibraryDownloadInfo raw, String path) {
+        if (raw != null) {
+            String url = raw.getUrl();
+            if (url != null) {
+                return url;
+            }
+        }
+
+        String repo = Lang.requireNonNullElse(url, Constants.DEFAULT_LIBRARY_URL);
+        if (!repo.endsWith("/")) {
+            repo += '/';
+        }
+
+        return repo + path;
+    }
+
     public boolean hasDownloadURL() {
         LibraryDownloadInfo temp = getRawDownloadInfo();
         if (temp != null) return temp.getUrl() != null;
@@ -159,6 +232,7 @@ public List<CompatibilityRule> getRules() {
 
     /**
      * Hint for how to locate the library file.
+     *
      * @return null for default, "local" for location in version/&lt;version&gt;/libraries/filename
      */
     @Nullable
@@ -168,6 +242,7 @@ public String getHint() {
 
     /**
      * Available when hint is "local"
+     *
      * @return the filename of the local library in version/&lt;version&gt;/libraries/$filename
      */
     @Nullable

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

@@ -24,7 +24,6 @@
 import java.util.regex.Pattern;
 
 /**
- *
  * @author huangyuhui
  */
 public final class OSRestriction {
@@ -57,19 +56,28 @@ public OSRestriction(String name, String version, String arch) {
         this.arch = arch;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public String getArch() {
-        return arch;
-    }
-
     public boolean allow() {
+        // Some modpacks directly use { name: "win-x86" }
+        if (name != null) {
+            String[] parts = name.split("-", 3);
+            if (parts.length == 2) {
+                OperatingSystem os = OperatingSystem.parseOSName(parts[0]);
+                Architecture arch = Architecture.parseArchName(parts[1]);
+
+                if (os != OperatingSystem.UNKNOWN && arch != Architecture.UNKNOWN) {
+                    if (os != OperatingSystem.CURRENT_OS && !(os == OperatingSystem.LINUX && OperatingSystem.CURRENT_OS.isLinuxOrBSD())) {
+                        return false;
+                    }
+
+                    if (arch != Architecture.SYSTEM_ARCH) {
+                        return false;
+                    }
+
+                    return true;
+                }
+            }
+        }
+
         OperatingSystem os = OperatingSystem.parseOSName(name);
         if (os != OperatingSystem.UNKNOWN
                 && os != OperatingSystem.CURRENT_OS
@@ -85,5 +93,4 @@ public boolean allow() {
 
         return true;
     }
-
 }