diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java index 6f8bfb868..e380efe5c 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java @@ -39,7 +39,10 @@ import org.jackhuang.hmcl.ui.construct.TwoLineListItem; import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.Log4jLevel; import org.jackhuang.hmcl.util.Pair; -import org.jackhuang.hmcl.util.platform.*; +import org.jackhuang.hmcl.util.platform.Architecture; +import org.jackhuang.hmcl.util.platform.CommandBuilder; +import org.jackhuang.hmcl.util.platform.ManagedProcess; +import org.jackhuang.hmcl.util.platform.OperatingSystem; import java.awt.*; import java.io.IOException; @@ -78,9 +81,9 @@ public class GameCrashWindow extends Stage { private final LaunchOptions launchOptions; private final View view; - private final LinkedList> logs; + private final List> logs; - public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, LinkedList> logs) { + public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, List> logs) { this.managedProcess = managedProcess; this.exitType = exitType; this.repository = repository; @@ -110,14 +113,18 @@ public class GameCrashWindow extends Stage { CompletableFuture.supplyAsync(() -> { String rawLog = logs.stream().map(Pair::getKey).collect(Collectors.joining("\n")); Set keywords = Collections.emptySet(); + String crashReport = null; try { - String crashReport = CrashReportAnalyzer.findCrashReport(rawLog); - if (crashReport != null) { - keywords = CrashReportAnalyzer.findKeywordsFromCrashReport(crashReport); - } + crashReport = CrashReportAnalyzer.findCrashReport(rawLog); } catch (IOException e) { LOG.log(Level.WARNING, "Failed to read crash report", e); } + if (crashReport == null) { + crashReport = CrashReportAnalyzer.extractCrashReport(rawLog); + } + if (crashReport != null) { + keywords = CrashReportAnalyzer.findKeywordsFromCrashReport(crashReport); + } return pair( CrashReportAnalyzer.anaylze(rawLog), keywords); diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 511c31992..fe8079733 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -386,7 +386,7 @@ game.crash.reason.out_of_memory=當前遊戲因為記憶體不足，無法繼續 game.crash.reason.resolution_too_high=當前遊戲因為材質包解析度過高，無法繼續運行\n你可以更換一個解析度更低的材質，或者更換一個視訊記憶體更大的顯示卡。 game.crash.reason.stacktrace=原因未知，請點擊日誌按鈕查看詳細訊息。\n下面是一些關鍵字，其中可能包含 Mod 名稱，你可以透過搜索的方式查找有關訊息。\n%s game.crash.reason.too_old_java=當前遊戲因為 Java 虛擬機版本過低，無法繼續運行。\n你需要在遊戲設置中更換 %1$s 或更新版本的 Java 虛擬機，並重新啟動遊戲。如果沒有下載安裝，你可以在網路上自行下載。 -game.crash.reason.unknown=原因未知，請點擊日誌按鈕查看詳細訊息。\n你可以向我們提供遊戲崩潰日誌以提升 HMCL 的日誌分析能力。 +game.crash.reason.unknown=原因未知，請點擊日誌按鈕查看詳細訊息。\n不要將本界面截圖給他人！如果你要求助他人，請你點擊左下角導出遊戲崩潰訊息後將導出的文件發送給他人以供分析！\n你可以向我們提供遊戲崩潰日誌以提升 HMCL 的日誌分析能力。 game.crash.reason.unsatisfied_link_error=當前遊戲因為缺少本地庫，無法繼續運行。\n這些本地庫缺失：%1$s。\n如果你在遊戲設置中修改了本地庫路徑選項，請你修改回預設模式。\n如果已經在預設模式下，請檢查本地庫缺失是否是 Mod 引起的，或由 HMCL 引起的。如果你確定是 HMCL 引起的，建議你向我們回饋。\n如果你確實需要自訂本地庫路徑，你需要保證其中包含缺失的本地庫。 game.crash.title=遊戲意外退出 game.directory=遊戲路徑 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 f41cb119d..940f21555 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -386,7 +386,7 @@ game.crash.reason.out_of_memory=当前游戏因为内存不足，无法继续运 game.crash.reason.resolution_too_high=当前游戏因为材质包分辨率过高，无法继续运行\n你可以更换一个分辨率更低的材质，或者更换一个显存更大的显卡。 game.crash.reason.stacktrace=原因未知，请点击日志按钮查看详细信息。\n下面是一些关键词，其中可能包含 Mod 名称，你可以通过搜索的方式查找有关信息。\n%s game.crash.reason.too_old_java=当前游戏因为 Java 虚拟机版本过低，无法继续运行。\n你需要在游戏设置中更换 Java %1$s 或更新版本的 Java 虚拟机，并重新启动游戏。如果没有下载安装，你可以在 https://adoptopenjdk.net 上自行下载。 -game.crash.reason.unknown=原因未知，请点击日志按钮查看详细信息。\n你可以向我们提供游戏崩溃日志以提升 HMCL 的日志分析能力。 +game.crash.reason.unknown=原因未知，请点击日志按钮查看详细信息。\n不要将本界面截图给他人！如果你要求助他人，请你点击左下角导出游戏崩溃信息后将导出的文件发送给他人以供分析！\n你可以向我们提供游戏崩溃日志以提升 HMCL 的日志分析能力。 game.crash.reason.unsatisfied_link_error=当前游戏因为缺少本地库，无法继续运行。\n这些本地库缺失：%1$s。\n如果你在游戏设置中修改了本地库路径选项，请你修改回预设模式。\n如果已经在预设模式下，请检查本地库缺失是否是 Mod 引起的，或由 HMCL 引起的。如果你确定是 HMCL 引起的，建议你向我们反馈。\n如果你确实需要自定义本地库路径，你需要保证其中包含缺失的本地库。 game.crash.title=游戏意外退出 game.directory=游戏路径 diff --git a/HMCL/src/test/java/org/jackhuang/hmcl/JavaFXLauncher.java b/HMCL/src/test/java/org/jackhuang/hmcl/JavaFXLauncher.java new file mode 100644 index 000000000..577401046 --- /dev/null +++ b/HMCL/src/test/java/org/jackhuang/hmcl/JavaFXLauncher.java @@ -0,0 +1,46 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2020 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; + +public final class JavaFXLauncher { + + private JavaFXLauncher() { + } + + public static void start() { + // init JavaFX Toolkit + try { + // Java 9 or Latter + final MethodHandle startup = + MethodHandles.publicLookup().findStatic( + javafx.application.Platform.class, "startup", MethodType.methodType(void.class, Runnable.class)); + startup.invokeExact((Runnable) () -> { + }); + } catch (Throwable e) { + // Java 8 + try { + Class.forName("javafx.embed.swing.JFXPanel").getDeclaredConstructor().newInstance(); + } catch (Throwable ignored) { + } + } + } +} diff --git a/HMCL/src/test/java/org/jackhuang/hmcl/ui/GameCrashWindowTest.java b/HMCL/src/test/java/org/jackhuang/hmcl/ui/GameCrashWindowTest.java new file mode 100644 index 000000000..2a4c00f71 --- /dev/null +++ b/HMCL/src/test/java/org/jackhuang/hmcl/ui/GameCrashWindowTest.java @@ -0,0 +1,69 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2021 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl.ui; + +import org.jackhuang.hmcl.JavaFXLauncher; +import org.jackhuang.hmcl.game.ClassicVersion; +import org.jackhuang.hmcl.game.LaunchOptions; +import org.jackhuang.hmcl.launch.ProcessListener; +import org.jackhuang.hmcl.util.Log4jLevel; +import org.jackhuang.hmcl.util.io.FileUtils; +import org.jackhuang.hmcl.util.platform.JavaVersion; +import org.jackhuang.hmcl.util.platform.ManagedProcess; +import org.jackhuang.hmcl.util.platform.Platform; +import org.junit.Ignore; +import org.junit.Test; + +import java.io.File; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.concurrent.CountDownLatch; +import java.util.stream.Collectors; + +import static org.jackhuang.hmcl.util.Pair.pair; + +public class GameCrashWindowTest { + + @Test + @Ignore + public void test() throws Exception { + JavaFXLauncher.start(); + + ManagedProcess process = new ManagedProcess(null, Arrays.asList("commands", "2")); + + String logs = FileUtils.readText(new File("C:\\Users\\huang\\Downloads\\minecraft-exported-logs-2021-10-18T21-15-43.log")); + + CountDownLatch latch = new CountDownLatch(1); + FXUtils.runInFX(() -> { + GameCrashWindow window = new GameCrashWindow(process, ProcessListener.ExitType.APPLICATION_ERROR, null, + new ClassicVersion(), + new LaunchOptions.Builder() + .setJava(new JavaVersion(Paths.get("."), "16", Platform.SYSTEM_PLATFORM)) + .setGameDir(new File(".")) + .create(), + Arrays.stream(logs.split("\\n")) + .map(log -> pair(log, Log4jLevel.guessLevel(log))) + .collect(Collectors.toList())); + + window.showAndWait(); + + latch.countDown(); + }); + latch.await(); + } +} diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/CrashReportAnalyzer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/CrashReportAnalyzer.java index 9dc7afcf6..ac63687d5 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/CrashReportAnalyzer.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/CrashReportAnalyzer.java @@ -155,6 +155,13 @@ public final class CrashReportAnalyzer { } } + public static String extractCrashReport(String rawLog) { + int begin = rawLog.lastIndexOf("---- Minecraft Crash Report ----"); + int end = rawLog.lastIndexOf("#@!@# Game crashed! Crash report saved to"); + if (begin == -1 || end == -1 || begin >= end) return null; + return rawLog.substring(begin, end); + } + private static final Pattern CRASH_REPORT_STACK_TRACE_PATTERN = Pattern.compile("Description: (.*?)[\\n\\r]+(?[\\w\\W\\n\\r]+)A detailed walkthrough of the error"); private static final Pattern STACK_TRACE_LINE_PATTERN = Pattern.compile("at (?.*?)\\((.*?)\\)"); private static final Set PACKAGE_KEYWORD_BLACK_LIST = new HashSet<>(Arrays.asList( @@ -171,7 +178,7 @@ public final class CrashReportAnalyzer { "fabricmc", "loader", "game", "knot", "launch", "mixin" // fabric )); - public static Set findKeywordsFromCrashReport(String crashReport) throws IOException, InvalidPathException { + public static Set findKeywordsFromCrashReport(String crashReport) { Matcher matcher = CRASH_REPORT_STACK_TRACE_PATTERN.matcher(crashReport); Set result = new HashSet<>(); if (matcher.find()) { diff --git a/HMCLCore/src/test/java/org/jackhuang/hmcl/JavaFXLauncher.java b/HMCLCore/src/test/java/org/jackhuang/hmcl/JavaFXLauncher.java new file mode 100644 index 000000000..577401046 --- /dev/null +++ b/HMCLCore/src/test/java/org/jackhuang/hmcl/JavaFXLauncher.java @@ -0,0 +1,46 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2020 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; + +public final class JavaFXLauncher { + + private JavaFXLauncher() { + } + + public static void start() { + // init JavaFX Toolkit + try { + // Java 9 or Latter + final MethodHandle startup = + MethodHandles.publicLookup().findStatic( + javafx.application.Platform.class, "startup", MethodType.methodType(void.class, Runnable.class)); + startup.invokeExact((Runnable) () -> { + }); + } catch (Throwable e) { + // Java 8 + try { + Class.forName("javafx.embed.swing.JFXPanel").getDeclaredConstructor().newInstance(); + } catch (Throwable ignored) { + } + } + } +} diff --git a/HMCLCore/src/test/java/org/jackhuang/hmcl/util/TaskTest.java b/HMCLCore/src/test/java/org/jackhuang/hmcl/util/TaskTest.java index e5c87efbd..d6a952959 100644 --- a/HMCLCore/src/test/java/org/jackhuang/hmcl/util/TaskTest.java +++ b/HMCLCore/src/test/java/org/jackhuang/hmcl/util/TaskTest.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hmcl.util; +import org.jackhuang.hmcl.JavaFXLauncher; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; @@ -25,9 +26,6 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.Test; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodType; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; @@ -80,20 +78,7 @@ public class TaskTest { } public void testThenAccept() { - // init JavaFX Toolkit - try { - // Java 9 or Latter - final MethodHandle startup = - MethodHandles.publicLookup().findStatic( - javafx.application.Platform.class, "startup", MethodType.methodType(void.class, Runnable.class)); - startup.invokeExact((Runnable) () -> {}); - } catch (Throwable e) { - // Java 8 - try { - Class.forName("javafx.embed.swing.JFXPanel").getDeclaredConstructor().newInstance(); - } catch (Throwable ignored) { - } - } + JavaFXLauncher.start(); AtomicBoolean flag = new AtomicBoolean(); boolean result = Task.supplyAsync(JavaVersion::fromCurrentEnvironment) .thenAcceptAsync(Schedulers.javafx(), javaVersion -> {