AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-08-04 03:46:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Will not wait for launching if launching rd versions

Browse Source
This commit is contained in:
huangyuhui 2018-02-14 23:01:23 +08:00
parent 473c6f2b3c
commit 3d7bc0b593
1 changed files with 6 additions and 4 deletions
Show Stats 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

@ -73,6 +73,7 @@ public final class LauncherHelper {
Version version = repository.getVersion(selectedVersion); Version version = repository.getVersion(selectedVersion);
Account account = Settings.INSTANCE.getSelectedAccount(); Account account = Settings.INSTANCE.getSelectedAccount();
VersionSetting setting = profile.getVersionSetting(selectedVersion); VersionSetting setting = profile.getVersionSetting(selectedVersion);
Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
executor = Task.of(Schedulers.javafx(), () -> Controllers.dialog(launchingStepsPane)) executor = Task.of(Schedulers.javafx(), () -> Controllers.dialog(launchingStepsPane))
.then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))) .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES)))
@ -103,7 +104,7 @@ public final class LauncherHelper {
.then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING))) .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
.then(Task.of(variables -> { .then(Task.of(variables -> {
variables.set("launcher", new HMCLGameLauncher( variables.set("launcher", new HMCLGameLauncher(
repository, selectedVersion, variables.get("account"), setting.toLaunchOptions(profile.getGameDir()), new HMCLProcessListener(variables.get("account"), setting) repository, selectedVersion, variables.get("account"), setting.toLaunchOptions(profile.getGameDir()), new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
)); ));
})) }))
.then(variables -> { .then(variables -> {
@ -286,11 +287,13 @@ public final class LauncherHelper {
private ManagedProcess process; private ManagedProcess process;
private boolean lwjgl; private boolean lwjgl;
private LogWindow logWindow; private LogWindow logWindow;
private final boolean detectWindow;
private final LinkedList<Pair<String, Log4jLevel>> logs; private final LinkedList<Pair<String, Log4jLevel>> logs;
private final CountDownLatch latch = new CountDownLatch(1); private final CountDownLatch latch = new CountDownLatch(1);
public HMCLProcessListener(AuthInfo authInfo, VersionSetting setting) { public HMCLProcessListener(AuthInfo authInfo, VersionSetting setting, boolean detectWindow) {
this.setting = setting; this.setting = setting;
this.detectWindow = detectWindow;
if (authInfo == null) if (authInfo == null)
forbiddenTokens = Collections.emptyMap(); forbiddenTokens = Collections.emptyMap();
@ -341,8 +344,7 @@ public final class LauncherHelper {
Platform.runLater(() -> logWindow.logLine(log, level)); Platform.runLater(() -> logWindow.logLine(log, level));
} }
if (!lwjgl && log.contains("LWJGL Version: ") || !detectWindow) {
if (!lwjgl && log.contains("LWJGL Version: ")) {
lwjgl = true; lwjgl = true;
switch (visibility) { switch (visibility) {
case HIDE_AND_REOPEN: case HIDE_AND_REOPEN: