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 181210f27..010206326 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java @@ -425,6 +425,11 @@ public final class LauncherHelper { FXUtils.openLink("https://adoptium.net/?variant=openjdk17"); }, breakAction); return null; + case VANILLA_JAVA_17: + Controllers.confirm(i18n("launch.advice.require_newer_java_version", gameVersion.toString(), 17), i18n("message.warning"), () -> { + FXUtils.openLink("https://adoptium.net/?variant=openjdk17"); + }, breakAction); + return null; case VANILLA_JAVA_8: Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageType.ERROR, breakAction); return null; diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 6be01d4e1..295d50abe 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -285,7 +285,7 @@ } -.two-line-item-second-large > .first-line > .title { +.two-line-item-second-large > .first-line > .title, .two-line-item-second-large-title { -fx-text-fill: rgba(0, 0, 0, 0.5); -fx-font-weight: normal; -fx-font-size: 12px; 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 33b7daa1b..a2359eab9 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java @@ -35,6 +35,7 @@ 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.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