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'
 // All jar files from this folder will be added automatically as runtime mod dependencies (inspired by AE2's build.gradle)
 def extraModsDir = "extra-mods"
 
-import net.neoforged.gradle.common.tasks.PotentiallySignJar
 import net.darkhax.curseforgegradle.Constants
 import net.darkhax.curseforgegradle.TaskPublishCurseForge
 
@@ -121,8 +120,6 @@ repositories {
 }
 
 dependencies {
-    implementation "net.neoforged:neoforge:${project.neoforge_version}"
-
     // 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) {
         implementation "org.cyclops.cyclopscore:cyclopscore-${project.minecraft_version}-neoforge:${secrets.cyclopscore_version_local}:deobf"
@@ -151,15 +148,16 @@ dependencies {
     }
 
     // Add something like 'integratedterminalscompat_version_local=0.1.0-DEV' to your secrets.properties if you want to use a custom local Integrated Tunnels Compat version.
-    if(secrets.integratedterminalscompat_version_local) {
-        shadow("org.cyclops.integratedterminalscompat:integratedterminalscompat-${project.minecraft_version}-neoforge:${secrets.integratedterminalscompat_version_local}") {
-            transitive = false
-        }
-    } else {
-        shadow("org.cyclops.integratedterminalscompat:integratedterminalscompat-${project.minecraft_version}-neoforge:${project.integratedterminalscompat_version}") {
-            transitive = false
-        }
-    }
+    // TODO: restore
+//    if(secrets.integratedterminalscompat_version_local) {
+//        shadow("org.cyclops.integratedterminalscompat:integratedterminalscompat-${project.minecraft_version}-neoforge:${secrets.integratedterminalscompat_version_local}") {
+//            transitive = false
+//        }
+//    } else {
+//        shadow("org.cyclops.integratedterminalscompat:integratedterminalscompat-${project.minecraft_version}-neoforge:${project.integratedterminalscompat_version}") {
+//            transitive = false
+//        }
+//    }
 
     if(secrets.commoncapabilities_version_local) {
         implementation ("org.cyclops.commoncapabilities:commoncapabilities-${project.minecraft_version}-neoforge:${secrets.commoncapabilities_version_local}:deobf") {
@@ -176,8 +174,6 @@ dependencies {
         transitive = false
     }
 
-	testImplementation "junit:junit:4.12"
-
     // Locally sourced extra mods for runtime (i.e. testing)
     for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) {
         def basename = extraModJar.name.substring(0, extraModJar.name.length() - ".jar".length())
@@ -189,46 +185,44 @@ dependencies {
     }
 }
 
-minecraft {
-    accessTransformers {
-        file('src/main/resources/META-INF/accesstransformer.cfg')
-	}
-}
+neoForge {
+    version = "${neoforge_version}"
 
-subsystems {
     parchment {
-        minecraftVersion = "${project.parchment_minecraft_version}"
-        mappingsVersion = "${project.parchment_version}"
+        mappingsVersion = "${parchment_version}"
+        minecraftVersion = "${parchment_minecraft_version}"
     }
-}
-
-runs {
-    configureEach {
-		systemProperty 'forge.logging.markers', 'REGISTRIES'
-        systemProperty 'forge.logging.console.level', 'debug'
-        systemProperty 'forge.logging.console.level', 'debug'
-        modSource project.sourceSets.main
 
-        dependencies {
-            runtime project.configurations.modLib
-        }
-    }
-	
-    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
 
-    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', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+    mods {
+        "${mod_id}" {
+            sourceSet(sourceSets.main)
+        }
     }
 }
 
@@ -247,21 +241,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')
@@ -428,14 +407,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 {

gradle.properties

@@ -4,7 +4,7 @@ group=org.cyclops.integratedterminals
 java_version=21
 
 # Common
-minecraft_version=1.21.8
+minecraft_version=1.21.10
 mod_name=IntegratedTerminals
 mod_author=rubensworks (aka kroeser)
 mod_id=integratedterminals
@@ -15,13 +15,13 @@ display_url=https://www.curseforge.com/minecraft/mc-mods/integrated-terminals
 description=Terminals for managing and overviewing Integrated Dynamics networks.
 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=295910
 modrinth_project_id=HmLJoQ1K
 
 # 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-terminals.json
 
@@ -31,8 +31,8 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Dependencies
-cyclopscore_version=1.25.5-800
-integrateddynamics_version=1.24.1-1299
+cyclopscore_version=1.25.5-863
+integrateddynamics_version=1.24.1-1417
 integratedterminalscompat_version=1.0.0-137
-integratedcrafting_version=1.1.13-346
-commoncapabilities_version=2.9.7-251
+integratedcrafting_version=1.1.13-408
+commoncapabilities_version=2.9.7-299

src/main/java/org/cyclops/integratedterminals/api/terminalstorage/ITerminalButtonClient.java

@@ -1,6 +1,7 @@
 package org.cyclops.integratedterminals.api.terminalstorage;
 
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.input.MouseButtonEvent;
 
 import javax.annotation.Nullable;
 
@@ -20,12 +21,14 @@ public interface ITerminalButtonClient<C extends ITerminalStorageTabClient,
 
     /**
      * Callback for when the gui button has been clicked.
-     * @param clientTab The client tab in which the button was clicked.
-     * @param commonTab The common tab in which the button was clicked.
-     * @param guiButton The gui button.
-     * @param channel The active channel.
-     * @param mouseButton The mouse button that was used to click with.
+     *
+     * @param clientTab     The client tab in which the button was clicked.
+     * @param commonTab     The common tab in which the button was clicked.
+     * @param guiButton     The gui button.
+     * @param channel       The active channel.
+     * @param mouse         The mouse button that was used to click with.
+     * @param isDoubleClick If the mouse was double-clicked.
      */
-    public void onClick(C clientTab, @Nullable O commonTab, B guiButton, int channel, int mouseButton);
+    public void onClick(C clientTab, @Nullable O commonTab, B guiButton, int channel, MouseButtonEvent mouse, boolean isDoubleClick);
 
 }

src/main/java/org/cyclops/integratedterminals/capability/ingredient/IngredientComponentTerminalStorageHandlerEnergy.java

@@ -6,9 +6,12 @@
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.capabilities.Capabilities;
-import net.neoforged.neoforge.energy.IEnergyStorage;
+import net.neoforged.neoforge.transfer.access.ItemAccess;
+import net.neoforged.neoforge.transfer.energy.EnergyHandler;
+import net.neoforged.neoforge.transfer.transaction.Transaction;
 import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent;
 import org.cyclops.commoncapabilities.api.ingredient.storage.IIngredientComponentStorage;
+import org.cyclops.cyclopscore.capability.item.ItemStackResourceHandlerContainerSlot;
 import org.cyclops.cyclopscore.helper.IModHelpers;
 import org.cyclops.cyclopscore.ingredient.storage.InconsistentIngredientInsertionException;
 import org.cyclops.cyclopscore.ingredient.storage.IngredientStorageHelpers;
@@ -59,22 +62,22 @@ public String formatQuantity(Long instance) {
 
     @Override
     public boolean isInstance(ItemStack itemStack) {
-        return itemStack.getCapability(Capabilities.EnergyStorage.ITEM) != null;
+        return itemStack.getCapability(Capabilities.Energy.ITEM, ItemAccess.forStack(itemStack)) != null;
     }
 
     @Override
     public Long getInstance(ItemStack itemStack) {
-        return Optional.ofNullable(itemStack.getCapability(Capabilities.EnergyStorage.ITEM))
-                .map(IEnergyStorage::getEnergyStored)
-                .orElse(0)
+        return Optional.ofNullable(itemStack.getCapability(Capabilities.Energy.ITEM, ItemAccess.forStack(itemStack)))
+                .map(EnergyHandler::getAmountAsLong)
+                .orElse(0L)
                 .longValue();
     }
 
     @Override
     public long getMaxQuantity(ItemStack itemStack) {
-        return Optional.ofNullable(itemStack.getCapability(Capabilities.EnergyStorage.ITEM))
-                .map(IEnergyStorage::getMaxEnergyStored)
-                .orElse(0);
+        return Optional.ofNullable(itemStack.getCapability(Capabilities.Energy.ITEM, ItemAccess.forStack(itemStack)))
+                .map(EnergyHandler::getCapacityAsLong)
+                .orElse(0L);
     }
 
     @Override
@@ -94,19 +97,17 @@ public int throwIntoWorld(IIngredientComponentStorage<Long, Boolean> storage, Lo
     }
 
     protected IIngredientComponentStorage<Long, Boolean> getEnergyStorage(IngredientComponent<Long, Boolean> component,
-                                                                             IEnergyStorage energyStorage) {
+                                                                             EnergyHandler energyStorage) {
         return component
-                .getStorageWrapperHandler(Capabilities.EnergyStorage.ITEM)
+                .getStorageWrapperHandler(Capabilities.Energy.ITEM)
                 .wrapComponentStorage(energyStorage);
     }
 
     @Override
     public Long insertIntoContainer(IIngredientComponentStorage<Long, Boolean> storage,
                                        AbstractContainerMenu container, int containerSlot, Long maxInstance,
                                        @Nullable Player player, boolean transferFullSelection) {
-        ItemStack stack = container.getSlot(containerSlot).getItem();
-
-        return Optional.ofNullable(stack.getCapability(Capabilities.EnergyStorage.ITEM))
+        return Optional.ofNullable(ItemStackResourceHandlerContainerSlot.asItemAccess(container, containerSlot).getCapability(Capabilities.Energy.ITEM))
                 .map(energyStorage -> {
                     IIngredientComponentStorage<Long, Boolean> itemStorage = getEnergyStorage(storage.getComponent(), energyStorage);
                     Long ret = 0L;
@@ -115,7 +116,7 @@ public Long insertIntoContainer(IIngredientComponentStorage<Long, Boolean> stora
                     } catch (InconsistentIngredientInsertionException e) {
                         // Ignore
                     }
-                    container.broadcastChanges();
+                    container.broadcastChanges(); // TODO: can this be removed due to ItemAccess usage?
                     return ret;
                 })
                 .orElse(0L);
@@ -124,8 +125,7 @@ public Long insertIntoContainer(IIngredientComponentStorage<Long, Boolean> stora
     @Override
     public void extractActiveStackFromPlayerInventory(IIngredientComponentStorage<Long, Boolean> storage,
                                                       AbstractContainerMenu container, Inventory playerInventory, long moveQuantityPlayerSlot) {
-        ItemStack playerStack = container.getCarried();
-        Optional.ofNullable(playerStack.getCapability(Capabilities.EnergyStorage.ITEM))
+        Optional.ofNullable(ItemAccess.forPlayerCursor(playerInventory.player, container).getCapability(Capabilities.Energy.ITEM))
                 .ifPresent(energyStorage -> {
                     IIngredientComponentStorage<Long, Boolean> itemStorage = getEnergyStorage(storage.getComponent(), energyStorage);
                     try {
@@ -141,8 +141,7 @@ public void extractMaxFromContainerSlot(IIngredientComponentStorage<Long, Boolea
                                             AbstractContainerMenu container, int containerSlot, Inventory playerInventory, int limit) {
         Slot slot = container.getSlot(containerSlot);
         if (slot.mayPickup(playerInventory.player)) {
-            ItemStack toMoveStack = slot.getItem();
-            Optional.ofNullable(toMoveStack.getCapability(Capabilities.EnergyStorage.ITEM))
+            Optional.ofNullable(ItemStackResourceHandlerContainerSlot.asItemAccess(container, containerSlot).getCapability(Capabilities.Energy.ITEM))
                     .ifPresent(energyStorage -> {
                         IIngredientComponentStorage<Long, Boolean> itemStorage = getEnergyStorage(storage.getComponent(), energyStorage);
                         try {
@@ -156,21 +155,23 @@ public void extractMaxFromContainerSlot(IIngredientComponentStorage<Long, Boolea
 
     @Override
     public long getActivePlayerStackQuantity(Inventory playerInventory, AbstractContainerMenu container) {
-        ItemStack toMoveStack = container.getCarried();
-        return Optional.ofNullable(toMoveStack.getCapability(Capabilities.EnergyStorage.ITEM))
-                .map(IEnergyStorage::getEnergyStored)
-                .orElse(0);
+        return Optional.ofNullable(ItemAccess.forPlayerCursor(playerInventory.player, container).getCapability(Capabilities.Energy.ITEM))
+                .map(EnergyHandler::getAmountAsLong)
+                .orElse(0L);
     }
 
     @Override
     public void drainActivePlayerStackQuantity(Inventory playerInventory, AbstractContainerMenu container, long quantityIn) {
-        ItemStack toMoveStack = container.getCarried();
-        Optional.ofNullable(toMoveStack.getCapability(Capabilities.EnergyStorage.ITEM))
+        Optional.ofNullable(ItemAccess.forPlayerCursor(playerInventory.player, container).getCapability(Capabilities.Energy.ITEM))
                 .ifPresent(energyStorage -> {
                     // Drain
                     long quantity = quantityIn;
                     while (quantity > 0) {
-                        int drained = energyStorage.extractEnergy((int) quantity, false);
+                        int drained;
+                        try (var tx = Transaction.openRoot()) {
+                            drained = energyStorage.extract((int) quantity, tx);
+                            tx.commit();
+                        }
                         if (drained <= 0) {
                             break;
                         }