Merge pull request #27 from Wyvest/patch-1

Deftu · web-flow · commit 8528695baba1 · 2025-10-02T06:53:47.000+02:00
Update lwjglVersion to use propertyOr for versioning
diff --git a/src/main/kotlin/dev/deftu/gradle/tools/minecraft/loom.gradle.kts b/src/main/kotlin/dev/deftu/gradle/tools/minecraft/loom.gradle.kts
@@ -198,7 +198,7 @@ if (propertyBoolOr("loom.appleSiliconFix", true) && mcData.version < MinecraftVe
             }
         }
 
-        val lwjglVersion = "2.9.4+legacyfabric.8"
+        val lwjglVersion = propertyOr("loom.appleSiliconFix.version", "2.9.4+legacyfabric.15")
 
         configurations.all {
             resolutionStrategy {
@@ -207,7 +207,6 @@ if (propertyBoolOr("loom.appleSiliconFix", true) && mcData.version < MinecraftVe
                         if (requested is ModuleComponentSelector) {
                             val module = (requested as ModuleComponentSelector)
                             if (module.group == "org.lwjgl.lwjgl") {
-                                logger.warn("Substituting ${module.group}:${module.module}:${module.version} with ${module.group}:${module.module}:$lwjglVersion")
                                 useTarget(module.group + ":" + module.module + ":" + lwjglVersion)
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ if (propertyBoolOr("loom.appleSiliconFix", true) && mcData.version < MinecraftVe`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`
`201`		`- val lwjglVersion = "2.9.4+legacyfabric.8"`
	`201`	`+ val lwjglVersion = propertyOr("loom.appleSiliconFix.version", "2.9.4+legacyfabric.15")`
`202`	`202`
`203`	`203`	`configurations.all {`
`204`	`204`	`resolutionStrategy {`
`@@ -207,7 +207,6 @@ if (propertyBoolOr("loom.appleSiliconFix", true) && mcData.version < MinecraftVe`
`207`	`207`	`if (requested is ModuleComponentSelector) {`
`208`	`208`	`val module = (requested as ModuleComponentSelector)`
`209`	`209`	`if (module.group == "org.lwjgl.lwjgl") {`
`210`		`- logger.warn("Substituting ${module.group}:${module.module}:${module.version} with ${module.group}:${module.module}:$lwjglVersion")`
`211`	`210`	`useTarget(module.group + ":" + module.module + ":" + lwjglVersion)`
`212`	`211`	`}`
`213`	`212`	`}`