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.capabilityproxy
 java_version=21
 
 # Common
-minecraft_version=1.21.8
+minecraft_version=1.21.10
 mod_name=CapabilityProxy
 mod_author=rubensworks (aka kroeser)
 mod_id=capabilityproxy
@@ -14,29 +14,29 @@ issue_tracker_url=https://github.com/CyclopsMC/CapabilityProxy/issues
 display_url=https://www.curseforge.com/minecraft/mc-mods/capabilityproxy
 description=Access block capabilities from multiple sides.
 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=266479
 modrinth_project_id=3mPgwv8n
 
 # 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
 # https://maven.fabricmc.net/teamreborn/energy/
 fabric_teamrebornenergy_version=4.2.0
 # https://maven.fabricmc.net/TechReborn/
-fabric_techreborn_version=TechReborn-1.21.8:5.14.2
+fabric_techreborn_version=TechReborn-1.21.10:5.15.0
 
 # 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/capabilityproxy.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/capabilityproxy.json
 
@@ -46,4 +46,4 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Common dependencies
-cyclopscore_version=1.25.5-793
+cyclopscore_version=1.25.5-855

loader-common/src/main/java/org/cyclops/capabilityproxy/block/BlockCapabilityProxy.java

@@ -93,7 +93,7 @@ protected InteractionResult useWithoutItem(BlockState blockState, Level level, B
     @Override
     public void neighborChanged(BlockState state, Level world, BlockPos pos, Block neighbourBlock, @Nullable Orientation orientation, boolean isMoving) {
         super.neighborChanged(state, world, pos, neighbourBlock, orientation, isMoving);
-        if (!world.isClientSide) {
+        if (!world.isClientSide()) {
             Direction facing = state.getValue(BlockCapabilityProxy.FACING);
             boolean inactive = state.getValue(BlockCapabilityProxy.INACTIVE);
             if (inactive != (world.getBlockEntity(pos.relative(facing)) == null)) {

loader-common/src/main/java/org/cyclops/capabilityproxy/client/render/RenderTileRangedCapabilityProxy.java

@@ -1,30 +1,34 @@
 package org.cyclops.capabilityproxy.client.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.client.renderer.RenderStateShard;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
+import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
+import net.minecraft.client.renderer.state.CameraRenderState;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.Vec3;
 import org.cyclops.capabilityproxy.Reference;
 import org.cyclops.capabilityproxy.RegistryEntries;
 import org.cyclops.capabilityproxy.block.BlockRangedCapabilityProxyConfig;
 import org.cyclops.capabilityproxy.blockentity.BlockEntityCapabilityProxyCommon;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.OptionalDouble;
 
 /**
  * Renders an overlay showing the target of ranged proxies when a ranged proxy is held in hand.
  * @author rubensworks
  */
-public class RenderTileRangedCapabilityProxy implements BlockEntityRenderer<BlockEntityCapabilityProxyCommon> {
+public class RenderTileRangedCapabilityProxy implements BlockEntityRenderer<BlockEntityCapabilityProxyCommon, RenderTileRangedCapabilityProxy.RenderState> {
 
     public static final RenderType RENDER_TYPE_LINE = RenderType.create(Reference.MOD_ID + "line",
             128,
@@ -40,7 +44,18 @@ public RenderTileRangedCapabilityProxy(BlockEntityRendererProvider.Context conte
     }
 
     @Override
-    public void render(BlockEntityCapabilityProxyCommon tile, float partialTicks, PoseStack matrixStack, MultiBufferSource buffer, int combinedLight, int combinedOverlay, Vec3 cameraPos) {
+    public RenderState createRenderState() {
+        return new RenderState();
+    }
+
+    @Override
+    public void extractRenderState(BlockEntityCapabilityProxyCommon blockEntity, RenderState renderState, float partialTick, Vec3 cameraPosition, @Nullable ModelFeatureRenderer.CrumblingOverlay breakProgress) {
+        BlockEntityRenderer.super.extractRenderState(blockEntity, renderState, partialTick, cameraPosition, breakProgress);
+        renderState.facing = blockEntity.getFacing();
+    }
+
+    @Override
+    public void submit(RenderState renderState, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CameraRenderState cameraRenderState) {
         Player player = Minecraft.getInstance().player;
         if (player.getItemInHand(InteractionHand.MAIN_HAND).getItem() == RegistryEntries.ITEM_RANGED_CAPABILITY_PROXY.value()
                 || player.getItemInHand(InteractionHand.OFF_HAND).getItem() == RegistryEntries.ITEM_RANGED_CAPABILITY_PROXY.value()) {
@@ -53,22 +68,27 @@ public void render(BlockEntityCapabilityProxyCommon tile, float partialTicks, Po
             float y = 0.5F;
             float z = 0.5F;
 
-            BlockPos target = new BlockPos(0, 0, 0).relative(tile.getFacing(), BlockRangedCapabilityProxyConfig.range);
+            BlockPos target = new BlockPos(0, 0, 0).relative(renderState.facing, BlockRangedCapabilityProxyConfig.range);
             float minX = x;
             float minY = y;
             float minZ = z;
             float maxX = x + target.getX();
             float maxY = y + target.getY();
             float maxZ = z + target.getZ();
 
-            VertexConsumer vb = buffer.getBuffer(RENDER_TYPE_LINE);
-            vb.addVertex(matrixStack.last().pose(), minX, minY, minZ).setColor(r, g, b, a).setNormal(0.0F, 0.0F, 0.0F);
-            vb.addVertex(matrixStack.last().pose(), maxX, maxY, maxZ).setColor(r, g, b, a).setNormal(0.0F, 0.0F, 0.0F);;
+            submitNodeCollector.submitCustomGeometry(poseStack, RENDER_TYPE_LINE, (pose, vertexConsumer) -> {
+                vertexConsumer.addVertex(pose, minX, minY, minZ).setColor(r, g, b, a).setNormal(0.0F, 0.0F, 0.0F);
+                vertexConsumer.addVertex(pose, maxX, maxY, maxZ).setColor(r, g, b, a).setNormal(0.0F, 0.0F, 0.0F);;
+            });
         }
     }
 
     @Override
     public boolean shouldRenderOffScreen() {
         return true;
     }
+
+    public static class RenderState extends BlockEntityRenderState {
+        public Direction facing = Direction.NORTH;
+    }
 }

loader-neoforge/src/main/java/org/cyclops/capabilityproxy/blockentity/BlockEntityItemCapabilityProxyNeoForge.java

@@ -7,12 +7,11 @@
 import net.neoforged.neoforge.capabilities.BlockCapability;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.capabilities.ItemCapability;
-import net.neoforged.neoforge.fluids.FluidStack;
-import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem;
-import net.neoforged.neoforge.items.wrapper.InvWrapper;
-import org.cyclops.cyclopscore.fluid.FluidHandlerWrapper;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.access.ItemAccess;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import net.neoforged.neoforge.transfer.item.VanillaContainerWrapper;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Map;
 
@@ -35,77 +34,21 @@ protected void onInventoryChanged() {
     }
 
     public <T, C1, C2> T getCapability(BlockCapability<T, C1> blockCapability, C1 context) {
-        if (context instanceof Direction && context == getFacing() && blockCapability == Capabilities.ItemHandler.BLOCK) {
-            return (T) new InvWrapper(getInventory());
+        ResourceHandler<ItemResource> inventoryHandler = VanillaContainerWrapper.of(getInventory());
+        if (context instanceof Direction && context == getFacing() && blockCapability == Capabilities.Item.BLOCK) {
+             return (T) inventoryHandler;
         }
 
         ItemStack itemStack = getContents();
         ItemCapability<T, C2> itemCapability = blockCapabilityToItemCapability(blockCapability);
         if (itemCapability == null) {
             return null;
         }
-        T cap = itemStack.getCapability(itemCapability, itemCapability.contextClass() == Direction.class ? (C2) getFacing().getOpposite() : null);
-
-        // Modify fluid capability instance so that the container is always updated into this tile after modifications
-        if (cap instanceof IFluidHandlerItem fluidHandlerItem) {
-            cap = (T) new FluidHandlerWrapperItem(fluidHandlerItem, this);
-        }
-        return cap;
+        return itemStack.getCapability(itemCapability, itemCapability.contextClass() == ItemAccess.class ? (C2) ItemAccess.forHandlerIndexStrict(inventoryHandler, 0) : null);
     }
 
     @Nullable
     public static <T, C1, C2> ItemCapability<T, C2> blockCapabilityToItemCapability(BlockCapability<T, C1> capability) {
         return (ItemCapability<T, C2>) BLOCK_TO_ITEM_CAPABILITIES.get(capability);
     }
-
-    public static class FluidHandlerWrapperItem extends FluidHandlerWrapper implements IFluidHandlerItem {
-
-        private final IFluidHandlerItem fluidHandler;
-        private final BlockEntityItemCapabilityProxyNeoForge tile;
-
-        public FluidHandlerWrapperItem(IFluidHandlerItem fluidHandler, BlockEntityItemCapabilityProxyNeoForge tile) {
-            super(fluidHandler);
-            this.fluidHandler = fluidHandler;
-            this.tile = tile;
-        }
-
-        protected void updateContainerSlot() {
-            tile.getInventory().setItem(0, getContainer());
-        }
-
-        @Override
-        public int fill(FluidStack resource, FluidAction action) {
-            int ret = super.fill(resource, action);
-            if (action.execute()) {
-                updateContainerSlot();
-            }
-            return ret;
-        }
-
-        @Nonnull
-        @Override
-        public FluidStack drain(int maxDrain, FluidAction action) {
-            FluidStack ret = super.drain(maxDrain, action);
-            if (action.execute()) {
-                updateContainerSlot();
-            }
-            return ret;
-        }
-
-        @Nonnull
-        @Override
-        public FluidStack drain(FluidStack resource, FluidAction action) {
-            FluidStack ret = super.drain(resource, action);
-            if (action.execute()) {
-                updateContainerSlot();
-            }
-            return ret;
-        }
-
-        @Nonnull
-        @Override
-        public ItemStack getContainer() {
-            return this.fluidHandler.getContainer();
-        }
-    }
 }