Update to 26.1

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 9.2.1
+          gradle-version: 9.4.1
       - name: Setup workspace
         run: gradle preprocessBase
       - name: Build
@@ -38,7 +38,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        version: ["1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11"]
+        version: ["1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11", "26.1.2"]
     steps:
       - uses: actions/download-artifact@v4
         with:

1.20.4/build.gradle

@@ -10,4 +10,12 @@ java {
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.release = 17
+}
+
+dependencies {
+	mappings loom.officialMojangMappings()
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
 }

1.20.6/build.gradle

@@ -3,3 +3,19 @@ plugins {
 }
 
 apply from: "../common.gradle"
+
+java {
+	sourceCompatibility = targetCompatibility = 21
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+dependencies {
+	mappings loom.officialMojangMappings()
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+}

1.21.1/build.gradle

@@ -3,3 +3,19 @@ plugins {
 }
 
 apply from: "../common.gradle"
+
+java {
+	sourceCompatibility = targetCompatibility = 21
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+dependencies {
+	mappings loom.officialMojangMappings()
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+}

1.21.10/build.gradle

@@ -3,3 +3,19 @@ plugins {
 }
 
 apply from: "../common.gradle"
+
+java {
+	sourceCompatibility = targetCompatibility = 21
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+dependencies {
+	mappings loom.officialMojangMappings()
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+}

1.21.11/build.gradle

@@ -3,3 +3,19 @@ plugins {
 }
 
 apply from: "../common.gradle"
+
+java {
+	sourceCompatibility = targetCompatibility = 21
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+dependencies {
+	mappings loom.officialMojangMappings()
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+}

1.21.3/build.gradle

@@ -3,3 +3,19 @@ plugins {
 }
 
 apply from: "../common.gradle"
+
+java {
+	sourceCompatibility = targetCompatibility = 21
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+dependencies {
+	mappings loom.officialMojangMappings()
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+}

1.21.4/build.gradle

@@ -3,3 +3,19 @@ plugins {
 }
 
 apply from: "../common.gradle"
+
+java {
+	sourceCompatibility = targetCompatibility = 21
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+dependencies {
+	mappings loom.officialMojangMappings()
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+}

1.21.5/build.gradle

@@ -3,3 +3,19 @@ plugins {
 }
 
 apply from: "../common.gradle"
+
+java {
+	sourceCompatibility = targetCompatibility = 21
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+dependencies {
+	mappings loom.officialMojangMappings()
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+}

1.21.8/build.gradle

@@ -3,3 +3,19 @@ plugins {
 }
 
 apply from: "../common.gradle"
+
+java {
+	sourceCompatibility = targetCompatibility = 21
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 21
+}
+
+dependencies {
+	mappings loom.officialMojangMappings()
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+}

26.1.2/build.gradle

@@ -0,0 +1,9 @@
+plugins {
+	id 'net.fabricmc.fabric-loom' version "${loom_version}"
+}
+
+apply from: "../common.gradle"
+
+java {
+	sourceCompatibility = targetCompatibility = 25
+}

26.1.2/gradle.properties

@@ -0,0 +1,5 @@
+org.gradle.jvmargs=-Xmx3G
+
+minecraft_version=26.1.2
+allowed_mc_version=>1.21.11 <=26.1.2
+fabric_version=0.145.4+26.1.2

build.gradle

@@ -4,6 +4,7 @@ plugins {
 
 discombobulator {
 	versions = [
+		"26.1.2":"",
 		"1.21.11":"",
 		"1.21.10":"",
 		"1.21.8":"",
@@ -18,7 +19,11 @@ discombobulator {
 	patterns = [
 		GraphicsDelta: [
 			"def": "float",
-			"1.21.1": "DeltaTracker"
+			"1.21.1": "DeltaTracker",
+		],
+		GraphicsExtractor: [
+			"def": "GuiGraphics",
+			"26.1.2": "GuiGraphicsExtractor"
 		],
 		ResourceLocation: [
 			"def": "new ResourceLocation",
@@ -29,4 +34,6 @@ discombobulator {
 	ignoredFileFormats = ["*.png"]
 
 	defaultLineFeed = "\n"
+
+	accessWidenerOfficial = [ "26.1.2" ]
 }

common.gradle

@@ -1,7 +1,3 @@
-java {
-	sourceCompatibility = targetCompatibility = 21
-	//withSourcesJar()
-}
 
 def snapshot = project.release=="true" ? "" : "-SNAPSHOT"
 def mod_version = project.mod_version + snapshot
@@ -13,18 +9,13 @@ base {
 	archivesName = "${mod_name}-${minecraft_version}"
 }
 
-tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
-}
-
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${minecraft_version}"
-	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
 }
 
 loom {

gradle.properties

@@ -2,14 +2,14 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.configuration-cache=true
 
 # fabric
-loader_version=0.18.2
-loom_version=1.14-SNAPSHOT
+loader_version=0.19.1
+loom_version=1.16-SNAPSHOT
 
 # preprocessor
-discombobulator_version=1.4
+discombobulator_version=1.5-SNAPSHOT
 
 # mod
 mod_name=LoTAS-Light
-mod_version=1.3.4
+mod_version=1.3.5
 maven_group=com.minecrafttas
 release=false

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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME