Update to MC 1.21.10

Author: rubensworks

.gitignore

@@ -27,3 +27,6 @@ keystore.jks
 secrets.properties
 build_number.properties
 changelog.txt
+
+.cache
+config

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-	id 'net.neoforged.gradle.userdev' version '7.0.185'
-    id 'net.darkhax.curseforgegradle' version '1.1.26'
+    id 'net.neoforged.moddev' version '2.0.119'
+    id 'net.darkhax.curseforgegradle' version '1.1.28'
 	id 'com.github.kt3k.coveralls' version '2.12.0'
     id 'com.diffplug.spotless' version '6.25.0'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
@@ -14,7 +14,6 @@ apply plugin: 'jacoco'
 
 import net.darkhax.curseforgegradle.Constants
 import net.darkhax.curseforgegradle.TaskPublishCurseForge
-import net.neoforged.gradle.common.tasks.PotentiallySignJar
 
 // Determine build number
 String build_number = "DEV" // this will be referenced as simply build_number from now on.
@@ -95,6 +94,7 @@ configurations {
 
 test {
     testLogging {
+        events org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_OUT
         exceptionFormat = 'full'
     }
 }
@@ -113,7 +113,13 @@ repositories {
 }
 
 dependencies {
-    implementation "net.neoforged:neoforge:${project.neoforge_version}"
+    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'
 
     // Add something like 'cyclopscore_version_local=0.1.0-DEV' to your secrets.properties if you want to use a custom local CyclopsCore version.
     if(secrets.cyclopscore_version_local) {
@@ -150,46 +156,55 @@ dependencies {
         exclude group: 'com.ibm.icu', module: 'icu4j'
     }
     shadow "org.graalvm.js:js:${project.graal_version}"
-	
-	testImplementation "junit:junit:4.12"
-    testImplementation "org.mockito:mockito-core:1.+"
-    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:5.8.2"
 }
 
-subsystems {
-    parchment {
-        minecraftVersion = "${project.parchment_minecraft_version}"
-        mappingsVersion = "${project.parchment_version}"
-    }
+test {
+    useJUnitPlatform()
 }
 
-runs {
-    configureEach {
-		systemProperty 'forge.logging.markers', 'REGISTRIES'
-        systemProperty 'forge.logging.console.level', 'debug'
-        systemProperty 'forge.logging.console.level', 'debug'
-        modSource project.sourceSets.main
+neoForge {
+    version = "${neoforge_version}"
 
-        dependencies {
-            runtime project.configurations.modLib
-        }
+    parchment {
+        mappingsVersion = "${parchment_version}"
+        minecraftVersion = "${parchment_minecraft_version}"
     }
-	
-    client {
-        systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
+
+    // Automatically enable neoforge AccessTransformers if the file exists
+    def at = file('src/main/resources/META-INF/accesstransformer.cfg')
+    if (at.exists()) {
+        accessTransformers = [ at.absolutePath ]
     }
 
-    server {
-        systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
-        argument '--nogui'
+    validateAccessTransformers = true
+
+    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}"
+        }
     }
 
-    gameTestServer {
-        systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
+    mods {
+        "${mod_id}" {
+            sourceSet(sourceSets.main)
+        }
     }
 
-    clientData {
-        arguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+    unitTest {
+        enable()
+        testedMod = mods.integratedscripting
     }
 }
 
@@ -208,21 +223,6 @@ jar {
     }
 }
 
-task signJar(type: PotentiallySignJar, dependsOn: jar) {
-	dependsOn(tasks.jar)
-
-    onlyIf {
-        System.getenv().SIGN_KEYSTORE
-    }
-
-    keyStore = System.getenv().SIGN_KEYSTORE
-    alias = System.getenv().SIGN_ALIAS
-    storePass = System.getenv().SIGN_STOREPASS
-    keyPass = System.getenv().SIGN_KEYPASS
-    input = jar.archivePath
-    output = jar.archivePath
-}
-
 task deobfJar(type: Jar) {
     from sourceSets.main.output
     archiveClassifier.set('deobf')
@@ -392,14 +392,10 @@ jacocoTestReport {
 }
 
 // Also measure coverage for game tests
-tasks.whenTaskAdded { task ->
-    if (task.name.equals('runGameTestServer')) {
-        jacocoTestReport.dependsOn test, task
-        jacoco {
-            toolVersion = "0.8.12"
-            applyTo task
-        }
-    }
+jacocoTestReport.dependsOn test, runGameTestServer
+jacoco {
+    toolVersion = "0.8.12"
+    applyTo runGameTestServer
 }
 
 spotless {
@@ -422,19 +418,3 @@ compileJava.dependsOn updateGitHooks
 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
-    }
-}
-
-task benchmark(type: JavaExec) {
-    classpath sourceSets.test.runtimeClasspath
-    main = "org.cyclops.integratedscripting.evaluate.translation.BenchmarkValueTranslators"
-}
-test.dependsOn benchmark

gradle.properties

@@ -4,7 +4,7 @@ group=org.cyclops.integratedscripting
 java_version=21
 
 # Common
-minecraft_version=1.21.8
+minecraft_version=1.21.10
 mod_name=IntegratedScripting
 mod_author=rubensworks (aka kroeser)
 mod_id=integratedscripting
@@ -15,13 +15,13 @@ display_url=https://www.curseforge.com/minecraft/mc-mods/integrated-scripting
 description=Create scripts for handling operations in Integrated Dynamics.
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 
-parchment_version=2025.06.15
-parchment_minecraft_version=1.21.5
+parchment_version=2025.10.12
+parchment_minecraft_version=1.21.10
 curseforge_project_id=889785
 modrinth_project_id=uDJkuFRe
 
 # 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/integrated-scripting.json
 
@@ -32,6 +32,6 @@ org.gradle.caching=true
 
 # Dependencies
 graal_version=24.1.1
-cyclopscore_version=1.25.5-800
-integrateddynamics_version=1.24.1-1300
-commoncapabilities_version=2.9.7-251
+cyclopscore_version=1.25.5-858
+integrateddynamics_version=1.24.1-1417
+commoncapabilities_version=2.9.7-299

src/main/java/org/cyclops/integratedscripting/blockentity/BlockEntityScriptingDrive.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.ValueInput;
 import net.minecraft.world.level.storage.ValueOutput;
-import net.neoforged.neoforge.items.wrapper.InvWrapper;
+import net.neoforged.neoforge.transfer.item.VanillaContainerWrapper;
 import org.cyclops.cyclopscore.datastructure.DimPos;
 import org.cyclops.cyclopscore.inventory.SimpleInventory;
 import org.cyclops.cyclopscore.persist.IDirtyMarkListener;
@@ -59,8 +59,8 @@ public void populate() {
             super.populate();
 
             add(
-                    net.neoforged.neoforge.capabilities.Capabilities.ItemHandler.BLOCK,
-                    (blockEntity, context) -> new InvWrapper(blockEntity.getInventory())
+                    net.neoforged.neoforge.capabilities.Capabilities.Item.BLOCK,
+                    (blockEntity, context) -> VanillaContainerWrapper.of(blockEntity.getInventory())
             );
             add(
                     Capabilities.NetworkElementProvider.BLOCK,

src/main/java/org/cyclops/integratedscripting/client/gui/component/input/TextFieldHelperExtended.java

@@ -1,6 +1,8 @@
 package org.cyclops.integratedscripting.client.gui.component.input;
 
 import net.minecraft.client.gui.font.TextFieldHelper;
+import net.minecraft.client.input.CharacterEvent;
+import net.minecraft.client.input.KeyEvent;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -33,9 +35,9 @@ public String getSelected() {
     }
 
     @Override
-    public boolean charTyped(char p_95144_) {
+    public boolean charTyped(CharacterEvent event) {
         String selectedBefore = getSelected();
-        boolean ret = super.charTyped(p_95144_);
+        boolean ret = super.charTyped(event);
         String selectedAfter = getSelected();
         if (!selectedBefore.equals(selectedAfter)) {
             this.setSelectionFn.accept(selectedAfter);
@@ -44,9 +46,9 @@ public boolean charTyped(char p_95144_) {
     }
 
     @Override
-    public boolean keyPressed(int p_95146_) {
+    public boolean keyPressed(KeyEvent event) {
         String selectedBefore = getSelected();
-        boolean ret = super.keyPressed(p_95146_);
+        boolean ret = super.keyPressed(event);
         String selectedAfter = getSelected();
         if (!selectedBefore.equals(selectedAfter)) {
             this.setSelectionFn.accept(selectedAfter);

src/main/java/org/cyclops/integratedscripting/client/gui/component/input/WidgetDialog.java

@@ -8,6 +8,7 @@
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -68,10 +69,10 @@ protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, flo
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
-        return this.buttonConfirm.mouseClicked(mouseX, mouseY, mouseButton)
-                || this.buttonCancel.mouseClicked(mouseX, mouseY, mouseButton)
-                || super.mouseClicked(mouseX, mouseY, mouseButton);
+    public boolean mouseClicked(MouseButtonEvent mouse, boolean isDoubleClick) {
+        return this.buttonConfirm.mouseClicked(mouse, isDoubleClick)
+                || this.buttonCancel.mouseClicked(mouse, isDoubleClick)
+                || super.mouseClicked(mouse, isDoubleClick);
     }
 
     @Override