lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try Java8 for Minecraft 1.12.2 or older modded game

Browse Source
This commit is contained in:
huanghongxun
2018-08-07 22:10:34 +08:00
parent 93e5851167
commit 2bf03291ce
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
View File

@@ -218,7 +218,7 @@ public final class LauncherHelper {
VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown")); VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown"));
JavaVersion java = setting.getJavaVersion(); JavaVersion java = setting.getJavaVersion();
if (java == null) { if (java == null) {
Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.error"), MessageBox.WARNING_MESSAGE, onAccept); Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
setting.setJava(null); setting.setJava(null);
setting.setDefaultJavaPath(null); setting.setDefaultJavaPath(null);
java = JavaVersion.fromCurrentEnvironment(); java = JavaVersion.fromCurrentEnvironment();
@@ -232,7 +232,7 @@ public final class LauncherHelper {
Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null); Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
} else { } else {
// Most mods require Java 8 or later version. // Most mods require Java 8 or later version.
Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.error"), MessageBox.WARNING_MESSAGE, onAccept); Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
} }
flag = true; flag = true;
} }
@@ -240,7 +240,13 @@ public final class LauncherHelper {
// LaunchWrapper will crash because of assuming the system class loader is an instance of URLClassLoader. // LaunchWrapper will crash because of assuming the system class loader is an instance of URLClassLoader.
// cpw has claimed that he will make MinecraftForge of 1.13 and later versions able to run on Java 9. // cpw has claimed that he will make MinecraftForge of 1.13 and later versions able to run on Java 9.
if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) { if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
Controllers.dialog(i18n("launch.advice.java9"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null); Optional<JavaVersion> java8 = JavaVersion.getJREs().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
if (java8.isPresent()) {
setting.setJavaVersion(java8.get());
Controllers.dialog(i18n("launch.advice.java9"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
} else {
Controllers.dialog(i18n("launch.advice.java9"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
}
flag = true; flag = true;
} }

2
HMCL/src/main/resources/assets/lang/I18N.properties
View File

@@ -179,7 +179,7 @@ message.error=Error
message.info=Info message.info=Info
message.success=Tasks succeeded message.success=Tasks succeeded
message.unknown=Unknown message.unknown=Unknown
message.warning=Warning
modpack=Mod pack modpack=Mod pack
modpack.choose=Choose a modpack zip file which you want to install. modpack.choose=Choose a modpack zip file which you want to install.

2
HMCL/src/main/resources/assets/lang/I18N_zh.properties
View File

@@ -179,7 +179,7 @@ message.error=錯誤
message.info=提示 message.info=提示
message.success=已完成 message.success=已完成
message.unknown=未知 message.unknown=未知
message.warning=警告
modpack=整合包 modpack=整合包
modpack.choose=選擇要安裝的遊戲整合包文件 modpack.choose=選擇要安裝的遊戲整合包文件

2
HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
View File

@@ -179,7 +179,7 @@ message.error=错误
message.info=提示 message.info=提示
message.success=已完成 message.success=已完成
message.unknown=未知 message.unknown=未知
message.warning=警告
modpack=整合包 modpack=整合包
modpack.choose=选择要安装的游戏整合包文件 modpack.choose=选择要安装的游戏整合包文件