Hide generated resolved patches in InstallerListPage

2019-08-19 15:39:30 +08:00
parent e7142e4032
commit a2ac3c1f18
3 changed files with 33 additions and 10 deletions
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.download;
 import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.util.Pair;
+import org.jetbrains.annotations.Nullable;

 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,7 +49,7 @@ public final class LibraryAnalyzer {
        return Optional.ofNullable(libraries.get(type)).map(Pair::getValue);
    }

-    public void forEachLibrary(BiConsumer<String, String> callback) {
+    public void forEachLibrary(BiConsumer<String, @Nullable String> callback) {
        for (Map.Entry<String, Pair<Library, String>> entry : libraries.entrySet())
            callback.accept(entry.getKey(), entry.getValue().getValue());
    }
@@ -115,7 +116,7 @@ public final class LibraryAnalyzer {

        Map<String, Pair<Library, String>> libraries = new HashMap<>();

-        for (Library library : version.getLibraries()) {
+        for (Library library : version.resolve(null).getLibraries()) {
            String groupId = library.getGroupId();
            String artifactId = library.getArtifactId();

@@ -128,6 +129,7 @@ public final class LibraryAnalyzer {
        }

        for (Version patch : version.getPatches()) {
+            if (patch.isHidden()) continue;
            libraries.put(patch.getId(), Pair.pair(null, patch.getVersion()));
        }

@@ -135,6 +137,7 @@ public final class LibraryAnalyzer {
    }

    public enum LibraryType {
+        MINECRAFT(true, "game", Pattern.compile("^$"), Pattern.compile("^$")),
        FABRIC(true, "fabric", Pattern.compile("net\\.fabricmc"), Pattern.compile("fabric-loader")),
        FORGE(true, "forge", Pattern.compile("net\\.minecraftforge"), Pattern.compile("forge")),
        LITELOADER(true, "liteloader", Pattern.compile("com\\.mumfrey"), Pattern.compile("liteloader")),
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java
@@ -33,7 +33,6 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -72,6 +71,19 @@ public class Version implements Comparable<Version>, Validation {

    private transient final boolean resolved;

+    public Version(String id) {
+        this(false, id, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, false, null);
+    }
+
+    /**
+     * Constructor for patch
+     * @param id patch id
+     * @param version patch version
+     * @param priority patch priority
+     * @param arguments patch additional arguments
+     * @param mainClass main class to override
+     * @param libraries additional libraries
+     */
    public Version(String id, String version, int priority, Arguments arguments, String mainClass, List<Library> libraries) {
        this(false, id, version, priority, null, arguments, mainClass, null, null, null, null, libraries, null, null, null, null, null, null, null, null, null);
    }
@@ -88,8 +100,8 @@ public class Version implements Comparable<Version>, Validation {
        this.jar = jar;
        this.assetIndex = assetIndex;
        this.assets = assets;
-        this.libraries = libraries == null ? Collections.emptyList() : new LinkedList<>(libraries);
-        this.compatibilityRules = compatibilityRules == null ? null : new LinkedList<>(compatibilityRules);
+        this.libraries = Lang.copyList(libraries);
+        this.compatibilityRules = Lang.copyList(compatibilityRules);
        this.downloads = downloads == null ? null : new HashMap<>(downloads);
        this.logging = logging == null ? null : new HashMap<>(logging);
        this.type = type;
@@ -97,7 +109,7 @@ public class Version implements Comparable<Version>, Validation {
        this.releaseTime = releaseTime == null ? null : (Date) releaseTime.clone();
        this.minimumLauncherVersion = minimumLauncherVersion;
        this.hidden = hidden;
-        this.patches = patches == null ? null : patches.isEmpty() ? null : new LinkedList<>(patches);
+        this.patches = Lang.copyList(patches);
    }

    public Optional<String> getMinecraftArguments() {
@@ -229,7 +241,7 @@ public class Version implements Comparable<Version>, Validation {
                releaseTime,
                Lang.merge(minimumLauncherVersion, parent.minimumLauncherVersion, Math::max),
                hidden,
-                Lang.merge(Lang.merge(parent.patches, Collections.singleton(this.clearPatches().setId("resolved." + getId()))), patches));
+                Lang.merge(Lang.merge(parent.patches, Collections.singleton(this.clearPatches().setHidden(true).setId("resolved." + getId()))), patches));
    }

    protected Version resolve(VersionProvider provider, Set<String> resolvedSoFar) throws VersionNotFoundException {
@@ -269,19 +281,19 @@ public class Version implements Comparable<Version>, Validation {
    }

    protected Version mergePreservingPatches(Version parent) {
-        return parent.addPatch(this.clearPatches().setId("resolved." + getId())).addPatches(patches);
+        return parent.addPatch(this.clearPatches().setHidden(true).setId("resolved." + getId())).addPatches(patches);
    }

    protected Version resolvePreservingPatches(VersionProvider provider, Set<String> resolvedSoFar) throws VersionNotFoundException {
        Version thisVersion;

        if (inheritsFrom == null) {
-            thisVersion = this.jar == null ? this.setJar(id) : this;
+            thisVersion = this;
        } else {
            // To maximize the compatibility.
            if (!resolvedSoFar.add(id)) {
                Logging.LOG.log(Level.WARNING, "Found circular dependency versions: " + resolvedSoFar);
-                thisVersion = this.jar == null ? this.setJar(id) : this;
+                thisVersion = this;
            } else {
                // It is supposed to auto install an version in getVersion.
                thisVersion = mergePreservingPatches(provider.getVersion(inheritsFrom).resolvePreservingPatches(provider, resolvedSoFar));
@@ -295,6 +307,10 @@ public class Version implements Comparable<Version>, Validation {
        return new Version(true, id, version, priority, minecraftArguments, arguments, mainClass, inheritsFrom, jar, assetIndex, assets, libraries, compatibilityRules, downloads, logging, type, time, releaseTime, minimumLauncherVersion, hidden, patches);
    }

+    private Version setHidden(Boolean hidden) {
+        return new Version(true, id, version, priority, minecraftArguments, arguments, mainClass, inheritsFrom, jar, assetIndex, assets, libraries, compatibilityRules, downloads, logging, type, time, releaseTime, minimumLauncherVersion, hidden, patches);
+    }
+
    public Version setId(String id) {
        return new Version(resolved, id, version, priority, minecraftArguments, arguments, mainClass, inheritsFrom, jar, assetIndex, assets, libraries, compatibilityRules, downloads, logging, type, time, releaseTime, minimumLauncherVersion, hidden, patches);
    }
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Lang.java
@@ -129,6 +129,10 @@ public final class Lang {
        return result;
    }

+    public static <T> List<T> copyList(List<T> list) {
+        return list == null ? null : list.isEmpty() ? null : new ArrayList<>(list);
+    }
+
    public static void executeDelayed(Runnable runnable, TimeUnit timeUnit, long timeout, boolean isDaemon) {
        thread(() -> {
            try {