Refactor native library checks for improved clarity and efficiency (#6857)

This commit is contained in:
Glavo
2026-09-12 20:39:34 +08:00
committed by GitHub
parent 7bacc2bb5a
commit 97cf9dcf16
2 changed files with 4 additions and 7 deletions
@@ -107,7 +107,7 @@ public final class NativePatcher {
.filter(library -> {
if (library.classifier() != null && library.classifier().startsWith("natives")
&& "org.lwjgl".equals(library.groupId())) {
if ((useNativeGLFWorSDL && ("lwjgl-glfw".equals(library.artifactId()) || library.artifactId().contains("sdl")))
if ((useNativeGLFWorSDL && ("lwjgl-glfw".equals(library.artifactId()) || "lwjgl-sdl".equals(library.artifactId())))
|| (useNativeOpenAL && "lwjgl-openal".equals(library.artifactId()))) {
LOG.info("Filter out " + library.name());
return false;
@@ -203,12 +203,9 @@ public record Library(
return true;
}
if (downloads != null && downloads.classifiers() != null
&& downloads.classifiers().keySet().stream().anyMatch(s -> s.startsWith("native"))) {
return true;
}
return this.artifact().getClassifier() != null && this.artifact().getClassifier().startsWith("natives-");
return downloads != null
&& downloads.classifiers() != null
&& downloads.classifiers().keySet().stream().anyMatch(s -> s.startsWith("native"));
}
public @Nullable LibraryDownloadInfo getRawDownloadInfo() {