From af784dd0d054af6e4e1ded30e450bd8036c1773b Mon Sep 17 00:00:00 2001 From: Glavo Date: Fri, 19 Jan 2024 12:51:59 +0800 Subject: [PATCH] Fix HMCLauncher.sh (#2658) --- HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java | 4 ++-- HMCL/src/main/resources/assets/HMCLauncher.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java index 41c2e5bd6..ecfbc49f6 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java @@ -93,10 +93,10 @@ public final class NativePatcher { if (settings.isNotPatchNatives()) return version; - if ((os == OperatingSystem.WINDOWS || os == OperatingSystem.LINUX || os == OperatingSystem.OSX) && arch.isX86()) + if (arch.isX86() && (os == OperatingSystem.WINDOWS || os == OperatingSystem.LINUX || os == OperatingSystem.OSX)) return version; - if ((os == OperatingSystem.OSX || os == OperatingSystem.WINDOWS) && arch == Architecture.ARM64 + if (arch == Architecture.ARM64 && (os == OperatingSystem.OSX || os == OperatingSystem.WINDOWS) && gameVersionNumber != null && gameVersionNumber.compareTo("1.19") >= 0) return version; diff --git a/HMCL/src/main/resources/assets/HMCLauncher.sh b/HMCL/src/main/resources/assets/HMCLauncher.sh index 41d54d508..824c0aa55 100644 --- a/HMCL/src/main/resources/assets/HMCLauncher.sh +++ b/HMCL/src/main/resources/assets/HMCLauncher.sh @@ -122,7 +122,7 @@ else _HMCL_DOWNLOAD_PAGE_OS="$_HMCL_OS" fi -case "$_HMCL_DOWNLOAD_PAGE_OS-$_HMCL_ARCH" in +case "$_HMCL_OS-$_HMCL_ARCH" in windows-x86|windows-x86_64|windows-arm64|linux-x86|linux-x86_64|linux-arm32|linux-arm64|linux-loongarch64|macos-x86_64|macos-arm64) if [ "$_HMCL_USE_CHINESE" == true ]; then echo "运行 HMCL 需要 Java 运行时环境，请安装 Java 并设置环境变量后重试。" 1>&2