From 5431cfef796ac744d51f49d89e1622bacbdae3cf Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Wed, 6 Jun 2018 13:31:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9OpenJDK=E4=B8=8A=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E5=90=8C=E6=A0=B7=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java | 2 +- HMCL/src/main/resources/assets/lang/I18N.properties | 2 -- HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java index 4f430d9ab..9d52c6995 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java @@ -95,7 +95,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler { Logging.LOG.log(Level.SEVERE, text); - if (checkThrowable(e) && !text.contains("OpenJDK")) { + if (checkThrowable(e)) { Platform.runLater(() -> new CrashWindow(text).show()); if (!Launcher.UPDATE_CHECKER.isOutOfDate()) reportToServer(text); diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 04c88fcf5..39ddaebc5 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -107,7 +107,6 @@ crash.advice.no=No advice. crash.advice.no_lwjgl=Maybe drivers caused problems. crash.advice.otherwise=Maybe mods caused problems. crash.error=Minecraft has crashed. -crash.headless=If your OS is Linux, please use Oracle JDK instead of OpenJDK, or add "-Djava.awt.headless=false" JVM argument, or check if your Xserver works normally. crash.launcher=Launcher has crashed! crash.minecraft=Minecraft has crashed! crash.user_fault=Your OS or Java environment may not be properly installed resulting in crashing of this software, please check your Java Environment or your computer! @@ -199,7 +198,6 @@ launcher.crash=Hello Minecraft! Launcher has crashed! launcher.crash_out_dated=Hello Minecraft! Launcher has crashed! Your launcher is outdated. Update it! launcher.exit_failed=Failed to shutdown. launcher.modpack=Documentations for modpacks. -launcher.open_jdk=We have found that you started this application using OpenJDK, which will cause so many troubles drawing the UI. We suggest you using Oracle JDK instead. launcher.restart=Options will be in operations only if restart this app. launcher.tab.about=About launcher.tab.general=General 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 a3d267d01..42e309201 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -107,7 +107,6 @@ crash.advice.no=无建议。 crash.advice.no_lwjgl=可能是游戏依赖库不完整或解压依赖库时出错。可以通过下载整合包解决问题。 crash.advice.otherwise=可能是Mod或其他问题。 crash.error=您的Minecraft崩溃了。 -crash.headless=如果您的操作系统是Linux，请注意不要使用OpenJDK，务必使用Oracle JDK，或尝试添加-Djava.awt.headless=false参数，或检查您的Xserver是否正常 crash.launcher=启动器崩溃了！ crash.minecraft=Minecraft崩溃了！请认真阅读建议。 crash.user_fault=您的系统或Java环境可能安装不当导致本软件崩溃，请检查您的Java环境或您的电脑！可以尝试重新安装Java。 @@ -199,7 +198,6 @@ launcher.crash=Hello Minecraft!遇到了无法处理的错误，请复制下列 launcher.crash_out_dated=Hello Minecraft! Launcher遇到了无法处理的错误，已检测到您的启动器不是最新版本，请更新后再试！ launcher.exit_failed=强制退出失败，可能是Forge 1.7.10及更高版本导致的，无法解决。 launcher.modpack=整合包作者帮助 -launcher.open_jdk=我们发现您正在使用OpenJDK，这会导致很多界面问题，我们建议您更换Oracle JDK。 launcher.restart=本界面选项需要重启本启动器生效 launcher.tab.about=关于 launcher.tab.general=通用