Update to MC 1.21.10

Author: rubensworks

.gitignore

@@ -30,3 +30,6 @@ extra-mods
 # Ignore files specific to dev environments
 secrets.properties
 changelog.txt
+
+loader-neoforge/.cache
+loader-neoforge/config

build.gradle

@@ -1,11 +1,10 @@
 plugins {
-    id 'net.darkhax.curseforgegradle' version '1.1.26' apply false
+    id 'net.darkhax.curseforgegradle' version '1.1.28' apply false
     id 'com.diffplug.spotless' version '6.25.0' apply false
 	id 'com.modrinth.minotaur' version '2.+' apply false
 
-	id 'fabric-loom' version '1.10-SNAPSHOT' apply false
-	id 'net.neoforged.moddev' version '2.0.95' apply false
-	id 'net.neoforged.gradle.userdev' version '7.0.185' apply false
-	id 'net.minecraftforge.gradle' version '[6.0.36,6.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
 }
 

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

@@ -274,16 +274,6 @@ tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
 
-// The following is required to fix running unit tests during build phase
-tasks.configureEach { task ->
-    if (task.name.startsWith("test")) {
-        task.enabled = true
-    }
-    if (task.name.startsWith("testJunit")) {
-        task.enabled = false
-    }
-}
-
 javadoc {
     // prevent java 8's strict doclint for javadocs from failing builds
     options.addStringOption('Xdoclint:accessibility,html,reference,syntax', '-quiet')

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

@@ -2,7 +2,7 @@
 
 plugins {
     id 'multiloader-loader'
-    id 'net.neoforged.gradle.userdev'
+    id 'net.neoforged.moddev'
 }
 
 // All jar files from this folder will be added automatically as runtime mod dependencies (inspired by AE2's build.gradle)
@@ -16,10 +16,13 @@ repositories {
 }
 
 dependencies {
-    implementation "net.neoforged:neoforge:${neoforge_version}"
-
-    testImplementation "junit:junit:4.12"
-    testImplementation "org.mockito:mockito-core:1.+"
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.1'
+    testImplementation 'org.junit.platform:junit-platform-suite-api:1.14.1'
+    testImplementation 'org.hamcrest:hamcrest:2.1'
+    testImplementation "org.mockito:mockito-core:2.+"
+    testRuntimeOnly 'org.junit.platform:junit-platform-suite-engine'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
     // Locally sourced extra mods for runtime (i.e. testing)
     for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) {
@@ -34,45 +37,45 @@ dependencies {
 
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
-minecraft {
-    // Automatically enable neoforge AccessTransformers if the file exists
-    def at = project(':loader-common').file('src/main/resources/META-INF/accesstransformer.cfg')
-    if (at.exists()) {
-        accessTransformers {
-            file(at.absolutePath)
-        }
-    }
-}
+neoForge {
+    version = "${neoforge_version}"
 
-subsystems {
     parchment {
-        minecraftVersion = "${parchment_minecraft_version}"
         mappingsVersion = "${parchment_version}"
-    }
-}
-
-runs {
-    configureEach {
-        systemProperty 'neoforge.logging.markers', 'REGISTRIES'
-        systemProperty 'neoforge.logging.console.level', 'debug'
-        modSource project.sourceSets.main
+        minecraftVersion = "${parchment_minecraft_version}"
     }
 
-    client {
-        systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
+    // Automatically enable neoforge AccessTransformers if the file exists
+    def at = project(':loader-common').file('src/main/resources/META-INF/accesstransformer.cfg')
+    if (at.exists()) {
+        accessTransformers = [ at.absolutePath ]
     }
 
-    server {
-        systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
-        argument '--nogui'
-    }
+    // TODO: enable this once the Forge ATs change format
+//    validateAccessTransformers = true
 
-    gameTestServer {
-        systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
+    runs {
+        client {
+            client()
+        }
+        server {
+            server()
+            programArgument '--nogui'
+        }
+        gameTestServer {
+            type = "gameTestServer"
+        }
+        configureEach {
+            systemProperty 'forge.logging.markers', 'REGISTRIES'
+            logLevel = org.slf4j.event.Level.DEBUG
+            systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
+        }
     }
 
-     clientData {
-        arguments.addAll '--mod', mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+    mods {
+        "${mod_id}" {
+            sourceSet(sourceSets.main)
+        }
     }
 }
 

gradle.properties

@@ -4,7 +4,7 @@ group=org.cyclops.structuredcrafting
 java_version=21
 
 # Common
-minecraft_version=1.21.8
+minecraft_version=1.21.10
 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.7-20250630.141722
-parchment_version=2025.06.15
-parchment_minecraft_version=1.21.5
+neo_form_version=1.21.10-20251010.172816
+parchment_version=2025.10.12
+parchment_minecraft_version=1.21.10
 curseforge_project_id=233151
 modrinth_project_id=GTi2kHAW
 
 # Fabric
-fabric_version=0.130.0+1.21.8
-fabric_loader_version=0.16.14
+fabric_version=0.138.3+1.21.10
+fabric_loader_version=0.18.1
 # Dependencies
-fabric_forgeconfigapiport_version=21.8.0
+fabric_forgeconfigapiport_version=21.10.1
 
 # NeoForge
-neoforge_version=21.8.20
+neoforge_version=21.10.53-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=58.0.1
+forge_version=60.1.0
 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-793
+cyclopscore_version=1.25.5-854

loader-common/src/main/java/org/cyclops/structuredcrafting/block/BlockStructuredCrafter.java

@@ -52,7 +52,7 @@ protected MapCodec<? extends BaseEntityBlock> codec() {
     @Override
     @Nullable
     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
-        return level.isClientSide ? null : BaseEntityBlock.createTickerHelper(blockEntityType, RegistryEntries.BLOCK_ENTITY_STRUCTURED_CRAFTER.value(), new BlockEntityStructuredCrafter.Ticker());
+        return level.isClientSide() ? null : BaseEntityBlock.createTickerHelper(blockEntityType, RegistryEntries.BLOCK_ENTITY_STRUCTURED_CRAFTER.value(), new BlockEntityStructuredCrafter.Ticker());
     }
 
     @Override

loader-common/src/main/java/org/cyclops/structuredcrafting/blockentity/BlockEntityStructuredCrafter.java

@@ -50,7 +50,7 @@ protected void update(Level level, BlockPos pos, BlockState blockState, BlockEnt
             super.update(level, pos, blockState, blockEntity);
 
             blockEntity.setTickOffset((blockEntity.getTickOffset() + 1) % SPEED);
-            if(!level.isClientSide && blockEntity.getTickOffset() == 0) {
+            if(!level.isClientSide() && blockEntity.getTickOffset() == 0) {
                 if(level.hasNeighborSignal(pos)) {
                     blockEntity.getMatrix().craft(false);
                 } else {

loader-common/src/main/java/org/cyclops/structuredcrafting/gametest/GameTestsCommon.java

@@ -564,7 +564,7 @@ protected void assertChestEmpty(GameTestHelper helper, BlockPos pos) {
     }
 
     protected void assertChestContains(GameTestHelper helper, BlockPos pos, ItemStack itemStack) {
-        helper.assertBlockEntityData(pos, ChestBlockEntity.class, (ChestBlockEntity chest) -> ItemStack.matches(chest.getItem(0), itemStack), () -> Component.literal("Chest is not empty"));
+        helper.assertBlockEntityData(pos, ChestBlockEntity.class, (ChestBlockEntity chest) -> ItemStack.matches(chest.getItem(0), itemStack), () -> Component.literal("Chest does not contain: " + itemStack));
     }
 
 }

loader-neoforge/build.gradle

@@ -36,10 +36,12 @@ dependencies {
     }
 }
 
-runs {
-    configureEach {
-        modSource project.sourceSets.main
-        modSource project.sourceSets.api
+neoForge {
+    addModdingDependenciesTo sourceSets.api
+    mods {
+        structuredcrafting {
+            sourceSet(sourceSets.api)
+        }
     }
 }