Update for Minecraft 26.1

Author: YaLTeR

.github/workflows/gradle.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: adopt
-          java-version: 21
+          java-version: 25
 
       - name: Build (Forge)
         run: ./gradlew -p forge build
@@ -45,7 +45,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: adopt
-          java-version: 21
+          java-version: 25
 
       - name: Build (NeoForge)
         run: ./gradlew -p neoforge build
@@ -67,7 +67,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: adopt
-          java-version: 21
+          java-version: 25
 
       - name: Build (Fabric)
         run: ./gradlew -p fabric build
@@ -89,13 +89,14 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: adopt
-          java-version: 21
+          java-version: 25
 
       - name: Build testmod
         run: ./gradlew -p fabric testmodClientClasses
 
+      # Fabric Loom 1.15 runs xvfb-run for us on a Linux CI.
       - name: Run gametest
-        run: xvfb-run ./gradlew -p fabric runClientGametest
+        run: ./gradlew -p fabric runClientGametest
 
       - name: Upload screenshot
         uses: actions/upload-artifact@v6

fabric/build.gradle

@@ -1,16 +1,16 @@
 plugins {
-    id 'fabric-loom' version '1.13-SNAPSHOT'
+    id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT'
 }
 
 version = project.modVersion
 group = "yalter.mousetweaks"
-archivesBaseName = "MouseTweaks-fabric-mc${project.fabricMcVersion}"
+base.archivesName = "MouseTweaks-fabric-mc${project.fabricMcVersion}"
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(project.modJavaVersion)
 
 repositories {
     maven {
-        url "https://maven.terraformersmc.com/releases"
+        url = "https://maven.terraformersmc.com/releases"
     }
 }
 
@@ -42,26 +42,29 @@ sourceSets {
 }
 
 loom {
-    mixin.defaultRefmapName = 'mousetweaks.mixins.refmap.json'
-
     runs {
         clientGametest {
             client()
             ideConfigGenerated true
             name "Client Game Test"
             source sourceSets.testmodClient
             vmArg "-Dfabric.client.gametest"
+
+            // Without this, world loading gets stuck on GitHub Actions currently.
+            // https://docs.fabricmc.net/develop/automatic-testing#run-game-tests-on-github-actions
+            //
+            // And world disconnect also gets stuck, even locally.
+            vmArg "-Dfabric.client.gametest.disableNetworkSynchronizer=true"
         }
     }
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:${project.fabricMcVersion}"
-    mappings loom.officialMojangMappings()
-    modImplementation "net.fabricmc:fabric-loader:${project.fabricLoaderVersion}"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabricApiVersion}"
+    implementation "net.fabricmc:fabric-loader:${project.fabricLoaderVersion}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabricApiVersion}"
 
-    modImplementation "com.terraformersmc:modmenu:${project.fabricModMenuVersion}"
+    implementation "com.terraformersmc:modmenu:${project.fabricModMenuVersion}"
 
     testmodClientImplementation sourceSets.main.output
 }

fabric/settings.gradle

@@ -8,3 +8,7 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}

forge/build.gradle

@@ -1,15 +1,7 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.minecraftforge.net' }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0,6.2)', changing: true
-        classpath 'org.spongepowered:mixingradle:0.7.+'
-    }
+plugins {
+    id 'java'
+    id 'net.minecraftforge.gradle' version '[7.0.17,8)'
 }
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.spongepowered.mixin'
 
 version = project.modVersion
 group = "yalter.mousetweaks"
@@ -34,46 +26,30 @@ sourceSets {
     }
 }
 
