Update to MC 1.21.11

Author: rubensworks

.github/workflows/ci.yml

@@ -53,7 +53,7 @@ jobs:
           GITHUB_USER: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 'Test'
-        run: ./gradlew test :loader-neoforge:runGameTestServer :loader-fabric:runGameTestServer jacocoTestReport -x :loader-forge:downloadAssets
+        run: ./gradlew test runGameTestServer jacocoTestReport
       - name: 'Submit coverage results'
         uses: coverallsapp/github-action@v2
       - name: 'Deploy as GitHub CI artifacts'

build.gradle

@@ -3,8 +3,9 @@ plugins {
     id 'com.diffplug.spotless' version '6.25.0' apply false
 	id 'com.modrinth.minotaur' version '2.+' apply false
 
-	id 'fabric-loom' version '1.13-SNAPSHOT' apply false
-	id 'net.neoforged.moddev' version '2.0.119' apply false
-	id 'net.minecraftforge.gradle' version '[6.0.46,6.2)' apply false
+	id 'net.fabricmc.fabric-loom-remap' version '1.14-SNAPSHOT' apply false
+	id 'net.neoforged.moddev' version '2.0.126' apply false
+	id 'net.minecraftforge.accesstransformers' version '5.0.3' apply false
+	id 'net.minecraftforge.gradle' version '7.0.0-beta.55' apply false
 }
 

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -248,7 +248,7 @@ publishing {
     publications { PublicationContainer publicationContainer ->
         publicationContainer.register("maven", MavenPublication) { MavenPublication publication ->
             publication.artifacts = [jar, javadocJar, deobfJar, sourcesJar]
-            publication.artifactId = project.archivesBaseName.toLowerCase() // GH can't handle uppercase...
+            publication.artifactId = project.base.archivesName.get().toLowerCase() // GH can't handle uppercase...
         }
     }
 }

buildSrc/src/main/groovy/multiloader-loader-fabric.gradle

