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

fix: checkstyle

Browse Source
This commit is contained in:
Glavo
2021-10-14 03:26:06 +08:00
committed by Yuhui Huang
parent 21e44bbc90
commit 4a82daccec
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/JavaRepository.java
View File

@@ -72,10 +72,16 @@ public final class JavaRepository {
return Optional.of("mac-os"); return Optional.of("mac-os");
} }
} else if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) { } else if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
if (Architecture.SYSTEM_ARCH == Architecture.X86 || Architecture.SYSTEM_ARCH == Architecture.ARM64) { if (Architecture.SYSTEM_ARCH == Architecture.X86) {
return Optional.of("windows-x86"); return Optional.of("windows-x86");
} else if (Architecture.SYSTEM_ARCH == Architecture.X86_64) { } else if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
return Optional.of("windows-x64"); return Optional.of("windows-x64");
} else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
if (OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277) {
return Optional.of("windows-x64");
} else {
return Optional.of("windows-x86");
}
} }
} }
return Optional.empty(); return Optional.empty();

2
HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java
View File

@@ -174,7 +174,7 @@ public enum JavaVersionConstraint {
JavaVersion suggested = null; JavaVersion suggested = null;
for (JavaVersion javaVersion : JavaVersion.getJavas()) { for (JavaVersion javaVersion : JavaVersion.getJavas()) {
// select the latest x86 java that this version accepts. // select the latest x86 java that this version accepts.
if(!javaVersion.getArchitecture().isX86()) if (!javaVersion.getArchitecture().isX86())
continue; continue;
VersionNumber javaVersionNumber = javaVersion.getVersionNumber(); VersionNumber javaVersionNumber = javaVersion.getVersionNumber();

4
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/OperatingSystem.java
View File

@@ -17,9 +17,6 @@
*/ */
package org.jackhuang.hmcl.util.platform; package org.jackhuang.hmcl.util.platform;
import org.jackhuang.hmcl.util.versioning.VersionNumber;
import org.jetbrains.annotations.Nullable;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -31,7 +28,6 @@ import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale; import java.util.Locale;
import java.util.Optional; import java.util.Optional;
import java.util.OptionalInt;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;