diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java index d96823d0e..24caabc4f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java @@ -42,15 +42,11 @@ public final class HMCLGameLauncher extends DefaultLauncher { } public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener) { - this(repository, version, authInfo, options, listener, false, null, true); + this(repository, version, authInfo, options, listener, true); } - public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean customized_natives, String customized_natives_path) { - this(repository, version, authInfo, options, listener, customized_natives, customized_natives_path, true); - } - - public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean customized_natives, String customized_natives_path, boolean daemon) { - super(repository, version, authInfo, options, listener, customized_natives, customized_natives_path, daemon); + public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean daemon) { + super(repository, version, authInfo, options, listener, daemon); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java index 26c637e0b..9b00f4c79 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java @@ -306,7 +306,9 @@ public class HMCLGameRepository extends DefaultGameRepository { .setServerIp(vs.getServerIp()) .setWrapper(vs.getWrapper()) .setPrecalledCommand(vs.getPreLaunchCommand()) - .setNoGeneratedJVMArgs(vs.isNoJVMArgs()); + .setNoGeneratedJVMArgs(vs.isNoJVMArgs()) + .setNativesDirType(vs.getNativesDirType()) + .setNativesDir(vs.getNativesDir()); if (config().hasProxy()) { builder.setProxy(ProxyManager.getProxy()); if (config().hasProxyAuth()) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java index 64b39efad..438558cd2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java @@ -178,10 +178,7 @@ public final class LauncherHelper { repository.getLaunchOptions(selectedVersion, profile.getGameDir(), !setting.isNotCheckJVM()), launcherVisibility == LauncherVisibility.CLOSE ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched. - : new HMCLProcessListener(repository, selectedVersion, authInfo, launchingLatch, gameVersion.isPresent()), - NativesDirectoryType.CUSTOM.equals(setting.getNativesDirType()), - setting.getNativesDir() - // TODO: yaoxi-std ADD custom natives path checking + : new HMCLProcessListener(repository, selectedVersion, authInfo, launchingLatch, gameVersion.isPresent()) ); }).thenComposeAsync(launcher -> { // launcher is prev task's result if (scriptFile == null) { diff --git a/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml b/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml index fcd8378b6..77b812c51 100644 --- a/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml +++ b/HMCL/src/main/resources/assets/fxml/version/version-settings.fxml @@ -38,9 +38,6 @@ - - @@ -131,6 +128,9 @@ fx:id="txtPrecallingCommand" StackPane.margin="$insets"/> + +