Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 39 additions & 3 deletions HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public static GameInstanceManifest patchNative(DefaultGameInstance instance,
return manifest;

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

Map<String, Library> replacements = getNatives(javaVersion.getPlatform());
Expand All @@ -133,12 +134,24 @@ public static GameInstanceManifest patchNative(DefaultGameInstance instance,
continue;

if (library.isNative()) {
Library replacement = replacements.getOrDefault(library.name() + ":natives", NONEXISTENT_LIBRARY);
String nativeKey = library.name() + ":natives";
String matchedKey = nativeKey;
Library replacement = replacements.getOrDefault(nativeKey, NONEXISTENT_LIBRARY);
if (replacement == NONEXISTENT_LIBRARY) {
// Some legacy manifests use a classifier-specific replacement key.
String classifier = library.classifier();
if (classifier != null) {
String classifierKey = library.name() + ":" + classifier;
replacement = replacements.getOrDefault(classifierKey, NONEXISTENT_LIBRARY);
matchedKey = classifierKey;
}
}

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

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

String classifier = lib.classifier();
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
Original file line number Diff line number Diff line change
Expand Up @@ -6111,6 +6111,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
Loading