From e543ee3f5544cb9713545d850acb67bec488964a Mon Sep 17 00:00:00 2001 From: Glavo Date: Thu, 2 Feb 2023 21:35:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=20Forge=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AE=98=E6=96=B9=E6=8E=A8=E8=8D=90=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=20Java=20=E5=90=AF=E5=8A=A8=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=20(#2033)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Share LibraryAnalyzer * Add a new JavaVersionConstraint rule * Update message --- .../jackhuang/hmcl/game/LauncherHelper.java | 22 +++++- .../resources/assets/lang/I18N.properties | 3 +- .../resources/assets/lang/I18N_zh.properties | 5 +- .../assets/lang/I18N_zh_CN.properties | 5 +- .../hmcl/game/JavaVersionConstraint.java | 75 ++++++++++--------- 5 files changed, 66 insertions(+), 44 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java index 0f9080d77..b76096150 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java @@ -25,6 +25,7 @@ import org.jackhuang.hmcl.auth.*; import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException; import org.jackhuang.hmcl.download.DefaultDependencyManager; import org.jackhuang.hmcl.download.DownloadProvider; +import org.jackhuang.hmcl.download.LibraryAnalyzer; import org.jackhuang.hmcl.download.MaintainTask; import org.jackhuang.hmcl.download.game.*; import org.jackhuang.hmcl.download.java.JavaRepository; @@ -408,8 +409,9 @@ public final class LauncherHelper { JavaVersionConstraint violatedMandatoryConstraint = null; List violatedSuggestedConstraints = null; + LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version); for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) { - if (constraint.appliesToVersion(gameVersion, version, javaVersion)) { + if (constraint.appliesToVersion(gameVersion, version, javaVersion, analyzer)) { if (!constraint.checkJava(gameVersion, version, javaVersion)) { if (constraint.getType() == JavaVersionConstraint.RULE_MANDATORY) { violatedMandatoryConstraint = constraint; @@ -493,10 +495,24 @@ public final class LauncherHelper { suggestions.add(i18n("launch.advice.java.modded_java_7")); break; case MODDED_JAVA_8: - suggestions.add(i18n("launch.advice.newer_java")); + // Minecraft>=1.7.10+Forge accepts Java 8 + if (javaVersion.getParsedVersion() < 8) + suggestions.add(i18n("launch.advice.newer_java")); + else + suggestions.add(i18n("launch.advice.modded_java", 8, gameVersion)); break; case MODDED_JAVA_16: - suggestions.add(i18n("launch.advice.forge37_0_60")); + // Minecraft<=1.17.1+Forge[37.0.0,37.0.60) not compatible with Java 17 + String forgePatchVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.FORGE) + .map(LibraryAnalyzer.LibraryType.FORGE::patchVersion) + .orElse(null); + if (forgePatchVersion != null && VersionNumber.VERSION_COMPARATOR.compare(forgePatchVersion, "37.0.60") < 0) + suggestions.add(i18n("launch.advice.forge37_0_60")); + else + suggestions.add(i18n("launch.advice.modded_java", 16, gameVersion)); + break; + case MODDED_JAVA_17: + suggestions.add(i18n("launch.advice.modded_java", 17, gameVersion)); break; case VANILLA_JAVA_8_51: suggestions.add(i18n("launch.advice.java8_51_1_13")); diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index a0d4a841e..ab27b023f 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -635,8 +635,9 @@ launch.advice.forge37_0_60=Forge versions earlier than 37.0.60 are not compatibl launch.advice.java8_1_13=Minecraft 1.13 and later can only be run on Java 8 or later. Please use Java 8 or newer versions. launch.advice.java8_51_1_13=Minecraft 1.13 may crash on Java 8 versions earlier than 1.8.0_51. Please install the latest version of Java 8. launch.advice.java9=You cannot launch Minecraft 1.12 or earlier with Java 9 or newer, please use Java 8 instead. +launch.advice.modded_java=Some Mods may not be compatible with higher versions of Java. It is recommended to use Java %s to start Minecraft %s. launch.advice.modlauncher8=The Forge version you are using is not compatible with the current Java version. Please try updating Forge, or launch the game with Java 8u312/11.0.13/17.0.1 or earlier. -launch.advice.newer_java=Java 8 is recommended for a smoother gaming experience. And for Minecraft 1.12 or higher, and most mods, it is required. +launch.advice.newer_java=You are using the old Java to start the game. It is recommended to update to Java 8, otherwise some mods may cause the game to crash. launch.advice.not_enough_space=You have allocated a memory size larger than the actual %d MB of memory installed on your machine. You may experience degraded performance, or even be unable to launch the game. launch.advice.require_newer_java_version=Minecraft %1$s requires Java %2$s or later, but we could not find one. Do you want to download one now? launch.advice.too_large_memory_for_32bit=You have allocated a memory size larger than the memory limitation of the 32-bit Java installation. You may be unable to launch the game. diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index dc9486a52..a0db8fe3c 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -487,12 +487,13 @@ launch.advice.forge37_0_60=Forge 低於 37.0.60 的版本不相容 Java 17。請 launch.advice.java8_1_13=Minecraft 1.13 只支援 Java 8 或更高版本，請使用 Java 8 或最新版本。 launch.advice.java8_51_1_13=低於 1.8.0_51 的 Java 版本可能會導致 Minecraft 1.13 崩潰。建議您到 https://java.com 安裝最新版的 Java 8。 launch.advice.java9=低於 (包含) 1.13 的有安裝 Mod 的 Minecraft 版本不支援 Java 9 或更高版本，請使用 Java 8。 +launch.advice.modded_java=部分 Mod 可能與高版本 Java 不相容，建議使用 Java %s 啟動 Minecraft %s。 launch.advice.modlauncher8=您所使用的 Forge 版本與當前使用的 Java 不相容。請嘗試更新 Forge，或使用 Java 8u312/11.0.13/17.0.1 及更早版本啟動。是否繼續啟動？ -launch.advice.newer_java=偵測到您未使用 Java 8 及更新版本，Java 8 能使遊戲更順暢而且 Minecraft 1.12 及更新版本和很多 Mod 強制需要 Java 8 版本。 +launch.advice.newer_java=偵測到你正在使用舊版本 Java 啟動遊戲，這可能導致部分 Mod 引發遊戲崩潰，建議更新至 Java 8 後再次啟動。 launch.advice.not_enough_space=您設定的記憶體大小過大，由於超過了系統記憶體大小 %dMB，所以可能影響遊戲體驗或無法啟動遊戲。是否繼續啟動？ launch.advice.require_newer_java_version=Minecraft %1$s 僅能運行在 Java %2$s 或更高版本上，但 HMCL 未能找到該 Java 版本，你可以點擊“是” ，HMCL 會自動下載他，是否下載？ launch.advice.too_large_memory_for_32bit=您設定的記憶體大小過大，由於可能超過了 32 位元 Java 的記憶體分配限制，所以可能無法啟動遊戲，請將記憶體調至低於 1024MB 的值。 -launch.advice.vanilla_linux_java_8=對於 Linux x86-64 平台，Minecraft 1.12.2 及以下版本僅支援 Java 8。\nJava 9+ 版本會無法載入 32 位的 liblwjgl.so。 +launch.advice.vanilla_linux_java_8=對於 Linux x86-64 平台，Minecraft 1.12.2 及以下版本與 Java 9+ 不相容，請使用 Java 8 啟動遊戲。 launch.advice.vanilla_x86.translation=Minecraft 尚未為您的平臺提供完善支持，所以可能影響遊戲體驗或無法啟動遊戲。\n你可以在 這裡 下載 X86-64 架構的 Java 以獲得更完整的體驗。\n是否繼續啟動？ launch.failed=啟動失敗 launch.failed.cannot_create_jvm=偵測到無法建立 Java 虛擬機，可能是 Java 參數有問題。可以在設定中開啟無參數模式啟動。 diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index c400c5a9f..0ba1103fd 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -489,12 +489,13 @@ launch.advice.forge37_0_60=Forge 低于 37.0.60 的版本不兼容 Java 17。请 launch.advice.java8_1_13=Minecraft 1.13 及以上版本只能运行在 Java 8 或更高版本上，请使用 Java 8 或最新版本。 launch.advice.java8_51_1_13=低于 1.8.0_51 的 Java 版本可能会导致 Minecraft 1.13 崩溃，建议更新 Java 至 1.8.0_51 或更高版本后再次启动。 launch.advice.java9=低于 1.13 的有安装 Mod 的 Minecraft 版本不支持 Java 9 或更高版本，请使用 Java 8。 +launch.advice.modded_java=部分 Mod 可能与高版本 Java 不兼容，建议使用 Java %s 启动 Minecraft %s。 launch.advice.modlauncher8=您所使用的 Forge 版本与当前使用的 Java 不兼容。请尝试更新 Forge，或使用 Java 8u312/11.0.13/17.0.1 及更早版本启动。 -launch.advice.newer_java=检测到您未使用 Java 8 及更新版本，Java 8 能使游戏更流畅，而且 Minecraft 1.12 及更新版本和很多 Mod 强制需要 Java 8。 +launch.advice.newer_java=检测到你正在使用旧版本 Java 启动游戏，这可能导致部分 Mod 引发游戏崩溃，建议更新至 Java 8 后再次启动。 launch.advice.not_enough_space=你设置的内存大小过大，超过了系统内存容量 %dMB，可能导致游戏无法启动。 launch.advice.require_newer_java_version=Minecraft %1$s 仅能运行在 Java %2$s 或更高版本上，但 HMCL 未能找到该 Java 版本，你可以点击“是”，HMCL会自动下载他，是否下载？ launch.advice.too_large_memory_for_32bit=您设置的内存大小过大，由于可能超过了 32 位 Java 的内存分配限制，所以可能无法启动游戏，请将内存调至 1024MB 或更小。 -launch.advice.vanilla_linux_java_8=对于 Linux x86-64 平台，Minecraft 1.12.2 及以下版本仅支持 Java 8。\n请到 java.com 或其他途径下载 Java8！\n（可将 Java 路径选择至“自动选择合适的 Java”，启动时会自动下载该 Java）\nJava 9+ 版本会无法加载 32 位的 liblwjgl.so +launch.advice.vanilla_linux_java_8=对于 Linux x86-64 平台，Minecraft 1.12.2 及以下版本与 Java 9+ 不兼容，请使用 Java 8 启动游戏。 launch.advice.vanilla_x86.translation=Minecraft 尚未为您的平台提供完善支持，所以可能影响游戏体验或无法启动游戏。\n你可以在 这里 下载 X86-64 架构的 Java 以获得更完整的体验。 launch.failed=启动失败 launch.failed.cannot_create_jvm=截获到无法创建 Java 虚拟机，可能是 Java 参数有问题，可以在设置中开启无参数模式启动。 diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java index 521037478..7262beb90 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java @@ -32,43 +32,46 @@ import java.util.Objects; import static org.jackhuang.hmcl.download.LibraryAnalyzer.LAUNCH_WRAPPER_MAIN; public enum JavaVersionConstraint { - - // Minecraft>=1.17 requires Java 16 - VANILLA_JAVA_16(JavaVersionConstraint.RULE_MANDATORY, versionRange("1.17", JavaVersionConstraint.MAX), versionRange("16", JavaVersionConstraint.MAX)), - VANILLA_JAVA_17(JavaVersionConstraint.RULE_MANDATORY, versionRange("1.18", JavaVersionConstraint.MAX), versionRange("17", JavaVersionConstraint.MAX)), - // Minecraft<=1.17.1+Forge[37.0.0,37.0.60) not compatible with Java 17 - MODDED_JAVA_16(JavaVersionConstraint.RULE_SUGGESTED, versionIs("1.17.1"), versionRange("16", "16.999")) { - @Override - protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, - @Nullable JavaVersion javaVersion) { - if (version == null) return false; - VersionNumber forgePatchVersion = LibraryAnalyzer.analyze(version) - .getVersion(LibraryAnalyzer.LibraryType.FORGE) - .map(LibraryAnalyzer.LibraryType.FORGE::patchVersion) - .map(VersionNumber::asVersion) - .orElse(null); - return forgePatchVersion != null && forgePatchVersion.compareTo(VersionNumber.asVersion("37.0.60")) < 0; - } - }, // Minecraft>=1.13 requires Java 8 VANILLA_JAVA_8(JavaVersionConstraint.RULE_MANDATORY, versionRange("1.13", JavaVersionConstraint.MAX), versionRange("1.8", JavaVersionConstraint.MAX)), - // Minecraft>=1.7.10+Forge accepts Java 8 - MODDED_JAVA_8(JavaVersionConstraint.RULE_SUGGESTED, versionRange("1.7.10", JavaVersionConstraint.MAX), versionRange("1.8", JavaVersionConstraint.MAX)), + // Minecraft 1.17 requires Java 16 + VANILLA_JAVA_16(JavaVersionConstraint.RULE_MANDATORY, versionRange("1.17", JavaVersionConstraint.MAX), versionRange("16", JavaVersionConstraint.MAX)), + // Minecraft>=1.18 requires Java 17 + VANILLA_JAVA_17(JavaVersionConstraint.RULE_MANDATORY, versionRange("1.18", JavaVersionConstraint.MAX), versionRange("17", JavaVersionConstraint.MAX)), // 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, versionRange(JavaVersionConstraint.MIN, "1.7.2"), versionRange(JavaVersionConstraint.MIN, "1.7.999")) { @Override protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, - @Nullable JavaVersion javaVersion) { - if (version == null) return false; - LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version); - return analyzer.has(LibraryAnalyzer.LibraryType.FORGE); + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { + return version != null && analyzer != null && analyzer.has(LibraryAnalyzer.LibraryType.FORGE); + } + }, + MODDED_JAVA_8(JavaVersionConstraint.RULE_SUGGESTED, versionRange("1.7.10", "1.16.999"), versionRange("1.8", "1.8.999")) { + @Override + protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { + return analyzer != null && analyzer.has(LibraryAnalyzer.LibraryType.FORGE); + } + }, + MODDED_JAVA_16(JavaVersionConstraint.RULE_SUGGESTED, versionRange("1.17", "1.17.999"), versionRange("16", "16.999")) { + @Override + protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { + return analyzer != null && analyzer.has(LibraryAnalyzer.LibraryType.FORGE); + } + }, + MODDED_JAVA_17(JavaVersionConstraint.RULE_SUGGESTED, versionRange("1.18", JavaVersionConstraint.MAX), versionRange("17", "17.999")) { + @Override + protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { + return analyzer != null && analyzer.has(LibraryAnalyzer.LibraryType.FORGE); } }, // LaunchWrapper<=1.12 will crash because LaunchWrapper assumes the system class loader is an instance of URLClassLoader (Java 8) LAUNCH_WRAPPER(JavaVersionConstraint.RULE_MANDATORY, versionRange("0", "1.12.999"), versionRange("0", "1.8.999")) { @Override protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, - @Nullable JavaVersion javaVersion) { + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { if (version == null) return false; return LAUNCH_WRAPPER_MAIN.equals(version.getMainClass()) && version.getLibraries().stream() @@ -82,7 +85,7 @@ public enum JavaVersionConstraint { GAME_JSON(JavaVersionConstraint.RULE_MANDATORY, versionRange(JavaVersionConstraint.MIN, JavaVersionConstraint.MAX), versionRange(JavaVersionConstraint.MIN, JavaVersionConstraint.MAX)) { @Override protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, - @Nullable JavaVersion javaVersion) { + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { if (version == null) return false; // We only checks for 1.7.10 and above, since 1.7.2 with Forge can only run on Java 7, but it is recorded Java 8 in game json, which is not correct. return gameVersionNumber.compareTo(VersionNumber.asVersion("1.7.10")) >= 0 && version.getJavaVersion() != null; @@ -104,7 +107,7 @@ public enum JavaVersionConstraint { VANILLA_LINUX_JAVA_8(JavaVersionConstraint.RULE_MANDATORY, versionRange("0", "1.12.999"), versionRange(JavaVersionConstraint.MIN, "1.8.999")) { @Override protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, - @Nullable JavaVersion javaVersion) { + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { return OperatingSystem.CURRENT_OS == OperatingSystem.LINUX && Architecture.SYSTEM_ARCH == Architecture.X86_64 && (javaVersion == null || javaVersion.getArchitecture() == Architecture.X86_64); @@ -119,7 +122,7 @@ public enum JavaVersionConstraint { VANILLA_X86(JavaVersionConstraint.RULE_SUGGESTED, versionRange(JavaVersionConstraint.MIN, JavaVersionConstraint.MAX), versionRange(JavaVersionConstraint.MIN, JavaVersionConstraint.MAX)) { @Override protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, - @Nullable JavaVersion javaVersion) { + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { if (javaVersion == null || javaVersion.getArchitecture() != Architecture.ARM64) return false; @@ -138,10 +141,9 @@ public enum JavaVersionConstraint { MODLAUNCHER_8(JavaVersionConstraint.RULE_SUGGESTED, versionRange("1.16.3", "1.17.1"), versionRange(JavaVersionConstraint.MIN, JavaVersionConstraint.MAX)) { @Override protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, - @Nullable JavaVersion javaVersion) { - if (version == null || javaVersion == null) return false; - VersionNumber forgePatchVersion = LibraryAnalyzer.analyze(version) - .getVersion(LibraryAnalyzer.LibraryType.FORGE) + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { + if (version == null || javaVersion == null || analyzer == null) return false; + VersionNumber forgePatchVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.FORGE) .map(LibraryAnalyzer.LibraryType.FORGE::patchVersion) .map(VersionNumber::asVersion) .orElse(null); @@ -204,13 +206,13 @@ public enum JavaVersionConstraint { } public final boolean appliesToVersion(@Nullable VersionNumber gameVersionNumber, @Nullable Version version, - @Nullable JavaVersion javaVersion) { + @Nullable JavaVersion javaVersion, LibraryAnalyzer analyzer) { return gameVersionRange.contains(gameVersionNumber) - && appliesToVersionImpl(gameVersionNumber, version, javaVersion); + && appliesToVersionImpl(gameVersionNumber, version, javaVersion, analyzer); } protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, - @Nullable JavaVersion javaVersion) { + @Nullable JavaVersion javaVersion, @Nullable LibraryAnalyzer analyzer) { return true; } @@ -224,8 +226,9 @@ public enum JavaVersionConstraint { public static VersionRanges findSuitableJavaVersionRange(VersionNumber gameVersion, Version version) { Range mandatoryJavaRange = versionRange(MIN, MAX); Range suggestedJavaRange = versionRange(MIN, MAX); + LibraryAnalyzer analyzer = version != null ? LibraryAnalyzer.analyze(version) : null; for (JavaVersionConstraint java : ALL) { - if (java.appliesToVersion(gameVersion, version, null)) { + if (java.appliesToVersion(gameVersion, version, null, analyzer)) { Range javaVersionRange = java.getJavaVersionRange(version); if (java.type == RULE_MANDATORY) { mandatoryJavaRange = mandatoryJavaRange.intersectionWith(javaVersionRange);