fix: incorrect mc version range, continued gradle improvements

MichaelHillcox · MichaelHillcox · commit 60883d696853 · 2025-10-25T21:49:24.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'fabric-loom' version '1.11-SNAPSHOT' apply(false)
+    id 'fabric-loom' version '1.12.0-alpha.48' apply(false)
     id 'net.neoforged.moddev' version '2.0.112' apply(false)
     id "me.modmuss50.mod-publish-plugin" version "0.8.4"
 }
@@ -12,18 +12,16 @@ tasks.named('wrapper', Wrapper).configure {
 version = mod_version
 group = 'pro.mikey'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(21)
-
 allprojects {
     apply plugin: 'idea'
     apply plugin: 'java-library'
     apply plugin: 'maven-publish'
 
     version = mod_version
-    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
     tasks.withType(JavaCompile).configureEach {
         options.encoding = 'UTF-8'
+        options.release = 21
     }
 
     idea {
diff --git a/common/build.gradle b/common/build.gradle
@@ -16,6 +16,7 @@ dependencies {
 
     testImplementation platform('org.junit:junit-bom:5.10.3')
     testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 
     compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
 }
@@ -31,4 +32,4 @@ repositories {
             includeGroup "org.spongepowered"
         }
     }
-}
+}
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -44,7 +44,7 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             groupId project.group
-            artifactId project.archivesBaseName
+            artifactId project.base.archivesName.get()
             version project.version
             from components.java
         }
diff --git a/gradle.properties b/gradle.properties
@@ -11,9 +11,9 @@ parchment_minecraft_version=1.21.8
 parchment_mappings_version=2025.09.14
 
 mod_id=xray
-mod_version=21.9.0
+mod_version=21.9.1
 minecraft_version=1.21.9
-minecraft_version_range=1.21.9,1.21.10
+minecraft_version_range=1.21.9,1.22
 
 # Forge
 forge_version=21.9.11-beta
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -40,7 +40,7 @@ repositories {
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifactId = rootProject.archivesBaseName
+            artifactId = rootProject.base.archivesName.get()
             from components.java
         }
     }
diff --git a/settings.gradle b/settings.gradle
@@ -8,8 +8,4 @@ pluginManagement {
     }
 }
 
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
-}
-
-include("common", "neoforge", "fabric")
+include("common", "neoforge", "fabric")

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ dependencies {`
`16`	`16`
`17`	`17`	`testImplementation platform('org.junit:junit-bom:5.10.3')`
`18`	`18`	`testImplementation 'org.junit.jupiter:junit-jupiter'`
	`19`	`+ testRuntimeOnly "org.junit.platform:junit-platform-launcher"`
`19`	`20`
`20`	`21`	`compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'`
`21`	`22`	`}`
`@@ -31,4 +32,4 @@ repositories {`
`31`	`32`	`includeGroup "org.spongepowered"`
`32`	`33`	`}`
`33`	`34`	`}`
`34`		`-}`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ publishing {`
`44`	`44`	`publications {`
`45`	`45`	`mavenJava(MavenPublication) {`
`46`	`46`	`groupId project.group`
`47`		`- artifactId project.archivesBaseName`
	`47`	`+ artifactId project.base.archivesName.get()`
`48`	`48`	`version project.version`
`49`	`49`	`from components.java`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ repositories {`
`40`	`40`	`publishing {`
`41`	`41`	`publications {`
`42`	`42`	`mavenJava(MavenPublication) {`
`43`		`- artifactId = rootProject.archivesBaseName`
	`43`	`+ artifactId = rootProject.base.archivesName.get()`
`44`	`44`	`from components.java`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,4 @@ pluginManagement {`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`11`		`-plugins {`
`12`		`- id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'`
`13`		`-}`
`14`		`-`
`15`		`-include("common", "neoforge", "fabric")`
	`11`	`+include("common", "neoforge", "fabric")`