@@ -2,7 +2,7 @@
 
 plugins {
     id 'multiloader-loader'
-    id 'fabric-loom'
+    id 'net.fabricmc.fabric-loom-remap'
 }
 dependencies {
     minecraft "com.mojang:minecraft:${minecraft_version}"
@@ -66,7 +66,7 @@ publishing {
     publications { PublicationContainer publicationContainer ->
         publicationContainer.getByName("maven") { MavenPublication publication ->
             publication.artifacts = [remapJar, javadocJar, deobfJar, remapSourcesJar]
-            publication.artifactId = project.archivesBaseName.toLowerCase() // GH can't handle uppercase...
+            publication.artifactId = project.base.archivesName.get().toLowerCase() // GH can't handle uppercase...
         }
     }
 }

buildSrc/src/main/groovy/multiloader-loader-forge.gradle

@@ -2,22 +2,26 @@
 
 plugins {
     id 'multiloader-loader'
+    id 'net.minecraftforge.accesstransformers'
     id 'net.minecraftforge.gradle'
 }
 
 // All jar files from this folder will be added automatically as runtime mod dependencies (inspired by AE2's build.gradle)
 def extraModsDir = "extra-mods"
 
 repositories {
+    maven minecraft.mavenizer
+    maven fg.forgeMaven
+    maven fg.minecraftLibsMaven
     flatDir {
         name "extra-mods"
         dir file(extraModsDir)
     }
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.7'
+    implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}")
+    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.10'
 
     testImplementation "junit:junit:4.12"
     testImplementation "org.mockito:mockito-core:1.+"
@@ -41,66 +45,37 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 minecraft {
     mappings channel: 'official', version: minecraft_version
 
-    reobf = false
-
-    copyIdeResources.set(true)
-
     // Automatically enable neoforge AccessTransformers if the file exists
     def at = project(':loader-common').file('src/main/resources/META-INF/accesstransformer.cfg')
     if (at.exists()) {
-        accessTransformer = file(at.absolutePath)
+        accessTransformers = '../../../../loader-common/src/main/resources/META-INF/accesstransformer.cfg'
     }
 
     runs {
-        client {
-            property 'forge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
-            property 'eventbus.api.strictRuntimeChecks', 'true'
-            workingDirectory file('runs/client')
-            ideaModule "${rootProject.name}.${project.name}.main"
-            taskName 'Client'
-            mods {
-                modClientRun {
-                    source sourceSets.main
-                }
-            }
+        configureEach {
+            workingDir.convention layout.projectDirectory.dir('run')
+            //systemProperty 'forge.logging.markers', 'REGISTRIES'
+            systemProperty 'forge.logging.console.level', 'debug'
+            systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
+            jvmArgs "-XstartOnFirstThread" // Fixes startup error
+        }
+
+        register('client') {
+            systemProperty 'forge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
         }
 
-        server {
-            property 'forge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
-            property 'eventbus.api.strictRuntimeChecks', 'true'
+        register('server') {
+            systemProperty 'forge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
             args '--nogui'
-            workingDirectory file('runs/server')
-            ideaModule "${rootProject.name}.${project.name}.main"
-            taskName 'Server'
-            mods {
-                modServerRun {
-                    source sourceSets.main
-                }
-            }
         }
 
-        gameTestServer {
-            property 'forge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
-            workingDirectory file('runs/gametest')
-            ideaModule "${rootProject.name}.${project.name}.main"
-            taskName 'runGameTestServer'
-            mods {
-                modDataRun {
-                    source sourceSets.main
-                }
-            }
+        register('gameTestServer') {
+            systemProperty 'forge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
         }
 
-        data {
-            workingDirectory file('runs/data')
-            ideaModule "${rootProject.name}.${project.name}.main"
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-            taskName 'Data'
-            mods {
-                modDataRun {
-                    source sourceSets.main
-                }
-            }
+        register('data') {
+            workingDir = layout.projectDirectory.dir('run-data')
+            args '--mod', mod_id, '--all', '--output', layout.projectDirectory.dir('src/generated/resources'), '--existing', layout.projectDirectory.dir('src/main/resources')
         }
     }
 }

gradle.properties

@@ -4,7 +4,7 @@ group=org.cyclops.structuredcrafting
 java_version=21
 
 # Common
-minecraft_version=1.21.10
+minecraft_version=1.21.11
 mod_name=StructuredCrafting
 mod_author=rubensworks (aka kroeser)
 mod_id=structuredcrafting
@@ -14,25 +14,25 @@ issue_tracker_url=https://github.com/CyclopsMC/StructuredCrafting/issues
 display_url=https://www.curseforge.com/minecraft/mc-mods/structured-crafting
 description=Craft stuff in your world, automatically.
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
-neo_form_version=1.21.10-20251010.172816
+neo_form_version=1.21.11-20251209.172050
 parchment_version=2025.10.12
 parchment_minecraft_version=1.21.10
 curseforge_project_id=233151
 modrinth_project_id=GTi2kHAW
 
 # Fabric
-fabric_version=0.138.3+1.21.10
-fabric_loader_version=0.18.1
+fabric_version=0.140.0+1.21.11
+fabric_loader_version=0.18.2
 # Dependencies
-fabric_forgeconfigapiport_version=21.10.1
+fabric_forgeconfigapiport_version=21.11.1
 
 # NeoForge
-neoforge_version=21.10.53-beta
+neoforge_version=21.11.10-beta
 neoforge_loader_version_range=[4,)
 neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/structured-crafting.json
 
 # Forge
-forge_version=60.1.0
+forge_version=61.0.3
 forge_loader_version_range=[2,)
 forge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/forge_update/structured-crafting.json
 
@@ -42,4 +42,4 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Common dependencies
-cyclopscore_version=1.25.5-854
+cyclopscore_version=1.25.5-868

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.3.0-rc-1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

loader-common/src/main/java/org/cyclops/structuredcrafting/RegistryEntries.java

@@ -1,7 +1,7 @@
 package org.cyclops.structuredcrafting;
 
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -14,10 +14,10 @@
  */
 public class RegistryEntries {
 
-    public static final DeferredHolderCommon<Item, Item> ITEM_STRUCTURED_CRAFTER = DeferredHolderCommon.create(Registries.ITEM, ResourceLocation.parse("structuredcrafting:structured_crafter"));
+    public static final DeferredHolderCommon<Item, Item> ITEM_STRUCTURED_CRAFTER = DeferredHolderCommon.create(Registries.ITEM, Identifier.parse("structuredcrafting:structured_crafter"));
 
-    public static final DeferredHolderCommon<Block, Block> BLOCK_STRUCTURED_CRAFTER = DeferredHolderCommon.create(Registries.BLOCK, ResourceLocation.parse("structuredcrafting:structured_crafter"));
+    public static final DeferredHolderCommon<Block, Block> BLOCK_STRUCTURED_CRAFTER = DeferredHolderCommon.create(Registries.BLOCK, Identifier.parse("structuredcrafting:structured_crafter"));
 
-    public static final DeferredHolderCommon<BlockEntityType<?>, BlockEntityType<BlockEntityStructuredCrafter>> BLOCK_ENTITY_STRUCTURED_CRAFTER = DeferredHolderCommon.create(Registries.BLOCK_ENTITY_TYPE, ResourceLocation.parse("structuredcrafting:structured_crafter"));
+    public static final DeferredHolderCommon<BlockEntityType<?>, BlockEntityType<BlockEntityStructuredCrafter>> BLOCK_ENTITY_STRUCTURED_CRAFTER = DeferredHolderCommon.create(Registries.BLOCK_ENTITY_TYPE, Identifier.parse("structuredcrafting:structured_crafter"));
 
 }

loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api

@@ -35,7 +35,6 @@ pluginManagement {
             filter {
                 includeGroup('net.fabricmc')
                 includeGroupByRegex("net\\.fabricmc\\..*")
-                includeGroup('fabric-loom')
             }
         }
         exclusiveContent {
@@ -66,9 +65,6 @@ pluginManagement {
 
     resolutionStrategy {
         eachPlugin {
-            if (requested.id.id == "net.minecraftforge.gradle") {
-                useModule("${requested.id}:ForgeGradle:${requested.version}")
-            }
             if (requested.id.id == "org.spongepowered.mixin") {
                 useModule("org.spongepowered:mixingradle:${requested.version}")
             }
@@ -77,7 +73,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 // This should match the folder name of the project, or else IDEA may complain (see https://youtrack.jetbrains.com/issue/IDEA-317606)