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

feat(crash): show forge/fabric version in game crash window.

Browse Source
This commit is contained in:
huanghongxun
2021-10-05 18:34:19 +08:00
parent 9a46596b6c
commit 57e6765bfd
2 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,7 @@ public final class LauncherHelper {
launchOptions, launchOptions,
launcherVisibility == LauncherVisibility.CLOSE launcherVisibility == LauncherVisibility.CLOSE
? null // Unnecessary to start listening to game process output when close launcher immediately after game launched. ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
: new HMCLProcessListener(repository, selectedVersion, authInfo, launchOptions, launchingLatch, gameVersion.isPresent()) : new HMCLProcessListener(repository, version, authInfo, launchOptions, launchingLatch, gameVersion.isPresent())
); );
}).thenComposeAsync(launcher -> { // launcher is prev task's result }).thenComposeAsync(launcher -> { // launcher is prev task's result
if (scriptFile == null) { if (scriptFile == null) {
@@ -557,7 +557,7 @@ public final class LauncherHelper {
class HMCLProcessListener implements ProcessListener { class HMCLProcessListener implements ProcessListener {
private final HMCLGameRepository repository; private final HMCLGameRepository repository;
private final String version; private final Version version;
private final Map<String, String> forbiddenTokens; private final Map<String, String> forbiddenTokens;
private final LaunchOptions launchOptions; private final LaunchOptions launchOptions;
private ManagedProcess process; private ManagedProcess process;
@@ -568,7 +568,7 @@ public final class LauncherHelper {
private final CountDownLatch logWindowLatch = new CountDownLatch(1); private final CountDownLatch logWindowLatch = new CountDownLatch(1);
private final CountDownLatch launchingLatch; private final CountDownLatch launchingLatch;
public HMCLProcessListener(HMCLGameRepository repository, String version, AuthInfo authInfo, LaunchOptions launchOptions, CountDownLatch launchingLatch, boolean detectWindow) { public HMCLProcessListener(HMCLGameRepository repository, Version version, AuthInfo authInfo, LaunchOptions launchOptions, CountDownLatch launchingLatch, boolean detectWindow) {
this.repository = repository; this.repository = repository;
this.version = version; this.version = version;
this.launchOptions = launchOptions; this.launchOptions = launchOptions;
@@ -680,8 +680,8 @@ public final class LauncherHelper {
if (!lwjgl) finishLaunch(); if (!lwjgl) finishLaunch();
if (exitType != ExitType.NORMAL) { if (exitType != ExitType.NORMAL) {
repository.markVersionLaunchedAbnormally(version); repository.markVersionLaunchedAbnormally(version.getId());
Platform.runLater(() -> new GameCrashWindow(process, exitType, repository, launchOptions, logs).show()); Platform.runLater(() -> new GameCrashWindow(process, exitType, repository, version, launchOptions, logs).show());
} }
checkExit(); checkExit();

52
HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java
View File

@@ -29,13 +29,10 @@ import javafx.scene.control.Alert;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority; import javafx.scene.layout.Priority;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.stage.Stage; import javafx.stage.Stage;
import org.jackhuang.hmcl.game.CrashReportAnalyzer; import org.jackhuang.hmcl.download.LibraryAnalyzer;
import org.jackhuang.hmcl.game.DefaultGameRepository; import org.jackhuang.hmcl.game.*;
import org.jackhuang.hmcl.game.LaunchOptions;
import org.jackhuang.hmcl.game.LogExporter;
import org.jackhuang.hmcl.launch.ProcessListener; import org.jackhuang.hmcl.launch.ProcessListener;
import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.ui.construct.TwoLineListItem; import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
@@ -68,9 +65,10 @@ import static org.jackhuang.hmcl.util.Pair.pair;
import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
public class GameCrashWindow extends Stage { public class GameCrashWindow extends Stage {
private final StringProperty version = new SimpleStringProperty(); private final Version version;
private final StringProperty memory = new SimpleStringProperty(); private final String memory;
private final StringProperty java = new SimpleStringProperty(); private final String java;
private final LibraryAnalyzer analyzer;
private final StringProperty os = new SimpleStringProperty(System.getProperty("os.name")); private final StringProperty os = new SimpleStringProperty(System.getProperty("os.name"));
private final StringProperty arch = new SimpleStringProperty(Architecture.SYSTEM_ARCHITECTURE); private final StringProperty arch = new SimpleStringProperty(Architecture.SYSTEM_ARCHITECTURE);
private final StringProperty reason = new SimpleStringProperty(i18n("game.crash.reason.unknown")); private final StringProperty reason = new SimpleStringProperty(i18n("game.crash.reason.unknown"));
@@ -85,10 +83,11 @@ public class GameCrashWindow extends Stage {
private final LinkedList<Pair<String, Log4jLevel>> logs; private final LinkedList<Pair<String, Log4jLevel>> logs;
public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, LaunchOptions launchOptions, LinkedList<Pair<String, Log4jLevel>> logs) { public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, LinkedList<Pair<String, Log4jLevel>> logs) {
this.managedProcess = managedProcess; this.managedProcess = managedProcess;
this.exitType = exitType; this.exitType = exitType;
this.repository = repository; this.repository = repository;
this.version = version;
this.launchOptions = launchOptions; this.launchOptions = launchOptions;
this.logs = logs; this.logs = logs;
this.view = new View(); this.view = new View();
@@ -98,9 +97,10 @@ public class GameCrashWindow extends Stage {
setTitle(i18n("game.crash.title")); setTitle(i18n("game.crash.title"));
getIcons().add(newImage("/assets/img/icon.png")); getIcons().add(newImage("/assets/img/icon.png"));
version.set(launchOptions.getVersionName()); memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " MB").orElse("-");
memory.set(Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " MB").orElse("-")); java = launchOptions.getJava().getVersion();
java.set(launchOptions.getJava().getVersion());
analyzer = LibraryAnalyzer.analyze(version);
analyzeCrashReport(); analyzeCrashReport();
} }
@@ -263,35 +263,43 @@ public class GameCrashWindow extends Stage {
TwoLineListItem version = new TwoLineListItem(); TwoLineListItem version = new TwoLineListItem();
version.getStyleClass().setAll("two-line-item-second-large"); version.getStyleClass().setAll("two-line-item-second-large");
version.setTitle(i18n("archive.game_version")); version.setTitle(i18n("archive.game_version"));
version.subtitleProperty().bind(GameCrashWindow.this.version); version.setSubtitle(GameCrashWindow.this.version.getId());
StackPane versionCard = new StackPane(version);
TwoLineListItem memory = new TwoLineListItem(); TwoLineListItem memory = new TwoLineListItem();
memory.getStyleClass().setAll("two-line-item-second-large"); memory.getStyleClass().setAll("two-line-item-second-large");
memory.setTitle(i18n("settings.memory")); memory.setTitle(i18n("settings.memory"));
memory.subtitleProperty().bind(GameCrashWindow.this.memory); memory.setSubtitle(GameCrashWindow.this.memory);
StackPane memoryCard = new StackPane(memory);
TwoLineListItem java = new TwoLineListItem(); TwoLineListItem java = new TwoLineListItem();
java.getStyleClass().setAll("two-line-item-second-large"); java.getStyleClass().setAll("two-line-item-second-large");
java.setTitle("Java"); java.setTitle("Java");
java.subtitleProperty().bind(GameCrashWindow.this.java); java.setSubtitle(GameCrashWindow.this.java);
StackPane javaCard = new StackPane(java);
TwoLineListItem os = new TwoLineListItem(); TwoLineListItem os = new TwoLineListItem();
os.getStyleClass().setAll("two-line-item-second-large"); os.getStyleClass().setAll("two-line-item-second-large");
os.setTitle(i18n("system.operating_system")); os.setTitle(i18n("system.operating_system"));
os.subtitleProperty().bind(GameCrashWindow.this.os); os.subtitleProperty().bind(GameCrashWindow.this.os);
StackPane osCard = new StackPane(os);
TwoLineListItem arch = new TwoLineListItem(); TwoLineListItem arch = new TwoLineListItem();
arch.getStyleClass().setAll("two-line-item-second-large"); arch.getStyleClass().setAll("two-line-item-second-large");
arch.setTitle(i18n("system.architecture")); arch.setTitle(i18n("system.architecture"));
arch.subtitleProperty().bind(GameCrashWindow.this.arch); arch.subtitleProperty().bind(GameCrashWindow.this.arch);
StackPane archCard = new StackPane(arch);
infoPane.setPadding(new Insets(8)); infoPane.setPadding(new Insets(8));
infoPane.getChildren().setAll(versionCard, memoryCard, javaCard, osCard, archCard); infoPane.getChildren().setAll(version, memory, java, os, arch);
}
HBox moddedPane = new HBox();
{
for (LibraryAnalyzer.LibraryType type : LibraryAnalyzer.LibraryType.values()) {
analyzer.getVersion(type).ifPresent(ver -> {
TwoLineListItem item = new TwoLineListItem();
item.getStyleClass().setAll("two-line-item-second-large");
item.setTitle(i18n("install.installer." + type.getPatchId()));
item.setSubtitle(ver);
moddedPane.getChildren().add(item);
});
}
} }
VBox gameDirPane = new VBox(8); VBox gameDirPane = new VBox(8);
@@ -334,7 +342,7 @@ public class GameCrashWindow extends Stage {
toolBar.getChildren().setAll(exportGameCrashInfoButton, logButton, feedbackLabel); toolBar.getChildren().setAll(exportGameCrashInfoButton, logButton, feedbackLabel);
} }
getChildren().setAll(titlePane, infoPane, gameDirPane, toolBar); getChildren().setAll(titlePane, infoPane, moddedPane, gameDirPane, toolBar);
} }
} }