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

Download Java on MacOS aarch64

Browse Source
This commit is contained in:
Glavo
2021-10-13 21:56:45 +08:00
committed by Yuhui Huang
parent 3af115ce37
commit 74a305c32a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@ public class JavaDownloadTask extends Task<Void> {
@Override @Override
public void preExecute() throws Exception { public void preExecute() throws Exception {
this.platform = JavaRepository.getCurrentJavaPlatform().orElseThrow(UnsupportedPlatformException::new); this.platform = JavaRepository.getSystemJavaPlatform().orElseThrow(UnsupportedPlatformException::new);
} }
@Override @Override

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

@@ -24,7 +24,7 @@ public final class JavaRepository {
public static Task<?> downloadJava(GameJavaVersion javaVersion, DownloadProvider downloadProvider) { public static Task<?> downloadJava(GameJavaVersion javaVersion, DownloadProvider downloadProvider) {
return new JavaDownloadTask(javaVersion, getJavaStoragePath(), downloadProvider) return new JavaDownloadTask(javaVersion, getJavaStoragePath(), downloadProvider)
.thenRunAsync(() -> { .thenRunAsync(() -> {
Optional<String> platform = getCurrentJavaPlatform(); Optional<String> platform = getSystemJavaPlatform();
if (platform.isPresent()) { if (platform.isPresent()) {
addJava(getJavaHome(javaVersion, platform.get())); addJava(getJavaHome(javaVersion, platform.get()));
} }
@@ -41,7 +41,7 @@ public final class JavaRepository {
} }
public static void initialize() throws IOException, InterruptedException { public static void initialize() throws IOException, InterruptedException {
Optional<String> platformOptional = getCurrentJavaPlatform(); Optional<String> platformOptional = getSystemJavaPlatform();
if (platformOptional.isPresent()) { if (platformOptional.isPresent()) {
String platform = platformOptional.get(); String platform = platformOptional.get();
Path javaStoragePath = getJavaStoragePath(); Path javaStoragePath = getJavaStoragePath();
@@ -60,7 +60,7 @@ public final class JavaRepository {
} }
} }
public static Optional<String> getCurrentJavaPlatform() { public static Optional<String> getSystemJavaPlatform() {
if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) { if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
if (Architecture.SYSTEM_ARCH == Architecture.X86) { if (Architecture.SYSTEM_ARCH == Architecture.X86) {
return Optional.of("linux-i386"); return Optional.of("linux-i386");
@@ -68,7 +68,7 @@ public final class JavaRepository {
return Optional.of("linux"); return Optional.of("linux");
} }
} else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) { } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
if (Architecture.SYSTEM_ARCH == Architecture.X86_64) { if (Architecture.SYSTEM_ARCH == Architecture.X86_64 || Architecture.SYSTEM_ARCH == Architecture.ARM64) {
return Optional.of("mac-os"); return Optional.of("mac-os");
} }
} else if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) { } else if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {