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

feat: auto find java by default. Closes #1511.

Browse Source
This commit is contained in:
huanghongxun 2022-06-03 23:19:47 +08:00
parent 6dcd808cc8
commit e3fc9f5116
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java
View File

@ -610,7 +610,7 @@ public final class VersionSetting implements Cloneable {
public Task<JavaVersion> getJavaVersion(VersionNumber gameVersion, Version version, boolean checkJava) { public Task<JavaVersion> getJavaVersion(VersionNumber gameVersion, Version version, boolean checkJava) {
return Task.runAsync(Schedulers.javafx(), () -> { return Task.runAsync(Schedulers.javafx(), () -> {
if (StringUtils.isBlank(getJava())) { if (StringUtils.isBlank(getJava())) {
setJava(StringUtils.isBlank(getJavaDir()) ? "Default" : "Custom"); setJava(StringUtils.isBlank(getJavaDir()) ? "Auto" : "Custom");
} }
}).thenSupplyAsync(() -> { }).thenSupplyAsync(() -> {
try { try {
@ -633,7 +633,7 @@ public final class VersionSetting implements Cloneable {
.collect(Collectors.toList()); .collect(Collectors.toList());
if (matchedJava.isEmpty()) { if (matchedJava.isEmpty()) {
runInFX(() -> { runInFX(() -> {
setJava("Default"); setJava("Auto");
}); });
return JavaVersion.fromCurrentEnvironment(); return JavaVersion.fromCurrentEnvironment();
} else { } else {