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 89d1914cd..9253524fa 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java @@ -493,9 +493,15 @@ public final class LauncherHelper { case MODDED_JAVA_8: Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageType.WARNING, continueAction); break; + case MODDED_JAVA_16: + Controllers.dialog(i18n("launch.advice.forge37_0_60"), i18n("message.warning"), MessageType.WARNING, continueAction); + break; case VANILLA_JAVA_8_51: Controllers.dialog(i18n("launch.advice.java8_51_1_13"), i18n("message.warning"), MessageType.WARNING, continueAction); break; + case MODLAUNCHER_8: + Controllers.dialog(i18n("launch.advice.modlauncher8"), i18n("message.warning"), MessageType.WARNING, continueAction); + break; } } diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index bf6f7b1cf..d8cc97b98 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -459,6 +459,7 @@ launch.advice.uncorrected=If you are sure that the game can be started normally, launch.advice.different_platform=Your OS is 64-Bit but your Java is 32-Bit. The 64-Bit Java is recommended. launch.advice.forge2760_liteloader=Forge 2760 and higher are not compatible with LiteLoader, please consider upgrading Forge to 2773 or later. Shall we continue launching? launch.advice.forge28_2_2_optifine=Forge 28.2.2 and later versions are not compatible with OptiFine. Please consider downgrading Forge to 28.2.1 or earlier versions. Shall we continue launching? +launch.advice.forge37_0_60=Forge versions earlier than 37.0.60 are not compatible with Java 17. Please update forge or start the game with Java 16. Shall we continue launching? launch.advice.java8_1_13=Minecraft 1.13 and later can only run on Java 8 or later. launch.advice.java8_51_1_13=Minecraft 1.13 may crash on Java 8 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 later versions of Java. @@ -467,6 +468,7 @@ launch.advice.not_enough_space=You have allocated too much memory, because the p launch.advice.require_newer_java_version=Minecraft %1$s requires Java %2$s or later, are you willing to download one now? launch.advice.too_large_memory_for_32bit=You have allocated too much memory, because of your 32-Bit Java Runtime Environment, your game may crash. The maximum memory capacity for 32 bit systems is is 1024MB. Shall we continue launching? launch.advice.vanilla_linux_java_8=For Linux x86-64, Minecraft 1.12.2 and below can only run on Java 8.\nJava 9 and above versions cannot load 32-bit native libraries like liblwjgl.so. +launch.advice.modlauncher8=The Forge version you are using is not compatible with the current Java version. Please try updating Forge, or start with Java 8u312/11.0.13/17.0.1 or earlier. Shall we continue launching? launch.advice.vanilla_x86=Minecraft currently does not provide official support for architectures other than x86 and x86-64.\nYou can try to download the corresponding native library of the platform and specify its placement path. launch.advice.vanilla_x86.translation=Minecraft currently does not provide official support for architectures other than x86 and x86-64.\nPlease use Java for x86-64 to run minecraft through translator, or download the corresponding native library of the platform and specify its placement path. launch.failed=Unable to launch diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index f74d89f64..bda138ef7 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -459,9 +459,11 @@ launch.advice.uncorrected=如果您確實希望使用您自訂的 Java 虛擬機 launch.advice.different_platform=您的系統為 64 位元,但是 Java 是 32 位元,建議您安裝 64 位 Java。 launch.advice.forge2760_liteloader=Forge 2760 與 LiteLoader 不相容。請刪除 LiteLoader 或者變更 Forge 至 2773 或更新的版本。是否繼續啟動? launch.advice.forge28_2_2_optifine=Forge 28.2.2 或更高版本與 OptiFine 不相容。請變更 Forge 至 28.2.1 或更低版本。是否繼續啟動? +launch.advice.forge37_0_60=Forge 低於 37.0.60 的版本不相容 Java 17。請更新 Forge 到 37.0.60 或更高版本,或者使用 Java 16 啟動遊戲。是否繼續啟動? 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.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.not_enough_space=您設定的記憶體大小過大,由於超過了系統記憶體大小 %dMB,所以可能影響遊戲體驗或無法啟動遊戲。是否繼續啟動? launch.advice.require_newer_java_version=Minecraft %1$s 僅能運行在 Java %2$s 或更高版本上,是否下載? 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 e7de47a39..d1fdca873 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -459,9 +459,11 @@ launch.advice.uncorrected=如果您确实希望使用您自定义的 Java 虚拟 launch.advice.different_platform=您的系统是 64 位,但是 Java 是 32 位的,建议您安装 64 位 Java。 launch.advice.forge2760_liteloader=Forge 2760 与 LiteLoader 不兼容。请删除 LiteLoader 或者更换 Forge 至 2773 或更新的版本。是否继续启动? launch.advice.forge28_2_2_optifine=Forge 28.2.2 或更高版本与 OptiFine 不兼容。请更换 Forge 至 28.2.1 或更低版本。是否继续启动? +launch.advice.forge37_0_60=Forge 低于 37.0.60 的版本不兼容 Java 17。请更新 Forge 到 37.0.60 或更高版本,或者使用 Java 16 启动游戏。是否继续启动? 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.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.not_enough_space=您设置的内存大小过大,由于超过了系统内存大小 %dMB,所以可能影响游戏体验或无法启动游戏。是否继续启动? launch.advice.require_newer_java_version=Minecraft %1$s 仅能运行在 Java %2$s 或更高版本上,是否下载? 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 a2359eab9..4c21a4aa7 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java @@ -36,6 +36,20 @@ 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 @@ -113,7 +127,53 @@ public enum JavaVersionConstraint { public boolean checkJava(VersionNumber gameVersionNumber, Version version, JavaVersion javaVersion) { return javaVersion.getArchitecture().isX86(); } - }; + }, + // Minecraft 1.16+Forge with crash because JDK-8273826 + 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) + .map(LibraryAnalyzer.LibraryType.FORGE::patchVersion) + .map(VersionNumber::asVersion) + .orElse(null); + if (forgePatchVersion == null) { + return false; + } + switch (gameVersionNumber.toString()) { + case "1.16.3": + return forgePatchVersion.compareTo(VersionNumber.asVersion("34.1.27")) >= 0; + case "1.16.4": + return true; + case "1.16.5": + return forgePatchVersion.compareTo(VersionNumber.asVersion("36.2.23")) <= 0; + case "1.17.1": + return versionRange("37.0.60", "37.0.75").contains(forgePatchVersion); + default: + return false; + } + } + + @Override + public boolean checkJava(VersionNumber gameVersionNumber, Version version, JavaVersion javaVersion) { + int parsedJavaVersion = javaVersion.getParsedVersion(); + if (parsedJavaVersion > 17) { + return false; + } else if (parsedJavaVersion == 8) { + return javaVersion.getVersionNumber().compareTo(VersionNumber.asVersion("1.8.0_321")) < 0; + } else if (parsedJavaVersion == 11) { + return javaVersion.getVersionNumber().compareTo(VersionNumber.asVersion("11.0.14")) < 0; + } else if (parsedJavaVersion == 15) { + return javaVersion.getVersionNumber().compareTo(VersionNumber.asVersion("15.0.6")) < 0; + } else if (parsedJavaVersion == 17) { + return javaVersion.getVersionNumber().compareTo(VersionNumber.asVersion("17.0.2")) < 0; + } else { + return true; + } + } + };; private final int type; private final Range gameVersionRange; @@ -227,6 +287,10 @@ public enum JavaVersionConstraint { return Range.between(VersionNumber.asVersion(fromInclusive), VersionNumber.asVersion(toExclusive)); } + static Range versionIs(String version) { + return Range.is(VersionNumber.asVersion(version)); + } + public static class VersionRanges { private final Range mandatory; private final Range suggested;