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

Fix HMCLauncher.sh (#2658)

Browse Source
This commit is contained in:
Glavo
2024-01-19 12:51:59 +08:00
committed by GitHub
parent 1a1f2133f7
commit af784dd0d0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java
View File

@@ -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;

2
HMCL/src/main/resources/assets/HMCLauncher.sh
View File

@@ -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