Skip to content

修复了macos arm64版本游玩1.19+可能导致的lwjgl natives匹配错误 #5990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yaalyy wants to merge 6 commits into
base: main
Choose a base branch
from
+112 −3
Open

修复了macos arm64版本游玩1.19+可能导致的lwjgl natives匹配错误 #5990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b40333d
修复了macos arm64版本可能导致的lwjgl natives匹配错误
yaalyy Apr 23, 2026
672abad
corrected code style
yaalyy Apr 23, 2026
24de3e2
cleaned repeated log when native patcher is triggered
yaalyy Apr 23, 2026
19b341e
Merge pull request #2 from yaalyy/log-clear
yaalyy Apr 23, 2026
c0394e4
Be compatible with another kind of legacy manifest on macos arm64
yaalyy May 3, 2026
26ed1a5
Merge pull request #3 from yaalyy/log-clear
yaalyy May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ public static Version patchNative(DefaultGameRepository repository,

if (arch == Architecture.ARM64 && (os == OperatingSystem.MACOS || os == OperatingSystem.WINDOWS)
&& gameVersionNumber != null
&& gameVersionNumber.compareTo("1.19") >= 0)
&& gameVersionNumber.compareTo("1.19") >= 0
&& !hasLegacyLwjglNatives(version))
return version;

Map<String, Library> replacements = getNatives(javaVersion.getPlatform());
Expand All @@ -148,12 +149,23 @@ public static Version patchNative(DefaultGameRepository repository,
continue;

if (library.isNative()) {
Library replacement = replacements.getOrDefault(library.getName() + ":natives", NONEXISTENT_LIBRARY);
String nativeKey = library.getName() + ":natives";
String matchedKey = nativeKey;
Library replacement = replacements.getOrDefault(nativeKey, NONEXISTENT_LIBRARY);
if (replacement == NONEXISTENT_LIBRARY) {
String classifier = library.getClassifier();
if (classifier != null) {
String classifierKey = library.getName() + ":" + classifier;
replacement = replacements.getOrDefault(classifierKey, NONEXISTENT_LIBRARY);
matchedKey = classifierKey;
}
}
Comment thread
yaalyy marked this conversation as resolved.

if (replacement == NONEXISTENT_LIBRARY) {
LOG.warning("No alternative native library " + library.getName() + ":natives provided for platform " + javaVersion.getPlatform());
newLibraries.add(library);
} else if (replacement != null) {
LOG.info("Replace " + library.getName() + ":natives with " + replacement.getName());
LOG.info("Replace " + matchedKey + " with " + replacement.getName());
newLibraries.add(replacement);
}
} else {
Expand Down Expand Up @@ -280,6 +292,26 @@ public static SupportStatus checkSupportedStatus(GameVersionNumber gameVersion,
return SupportStatus.UNTESTED;
}

private static boolean hasLegacyLwjglNatives(Version version) {
boolean hasx86 = false;
boolean hasArm64 = false;
for (Library lib : version.getLibraries()) {
if (!lib.appliesToCurrentEnvironment()) continue;
if (!"org.lwjgl".equals(lib.getGroupId())) continue;

String classifier = lib.getClassifier();
if (classifier == null || !classifier.startsWith("natives")) continue;

String c = classifier.toLowerCase(Locale.ROOT);
if (c.contains("arm64") || c.contains("aarch64")) {
hasArm64 = true;
} else {
hasx86 = true;
}
}
return hasx86 && !hasArm64;
}

public enum SupportStatus {
OFFICIAL_SUPPORTED,
LAUNCHER_SUPPORTED,
Expand Down
77 changes: 77 additions & 0 deletions HMCL/src/main/resources/assets/natives.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5199,6 +5199,83 @@
}
}
},
"org.lwjgl:lwjgl:3.3.1:natives-macos": {
"name": "org.lwjgl:lwjgl:3.3.1:natives-macos-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl/3.3.1/lwjgl-3.3.1-natives-macos-arm64.jar",
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/3.3.1/lwjgl-3.3.1-natives-macos-arm64.jar",
"sha1": "71d0d5e469c9c95351eb949064497e3391616ac9",
"size": 42693
}
}
},
"org.lwjgl:lwjgl-jemalloc:3.3.1:natives-macos": {
"name": "org.lwjgl:lwjgl-jemalloc:3.3.1:natives-macos-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-jemalloc/3.3.1/lwjgl-jemalloc-3.3.1-natives-macos-arm64.jar",
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-jemalloc/3.3.1/lwjgl-jemalloc-3.3.1-natives-macos-arm64.jar",
"sha1": "e577b87d8ad2ade361aaea2fcf226c660b15dee8",
"size": 103475
}
}
},
"org.lwjgl:lwjgl-openal:3.3.1:natives-macos": {
"name": "org.lwjgl:lwjgl-openal:3.3.1:natives-macos-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-openal/3.3.1/lwjgl-openal-3.3.1-natives-macos-arm64.jar",
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-openal/3.3.1/lwjgl-openal-3.3.1-natives-macos-arm64.jar",
"sha1": "23d55e7490b57495320f6c9e1936d78fd72c4ef8",
"size": 346125
}
}
},
"org.lwjgl:lwjgl-opengl:3.3.1:natives-macos": {
"name": "org.lwjgl:lwjgl-opengl:3.3.1:natives-macos-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-opengl/3.3.1/lwjgl-opengl-3.3.1-natives-macos-arm64.jar",
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-opengl/3.3.1/lwjgl-opengl-3.3.1-natives-macos-arm64.jar",
"sha1": "eafe34b871d966292e8db0f1f3d6b8b110d4e91d",
"size": 41665
}
}
},
"org.lwjgl:lwjgl-glfw:3.3.1:natives-macos": {
"name": "org.lwjgl:lwjgl-glfw:3.3.1:natives-macos-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-glfw/3.3.1/lwjgl-glfw-3.3.1-natives-macos-arm64.jar",
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-glfw/3.3.1/lwjgl-glfw-3.3.1-natives-macos-arm64.jar",
"sha1": "cac0d3f712a3da7641fa174735a5f315de7ffe0a",
"size": 129077
}
}
},
"org.lwjgl:lwjgl-stb:3.3.1:natives-macos": {
"name": "org.lwjgl:lwjgl-stb:3.3.1:natives-macos-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-stb/3.3.1/lwjgl-stb-3.3.1-natives-macos-arm64.jar",
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-stb/3.3.1/lwjgl-stb-3.3.1-natives-macos-arm64.jar",
"sha1": "fcf073ed911752abdca5f0b00a53cfdf17ff8e8b",
"size": 178408
}
}
},
"org.lwjgl:lwjgl-tinyfd:3.3.1:natives-macos": {
"name": "org.lwjgl:lwjgl-tinyfd:3.3.1:natives-macos-arm64",
"downloads": {
"artifact": {
"path": "org/lwjgl/lwjgl-tinyfd/3.3.1/lwjgl-tinyfd-3.3.1-natives-macos-arm64.jar",
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl-tinyfd/3.3.1/lwjgl-tinyfd-3.3.1-natives-macos-arm64.jar",
"sha1": "972ecc17bad3571e81162153077b4d47b7b9eaa9",
"size": 41380
}
}
},
"ca.weblite:java-objc-bridge:1.0.0": {
"name": "org.glavo.hmcl.mmachina:java-objc-bridge:1.1.0-mmachina.1",
"downloads": {
Expand Down