Support #3000 : Support neoforge.mods.toml (#3031 )

* Support #3000 * Fix #2371 * Rename references. * Code cleanup.
support java from homebrew (#3035 )
2024-05-15 22:24:48 +08:00 · 2024-05-14 00:15:07 +08:00 · 2024-05-13 23:45:46 +08:00 · 2024-05-13 23:41:23 +08:00 · 2024-05-12 20:36:21 +08:00 · 2024-05-07 23:40:18 +08:00
11 changed files with 69 additions and 17 deletions
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Mirror GitHub to Gitee
-        uses: Yikun/hub-mirror-action@v1.3
+        uses: Yikun/hub-mirror-action@v1.4
        with:
          src: github/HMCL-dev
          dst: gitee/huanghongxun
@@ -118,7 +118,7 @@ tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("sha

    manifest {
        attributes(
-            "Created-By" to "Copyright(c) 2013-2023 huangyuhui.",
+            "Created-By" to "Copyright(c) 2013-2024 huangyuhui.",
            "Main-Class" to "org.jackhuang.hmcl.Main",
            "Multi-Release" to "true",
            "Implementation-Version" to project.version,
@@ -354,7 +354,9 @@ public final class LauncherHelper {

                    if (org.jackhuang.hmcl.util.platform.Platform.isCompatibleWithX86Java()) {
                        JavaVersionConstraint.VersionRanges range = JavaVersionConstraint.findSuitableJavaVersionRange(gameVersion, version);
-                        if (range.getMandatory().contains(VersionNumber.asVersion("17.0.1"))) {
+                        if (range.getMandatory().contains(VersionNumber.asVersion("21.0.3"))) {
+                            targetJavaVersion = GameJavaVersion.JAVA_21;
+                        } else if (range.getMandatory().contains(VersionNumber.asVersion("17.0.1"))) {
                            targetJavaVersion = GameJavaVersion.JAVA_17;
                        } else if (range.getMandatory().contains(VersionNumber.asVersion("16.0.1"))) {
                            targetJavaVersion = GameJavaVersion.JAVA_16;
@@ -465,6 +467,11 @@ public final class LauncherHelper {
                                    () -> FXUtils.openLink(OPENJDK_DOWNLOAD_LINK), null);
                            breakAction.run();
                            return Task.fromCompletableFuture(future);
+                        case VANILLA_JAVA_21:
+                            Controllers.confirm(i18n("launch.advice.require_newer_java_version", gameVersion.toString(), 21), i18n("message.warning"),
+                                    () -> FXUtils.openLink(OPENJDK_DOWNLOAD_LINK), null);
+                            breakAction.run();
+                            return Task.fromCompletableFuture(future);
                        case VANILLA_JAVA_8:
                            Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageType.ERROR, breakAction);
                            return Task.fromCompletableFuture(future);
@@ -149,7 +149,7 @@ public class AboutPage extends StackPane {
            IconedTwoLineListItem xz = new IconedTwoLineListItem();
            xz.setTitle("XZ for Java");
            xz.setSubtitle("Lasse Collin, Igor Pavlov, and/or Brett Okken.\nPublic Domain.");
-            xz.setExternalLink("https://xz.tukaani.org/xz-for-java/");
+            xz.setExternalLink("https://tukaani.org/xz/java.html");

            IconedTwoLineListItem fxgson = new IconedTwoLineListItem();
            fxgson.setTitle("fx-gson");
@@ -39,6 +39,8 @@ public enum JavaVersionConstraint {
    VANILLA_JAVA_16(JavaVersionConstraint.RULE_MANDATORY, GameVersionNumber.atLeast("1.17"), VersionNumber.atLeast("16")),
    // Minecraft>=1.18 requires Java 17
    VANILLA_JAVA_17(JavaVersionConstraint.RULE_MANDATORY, GameVersionNumber.atLeast("1.18"), VersionNumber.atLeast("17")),
+    // Minecraft>=1.20.5 requires Java 21
+    VANILLA_JAVA_21(JavaVersionConstraint.RULE_MANDATORY, GameVersionNumber.atLeast("1.20.5"), VersionNumber.atLeast("21")),
    // Minecraft<=1.7.2+Forge requires Java<=7, But LegacyModFixer may fix that problem. So only suggest user using Java 7.
    MODDED_JAVA_7(JavaVersionConstraint.RULE_SUGGESTED, GameVersionNumber.atMost("1.7.2"), VersionNumber.atMost("1.7.999")) {
        @Override
@@ -70,7 +70,6 @@ final class ExitWaiter implements Runnable {
                EventBus.EVENT_BUS.fireEvent(new JVMLaunchFailedEvent(this, process));
                exitType = ProcessListener.ExitType.JVM_ERROR;
            } else if (exitCode != 0 || StringUtils.containsOne(errorLines,
-                    "Someone is closing me!",
                    "Crash report saved to", "Could not save crash report to", "This crash report has been saved to:",
                    "Unable to launch", "An exception was thrown, the game will display an error screen and halt.")) {
                EventBus.EVENT_BUS.fireEvent(new ProcessExitedAbnormallyEvent(this, process));
@@ -112,11 +112,29 @@ public final class ForgeNewModMetadata {
        }
    }

+    private static final int ACC_FORGE = 0x01;
+
+    private static final int ACC_NEO_FORGED = 0x02;
+
    public static LocalModFile fromFile(ModManager modManager, Path modFile, FileSystem fs) throws IOException, JsonParseException {
-        Path modstoml = fs.getPath("META-INF/mods.toml");
-        if (Files.notExists(modstoml))
+        try {
+            return fromFile0("META-INF/mods.toml", ACC_FORGE | ACC_NEO_FORGED, ModLoaderType.FORGE, modManager, modFile, fs);
+        } catch (Exception ignored) {
+        }
+
+        try {
+            return fromFile0("META-INF/neoforge.mods.toml", ACC_NEO_FORGED, ModLoaderType.NEO_FORGED, modManager, modFile, fs);
+        } catch (Exception ignored) {
+        }
+
+        throw new IOException("File " + modFile + " is not a Forge 1.13+ or NeoForge mod.");
+    }
+
+    private static LocalModFile fromFile0(String tomlPath, int loaderACC, ModLoaderType defaultLoader, ModManager modManager, Path modFile, FileSystem fs) throws IOException, JsonParseException {
+        Path modToml = fs.getPath(tomlPath);
+        if (Files.notExists(modToml))
            throw new IOException("File " + modFile + " is not a Forge 1.13+ or NeoForge mod.");
-        Toml toml = new Toml().read(FileUtils.readText(modstoml));
+        Toml toml = new Toml().read(FileUtils.readText(modToml));
        ForgeNewModMetadata metadata = toml.to(ForgeNewModMetadata.class);
        if (metadata == null || metadata.getMods().isEmpty())
            throw new IOException("Mod " + modFile + " `mods.toml` is malformed..");
@@ -132,28 +150,34 @@ public final class ForgeNewModMetadata {
            }
        }

-        ModLoaderType modLoaderType = analyzeModLoader(toml, mod.getModId());
-        if (modLoaderType == null) {
-            throw new IOException("File " + modFile + " is not a Forge 1.13+ or NeoForge mod.");
-        }
+        ModLoaderType type = analyzeLoader(toml, mod.getModId(), loaderACC, defaultLoader);

-        return new LocalModFile(modManager, modManager.getLocalMod(mod.getModId(), modLoaderType), modFile, mod.getDisplayName(), new LocalModFile.Description(mod.getDescription()),
+        return new LocalModFile(modManager, modManager.getLocalMod(mod.getModId(), type), modFile, mod.getDisplayName(), new LocalModFile.Description(mod.getDescription()),
                mod.getAuthors(), jarVersion == null ? mod.getVersion() : mod.getVersion().replace("${file.jarVersion}", jarVersion), "",
                mod.getDisplayURL(),
                metadata.getLogoFile());
    }

-    private static ModLoaderType analyzeModLoader(Toml toml, String modID) {
+    private static ModLoaderType analyzeLoader(Toml toml, String modID, int loaderACC, ModLoaderType defaultLoader) throws IOException {
        List<HashMap<String, Object>> dependencies = toml.getList("dependencies." + modID);
        if (dependencies != null) {
            for (HashMap<String, Object> dependency : dependencies) {
                switch ((String) dependency.get("modId")) {
-                    case "forge": return ModLoaderType.FORGE;
-                    case "neoforge": return ModLoaderType.NEO_FORGED;
+                    case "forge": return checkLoaderACC(loaderACC, ACC_FORGE, ModLoaderType.FORGE);
+                    case "neoforge": return checkLoaderACC(loaderACC, ACC_NEO_FORGED, ModLoaderType.NEO_FORGED);
                }
            }
        }

-        return null;
+        // ??? I have no idea why some of the Forge mods doesn't provide this key.
+        return defaultLoader;
+    }
+
+    private static ModLoaderType checkLoaderACC(int current, int target, ModLoaderType res) throws IOException {
+        if ((target & current) != 0) {
+            return res;
+        } else {
+            throw new IOException("Mismatched loader.");
+        }
    }
 }
@@ -302,6 +302,7 @@ public final class FileUtils {
                case "kde":
                case "mate":
                case "deepin":
+                case "x-cinnamon":
                    return true;
            }
        }
@@ -335,11 +335,18 @@ public final class JavaVersion {
                javaExecutables.add(listDirectory(Paths.get("/Library/Java/JavaVirtualMachines"))
                        .flatMap(dir -> Stream.of(dir.resolve("Contents/Home"), dir.resolve("Contents/Home/jre")))
                        .map(JavaVersion::getExecutable));
+                javaExecutables.add(listDirectory(Paths.get(System.getProperty("user.home"), "Library/Java/JavaVirtualMachines"))
+                        .flatMap(dir -> Stream.of(dir.resolve("Contents/Home"), dir.resolve("Contents/Home/jre")))
+                        .map(JavaVersion::getExecutable));
                javaExecutables.add(listDirectory(Paths.get("/System/Library/Java/JavaVirtualMachines"))
                        .map(dir -> dir.resolve("Contents/Home"))
                        .map(JavaVersion::getExecutable));
                javaExecutables.add(Stream.of(Paths.get("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java")));
                javaExecutables.add(Stream.of(Paths.get("/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/MacOS/itms/java/bin/java")));
+                // Homebrew
+                javaExecutables.add(Stream.of(Paths.get("/opt/homebrew/opt/java/bin/java")));
+                javaExecutables.add(listDirectory(Paths.get("/opt/homebrew/Cellar/openjdk"))
+                        .map(JavaVersion::getExecutable));
                break;

            default:
@@ -745,3 +745,15 @@
 24w12a
 24w13a
 24w14potato
+24w14a
+1.20.5-pre1
+1.20.5-pre2
+1.20.5-pre3
+1.20.5-pre4
+1.20.5-rc1
+1.20.5-rc2
+1.20.5-rc3
+1.20.5
+1.20.6-rc1
+1.20.6
+24w18a
Author	SHA1	Message	Date
Burning_TNT	af3719403d	Support #3000 : Support neoforge.mods.toml (#3031 ) * Support #3000 * Fix #2371 * Rename references. * Code cleanup.	2024-05-15 22:24:48 +08:00
Liyan Zhao	e0764d6f0c	support java from homebrew (#3035 ) * fix: support java from homebrew * fix: support java from homebrew * fix: add ~/Library/Java/JavaVirtualMachine	2024-05-14 00:15:07 +08:00
zkitefly	908f47f75e	Update Copyright (#3010 )	2024-05-13 23:45:46 +08:00
Glavo	a3af719087	支持自动下载 Java 21 (#3045 )	2024-05-13 23:41:23 +08:00
zkitefly	7f13d6646b	Update ExitWaiter.java (#3042 )	2024-05-12 20:36:21 +08:00
Kieran Moy	e8b4c38451	Add cinnamon desktop support (#3017 )	2024-05-07 23:40:18 +08:00
Glavo	38ba6802a0	Bump Hub Mirror Action to 1.4 (#3034 )	2024-05-07 23:36:28 +08:00
Glavo	381eead7b6	将 1.20.5 和 1.20.6 添加至 versions.txt (#3008 ) * 更新 versions.txt * update	2024-05-07 23:27:22 +08:00
3gf8jv4dv	df953e5ea7	Fix NeoForge 2x icon not working (#2994 )	2024-04-17 22:00:28 +08:00
Glavo	2fd2954a06	更新指向 XZ 主页的链接 (#2990 )	2024-04-15 05:37:04 +08:00