Don't apply loom-native-support when LWJGL is upgraded to support Jav…

…a 19+. Fixes a crash in 1.20.1, when using Java 21
FabricMC · Jan 10, 2024 · 615b816 · 615b816
1 parent 480dd5e
commit 615b816
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/...nfiguration/providers/minecraft/library/processors/LoomNativeSupportLibraryProcessor.java b/...nfiguration/providers/minecraft/library/processors/LoomNativeSupportLibraryProcessor.java
@@ -50,11 +50,6 @@ public ApplicationResult getApplicationResult() {
 			return ApplicationResult.MUST_APPLY;
 		}
 
-		if (platform.getOperatingSystem().isMacOS() && context.isJava19OrLater() && !context.supportsJava19OrLater()) {
-			// Apply when LWJGL has been updated on MacOS to support Java 19
-			return ApplicationResult.MUST_APPLY;
-		}
-
 		// A developer can opt into this
 		return ApplicationResult.CAN_APPLY;
 	}

diff --git a/...t/fabricmc/loom/test/unit/library/processors/LoomNativeSupportLibraryProcessorTest.groovy b/...t/fabricmc/loom/test/unit/library/processors/LoomNativeSupportLibraryProcessorTest.groovy
@@ -59,8 +59,8 @@ class LoomNativeSupportLibraryProcessorTest extends LibraryProcessorTest {
 
 		where:
 		version                 || result
-		JavaVersion.VERSION_20  || LibraryProcessor.ApplicationResult.MUST_APPLY
-		JavaVersion.VERSION_19  || LibraryProcessor.ApplicationResult.MUST_APPLY
+		JavaVersion.VERSION_20  || LibraryProcessor.ApplicationResult.CAN_APPLY
+		JavaVersion.VERSION_19  || LibraryProcessor.ApplicationResult.CAN_APPLY
 		JavaVersion.VERSION_17  || LibraryProcessor.ApplicationResult.CAN_APPLY
 		JavaVersion.VERSION_1_8 || LibraryProcessor.ApplicationResult.CAN_APPLY
 	}