AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-10 20:37:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements

Browse Source
This commit is contained in:
Glavo 2021-10-14 02:45:43 +08:00 committed by Yuhui Huang
parent cd7c515097
commit 42a40a844a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
View File

@ -546,7 +546,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
memoryStatus.set(OperatingSystem.getPhysicalMemoryStatus().orElse(OperatingSystem.PhysicalMemoryStatus.INVALID)); memoryStatus.set(OperatingSystem.getPhysicalMemoryStatus().orElse(OperatingSystem.PhysicalMemoryStatus.INVALID));
Task.supplyAsync(JavaVersion::getJavas).thenAcceptAsync(Schedulers.javafx(), list -> { Task.supplyAsync(JavaVersion::getJavas).thenAcceptAsync(Schedulers.javafx(), list -> {
boolean isX86 = (Architecture.CURRENT_ARCH == Architecture.X86 || Architecture.CURRENT_ARCH == Architecture.X86_64) boolean isX86 = (Architecture.SYSTEM_ARCH == Architecture.X86 || Architecture.SYSTEM_ARCH == Architecture.X86_64)
&& list.stream() && list.stream()
.map(java -> java.getPlatform().getArchitecture()) .map(java -> java.getPlatform().getArchitecture())
.allMatch(arch -> arch == Architecture.X86 || arch == Architecture.X86_64); .allMatch(arch -> arch == Architecture.X86 || arch == Architecture.X86_64);

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

@ -72,7 +72,7 @@ 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) { if (Architecture.SYSTEM_ARCH == Architecture.X86 || Architecture.SYSTEM_ARCH == Architecture.ARM64) {
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");

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

@ -106,7 +106,7 @@ public enum JavaVersionConstraint {
@Nullable JavaVersion javaVersion) { @Nullable JavaVersion javaVersion) {
return getGameVersionRange().contains(gameVersionNumber) return getGameVersionRange().contains(gameVersionNumber)
&& Architecture.SYSTEM_ARCH != Architecture.X86 && Architecture.SYSTEM_ARCH != Architecture.X86_64 && Architecture.SYSTEM_ARCH != Architecture.X86 && Architecture.SYSTEM_ARCH != Architecture.X86_64
&& (javaVersion == null || (javaVersion.getArchitecture() != Architecture.X86 && javaVersion.getArchitecture() != Architecture.X86_64)); && (javaVersion != null && (javaVersion.getArchitecture() != Architecture.X86 && javaVersion.getArchitecture() != Architecture.X86_64));
} }
@Override @Override