-mixin {
-    config 'mousetweaks.mixins.json'
-}
-
 minecraft {
-    mappings channel: 'official', version: project.forgeMcVersion
-
-    reobf = false
-
     runs {
-        client {
-            workingDirectory project.file('run')
+        configureEach {
+            workingDir = layout.projectDirectory.dir('run')
 
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'eventbus.api.strictRuntimeChecks', 'true'
+            systemProperty 'forge.logging.markers', 'REGISTRIES'
+            systemProperty 'forge.logging.console.level', 'debug'
+            systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
 
-            mods {
-                mousetweaks {
-                    source sourceSets.main
-                }
-            }
+            args "--mixin.config=mousetweaks.mixins.json"
         }
 
-        server {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'eventbus.api.strictRuntimeChecks', 'true'
-
-            mods {
-                mousetweaks {
-                    source sourceSets.main
-                }
-            }
-        }
+        register('client')
+        register('server')
     }
 }
 
+repositories {
+    minecraft.mavenizer(it)
+    maven fg.forgeMaven
+    maven fg.minecraftLibsMaven
+    mavenCentral()
+}
+
 processResources {
     inputs.property "version", project.modVersion
     filesMatching("META-INF/mods.toml") {
@@ -87,39 +63,29 @@ processResources {
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${project.forgeMcVersion}-${project.forgeVersion}"
+    implementation minecraft.dependency("net.minecraftforge:forge:${project.forgeMcVersion}-${project.forgeVersion}")
     annotationProcessor "net.minecraftforge:eventbus-validator:${project.forgeEventBusValidatorVersion}"
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 }
 
 jar {
     manifest.attributes([
-            "Specification-Title"     : "Mouse Tweaks",
-            "Specification-Vendor"    : "YaLTeR",
-            "Specification-Version"   : "${project.version}",
-            "Implementation-Title"    : project.name,
-            "Implementation-Version"  : "${project.version}",
-            "Implementation-Vendor"   : "YaLTeR",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-            "TweakClass"              : 'org.spongepowered.asm.launch.MixinTweaker',
-            "TweakOrder"              : 0,
-            "MixinConfigs"            : "mousetweaks.mixins.json"
+            "MixinConfigs": "mousetweaks.mixins.json"
     ])
 }
 
-task srcJar(type: Jar) {
+tasks.register('srcJar', Jar) {
     archiveClassifier.set("src")
     from sourceSets.main.allJava
 }
 
-task apiJar(type: Jar) {
+tasks.register('apiJar', Jar) {
     archiveClassifier.set("api")
     from(sourceSets.main.output) {
         include 'yalter/mousetweaks/api/**'
     }
 }
 
-artifacts {
-    archives srcJar
-    archives apiJar
+tasks.named("assemble") {
+    dependsOn(srcJar)
+    dependsOn(apiJar)
 }

forge/settings.gradle

@@ -5,3 +5,7 @@ pluginManagement {
         maven { url = 'https://maven.minecraftforge.net/' }
     }
 }
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}

gradle.properties

@@ -4,22 +4,28 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 org.gradle.daemon=false
 
-modVersion=2.30
-modJavaVersion=21
+# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349
+org.gradle.configuration-cache=false
+
+modVersion=2.31
+modJavaVersion=25
 # Remember to update fabric.mod.json
 modCredits=Contributors: mezz, juliand665, panoskj, FabiClawZ, ErrorMikey, livInFear, Abelpro678.
 modDescription=A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.
 
-forgeMcVersion=1.21.11
-forgeVersion=61.0.1
-forgeLoaderVersion=[59,)
-forgeEventBusValidatorVersion=7.0-beta.7
+# Required for ForgeGradle to put mods.toml in the right place so it can find our mod.
+net.minecraftforge.gradle.merge-source-sets=true
+
+forgeMcVersion=26.1
+forgeVersion=62.0.4
+forgeLoaderVersion=[62,)
+forgeEventBusValidatorVersion=7.0.1
 
-neoMcVersion=1.21.11
-neoVersion=21.11.3-beta
+neoMcVersion=26.1
+neoVersion=26.1.0.1-beta
 neoLoaderVersion=[4,)
 
-fabricMcVersion=1.21.11
-fabricLoaderVersion=0.18.2
-fabricApiVersion=0.139.4+1.21.11
-fabricModMenuVersion=17.0.0-alpha.1
+fabricMcVersion=26.1
+fabricLoaderVersion=0.18.5
+fabricApiVersion=0.144.3+26.1
+fabricModMenuVersion=18.0.0-alpha.8

gradle/wrapper/gradle-wrapper.jar

@@ -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.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME