AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-08 11:25:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

更新多平台支持 (#3197)

Browse Source 
* update

* Update PLATFORM.md

* Update NativePatcher

* Update NativePatcher

* Update NativePatcher
This commit is contained in:
Glavo 2024-07-27 09:16:33 +08:00 committed by GitHub
parent 74abecaae7
commit 6f7c922ac0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 1876 additions and 529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,20 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.jackhuang.hmcl.util; package org.jackhuang.hmcl.util;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
@ -19,6 +36,9 @@ import java.util.stream.Collectors;
import static org.jackhuang.hmcl.util.logging.Logger.LOG; import static org.jackhuang.hmcl.util.logging.Logger.LOG;
/**
* @author Glavo
*/
public final class NativePatcher { public final class NativePatcher {
private NativePatcher() { private NativePatcher() {
} }
@ -114,9 +134,10 @@ public final class NativePatcher {
if (library.isNative()) { if (library.isNative()) {
Library replacement = replacements.getOrDefault(library.getName() + ":natives", NONEXISTENT_LIBRARY); Library replacement = replacements.getOrDefault(library.getName() + ":natives", NONEXISTENT_LIBRARY);
if (replacement == NONEXISTENT_LIBRARY) { if (replacement == NONEXISTENT_LIBRARY) {
LOG.warning("No alternative native library " + library.getName() + " provided for platform " + javaVersion.getPlatform()); LOG.warning("No alternative native library " + library.getName() + ":natives provided for platform " + javaVersion.getPlatform());
newLibraries.add(library); newLibraries.add(library);
} else if (replacement != null) { } else if (replacement != null) {
LOG.info("Replace " + library.getName() + ":natives with " + replacement.getName());
newLibraries.add(replacement); newLibraries.add(replacement);
} }
} else { } else {
@ -124,6 +145,7 @@ public final class NativePatcher {
if (replacement == NONEXISTENT_LIBRARY) { if (replacement == NONEXISTENT_LIBRARY) {
newLibraries.add(library); newLibraries.add(library);
} else if (replacement != null) { } else if (replacement != null) {
LOG.info("Replace " + library.getName() + " with " + replacement.getName());
newLibraries.add(replacement); newLibraries.add(replacement);
} }
} }

2337
HMCL/src/main/resources/assets/natives.json
View File

File diff suppressed because it is too large Load Diff

22
PLATFORM.md
View File

@ -2,17 +2,17 @@
English | [简体中文](PLATFORM_cn.md) English | [简体中文](PLATFORM_cn.md)
| | Windows | Linux | Mac OS | FreeBSD | | | Windows | Linux | Mac OS | FreeBSD |
|----------------------------|:--------------------------------------------------|:---------------------------|:------------------------------------------------------------------------|:---------------------------| |----------------------------|:--------------------------------------------------|:--------------------------|:------------------------------------------------------------------------|:-------------------------|
| x86-64 | ✅️ | ✅️ | ✅️ | 👌 (Minecraft 1.13~1.20.4) | | x86-64 | ✅️ | ✅️ | ✅️ | 👌 (Minecraft 1.13~1.21) |
| x86 | ✅️ | ✅️ | / | / | | x86 | ✅️ (~1.20.4) | ✅️ (~1.20.4) | / | / |
| ARM64 | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.20.6) | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (use Rosetta 2) | ❔ | | ARM64 | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.20.6) | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (use Rosetta 2) | ❔ |
| ARM32 | /️ | 👌 (Minecraft 1.8~1.20.1) | / | / | | ARM32 | /️ | 👌 (Minecraft 1.8~1.20.1) | / | / |
| MIPS64el | / | 👌 (Minecraft 1.8~1.20.1) | / | / | | MIPS64el | / | 👌 (Minecraft 1.8~1.20.1) | / | / |
| RISC-V 64 | / | 👌 (Minecraft 1.13~1.20.4) | / | / | | RISC-V 64 | / | 👌 (Minecraft 1.13~1.21) | / | / |
| LoongArch64 | / | 👌 (Minecraft 1.6~1.20.1) | / | / | | LoongArch64 | / | 👌 (Minecraft 1.6~1.20.1) | / | / |
| PowerPC-64 (Little-Endian) | / | ❔ | / | / | | PowerPC-64 (Little-Endian) | / | ❔ | / | / |
| S390x | / | ❔ | / | / | | S390x | / | ❔ | / | / |
Legend: Legend:

22
PLATFORM_cn.md
View File

@ -2,17 +2,17 @@
[English](PLATFORM.md) | 简体中文 [English](PLATFORM.md) | 简体中文
| | Windows | Linux | Mac OS | FreeBSD | | | Windows | Linux | Mac OS | FreeBSD |
|------------------|:---------------------------------------------------|:---------------------------|:-----------------------------------------------------------------------|:--------------------------| |----------------------------|:--------------------------------------------------|:---------------------------|:-----------------------------------------------------------------------|:------------------------|
| x86-64 | ✅️ | ✅️ | ✅️ | 👌(Minecraft 1.13~1.20.4) | | x86-64 | ✅️ | ✅️ | ✅️ | 👌(Minecraft 1.13~1.21) |
| x86 | ✅️ | ✅️ | / | / | | x86 | ✅️ (~1.20.4) | ✅️ (~1.20.4) | / | / |
| ARM64 | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.20.6) | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (使用 Rosetta 2) | ❔ | | ARM64 | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.21) | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (使用 Rosetta 2) | ❔ |
| ARM32 | /️ | 👌 (Minecraft 1.6~1.20.1) | / | / | | ARM32 | /️ | 👌 (Minecraft 1.6~1.20.1) | / | / |
| MIPS64el | / | 👌 (Minecraft 1.6~1.20.1) | / | / | | MIPS64el | / | 👌 (Minecraft 1.6~1.20.1) | / | / |
| RISC-V 64 | / | 👌 (Minecraft 1.13~1.20.4) | / | / | | RISC-V 64 | / | 👌 (Minecraft 1.13~1.21) | / | / |
| LoongArch64 | / | 👌 (Minecraft 1.6~1.20.1) | / | / | | LoongArch64 | / | 👌 (Minecraft 1.6~1.20.1) | / | / |
| PowerPC-64 (小端序) | / | ❔ | / | / | | PowerPC-64 (Little-Endian) | / | ❔ | / | / |
| S390x | / | ❔ | / | / | | S390x | / | ❔ | / | / |
图例: 图例: