mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2024-12-27 07:10:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

An alert to suggest users to use Java 8

Browse Source
This commit is contained in:
huangyuhui 2017-04-04 18:10:05 +08:00
parent ebadbb0f18
commit a68aa84e2f
10 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/build.gradle
View File

@ -38,7 +38,7 @@ def buildnumber = System.getenv("TRAVIS_BUILD_NUMBER")
if (buildnumber == null)
buildnumber = System.getenv("BUILD_NUMBER")
if (buildnumber == null)
buildnumber = "0"
buildnumber = "25"
def versionroot = System.getenv("VERSION_ROOT")
if (versionroot == null)

8
HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/AbstractMinecraftLoader.java
View File

@ -98,9 +98,11 @@ public abstract class AbstractMinecraftLoader implements IMinecraftLoader {
res.add("-Xmn128m");
}
if (!StrUtils.isBlank(options.getPermSize()))
if (jv == null || jv.getParsedVersion() < JdkVersion.JAVA_18)
if (jv == null || jv.getParsedVersion() < JdkVersion.JAVA_18) {
res.add("-XX:PermSize=" + options.getPermSize() + "m");
else if (jv.getParsedVersion() >= JdkVersion.JAVA_18)
if (jv != null && jv.getParsedVersion() < JdkVersion.JAVA_18)
MessageBox.showLocalized("advice.java8");
} else if (jv.getParsedVersion() >= JdkVersion.JAVA_18)
res.add("-XX:MetaspaceSize=" + options.getPermSize() + "m");
}
@ -111,7 +113,7 @@ public abstract class AbstractMinecraftLoader implements IMinecraftLoader {
HMCLog.log("System Platform: " + Platform.getPlatform().getBit());
if (jv != null && jv.getPlatform() == Platform.BIT_32 && Platform.getPlatform() == Platform.BIT_64)
MessageBox.show(C.i18n("advice.os64butjdk32"));
MessageBox.showLocalized("advice.os64butjdk32");
if (!StrUtils.isBlank(options.getMaxMemory())) {
int mem = MathUtils.parseMemory(options.getMaxMemory(), 2147483647);

1
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.lang
View File

@ -349,6 +349,7 @@ versions.manage.redownload_assets_index=Redownload Assets Index
versions.mamage.remove_libraries=Delete library files
advice.os64butjdk32=Your OS is 64-Bit but your Java is 32-Bit. The 64-Bit Java is recommended.
advice.java8=Java 8 is suggested, which can make game run more fluently. And many mods and Minecraft 1.12 and newer versions requires Java 8.
assets.download_all=Download Assets Files
assets.not_refreshed=The assets list is not refreshed, please refresh it once.

1
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N.properties
View File

@ -349,6 +349,7 @@ versions.manage.redownload_assets_index=Redownload Assets Index
versions.mamage.remove_libraries=Delete library files
advice.os64butjdk32=Your OS is 64-Bit but your Java is 32-Bit. The 64-Bit Java is recommended.
advice.java8=Java 8 is suggested, which can make game run more fluently. And many mods and Minecraft 1.12 and newer versions requires Java 8.
assets.download_all=Download Assets Files
assets.not_refreshed=The assets list is not refreshed, please refresh it once.

1
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.lang
View File

@ -347,6 +347,7 @@ versions.manage.redownload_assets_index=Download lại Assets Index
versions.mamage.remove_libraries=Xóa libraries file
advice.os64butjdk32=Hệ điều hành của bạn là 64-Bit nhưng phiên bản Java của bạn là 32-Bit. Khuyên bạn nên dùng Java 64-Bit.
advice.java8=Java 8 is suggested, which can make game run more fluently. And many mods and Minecraft 1.12 and newer versions requires Java 8.
assets.download_all=Download file assets
assets.not_refreshed=Danh sách assets chưa được load lại, bạn hãy ấn nút Tải lại.

1
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_vi.properties
View File

@ -347,6 +347,7 @@ versions.manage.redownload_assets_index=Download l\u1ea1i Assets Index
versions.mamage.remove_libraries=X\u00f3a libraries file
advice.os64butjdk32=H\u1ec7 \u0111i\u1ec1u h\u00e0nh c\u1ee7a b\u1ea1n l\u00e0 64-Bit nh\u01b0ng phi\u00ean b\u1ea3n Java c\u1ee7a b\u1ea1n l\u00e0 32-Bit. Khuy\u00ean b\u1ea1n n\u00ean d\u00f9ng Java 64-Bit.
advice.java8=Java 8 is suggested, which can make game run more fluently. And many mods and Minecraft 1.12 and newer versions requires Java 8.
assets.download_all=Download file assets
assets.not_refreshed=Danh s\u00e1ch assets ch\u01b0a \u0111\u01b0\u1ee3c load l\u1ea1i, b\u1ea1n h\u00e3y \u1ea5n n\u00fat T\u1ea3i l\u1ea1i.

1
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh.lang
View File

@ -349,6 +349,7 @@ versions.manage.redownload_assets_index=重新下載資源配置(assets_index.js
versions.mamage.remove_libraries=刪除所有庫檔
advice.os64butjdk32=您的系統是64-bit，但是Java是32位的，推薦您安裝64位Java.
advice.java8=檢測到您未使用Java 8及更新版本，Java 8能使遊戲更流暢而且Minecraft 1.12及更新版本和很多Mod強制需要需要Java 8。
assets.download_all=下載資源資料
assets.not_refreshed=資源列表未重整，請重整一次。

1
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh.properties
View File

@ -349,6 +349,7 @@ versions.manage.redownload_assets_index=\u91cd\u65b0\u4e0b\u8f09\u8cc7\u6e90\u91
versions.mamage.remove_libraries=\u522a\u9664\u6240\u6709\u5eab\u6a94
advice.os64butjdk32=\u60a8\u7684\u7cfb\u7d71\u662f64-bit\uff0c\u4f46\u662fJava\u662f32\u4f4d\u7684\uff0c\u63a8\u85a6\u60a8\u5b89\u88dd64\u4f4dJava.
advice.java8=\u6aa2\u6e2c\u5230\u60a8\u672a\u4f7f\u7528Java 8\u53ca\u66f4\u65b0\u7248\u672c\uff0cJava 8\u80fd\u4f7f\u904a\u6232\u66f4\u6d41\u66a2\u800c\u4e14Minecraft 1.12\u53ca\u66f4\u65b0\u7248\u672c\u548c\u5f88\u591aMod\u5f37\u5236\u9700\u8981\u9700\u8981Java 8\u3002
assets.download_all=\u4e0b\u8f09\u8cc7\u6e90\u8cc7\u6599
assets.not_refreshed=\u8cc7\u6e90\u5217\u8868\u672a\u91cd\u6574\uff0c\u8acb\u91cd\u6574\u4e00\u6b21\u3002

1
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.lang
View File

@ -349,6 +349,7 @@ versions.manage.redownload_assets_index=重新下载资源配置(assets_index.js
versions.mamage.remove_libraries=删除所有库文件
advice.os64butjdk32=您的系统是64位的但是Java是32位的，推荐您安装64位Java.
advice.java8=检测到您未使用Java 8及更新版本，Java 8能使游戏更流畅而且Minecraft 1.12及更新版本和很多Mod强制需要需要Java 8。
assets.download_all=下载资源文件
assets.not_refreshed=资源列表未刷新，请刷新一次。

1
HMCLCore/src/main/resources/org/jackhuang/hmcl/lang/I18N_zh_CN.properties
View File

@ -349,6 +349,7 @@ versions.manage.redownload_assets_index=\u91cd\u65b0\u4e0b\u8f7d\u8d44\u6e90\u91
versions.mamage.remove_libraries=\u5220\u9664\u6240\u6709\u5e93\u6587\u4ef6
advice.os64butjdk32=\u60a8\u7684\u7cfb\u7edf\u662f64\u4f4d\u7684\u4f46\u662fJava\u662f32\u4f4d\u7684\uff0c\u63a8\u8350\u60a8\u5b89\u88c564\u4f4dJava.
advice.java8=\u68c0\u6d4b\u5230\u60a8\u672a\u4f7f\u7528Java 8\u53ca\u66f4\u65b0\u7248\u672c\uff0cJava 8\u80fd\u4f7f\u6e38\u620f\u66f4\u6d41\u7545\u800c\u4e14Minecraft 1.12\u53ca\u66f4\u65b0\u7248\u672c\u548c\u5f88\u591aMod\u5f3a\u5236\u9700\u8981\u9700\u8981Java 8\u3002
assets.download_all=\u4e0b\u8f7d\u8d44\u6e90\u6587\u4ef6
assets.not_refreshed=\u8d44\u6e90\u5217\u8868\u672a\u5237\u65b0\uff0c\u8bf7\u5237\u65b0\u4e00\u6b21\u3002