Fix ME Chest accepting Cells with items into its internal inventory (#…

…681) Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: Maya <[email protected]>
GTNewHorizons · Feb 28, 2025 · b1b1164 · b1b1164
1 parent 252cedd
commit b1b1164
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/src/main/java/appeng/util/InventoryAdaptor.java b/src/main/java/appeng/util/InventoryAdaptor.java
@@ -83,7 +83,7 @@ public static InventoryAdaptor getAdaptor(Object te, final ForgeDirection d) {
                     return new AdaptorP2PItem(p2p);
                 }
             } else if (te instanceof TileChest) {
-                return new AdaptorMEChest((TileChest) te);
+                return new AdaptorMEChest(new WrapperMCISidedInventory(si, d), (TileChest) te);
             }
 
             final int[] slots = si.getAccessibleSlotsFromSide(d.ordinal());

diff --git a/src/main/java/appeng/util/inv/AdaptorMEChest.java b/src/main/java/appeng/util/inv/AdaptorMEChest.java
@@ -1,25 +1,37 @@
 package appeng.util.inv;
 
+import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.config.Actionable;
 import appeng.api.config.InsertionMode;
 import appeng.api.storage.data.IAEItemStack;
+import appeng.me.storage.CellInventory;
 import appeng.tile.storage.TileChest;
 import appeng.util.item.AEItemStack;
 
 public class AdaptorMEChest extends AdaptorIInventory {
 
     private final TileChest meChest;
+    private final IInventory i;
 
-    public AdaptorMEChest(TileChest meChest) {
-        super(meChest.getInternalInventory());
+    public AdaptorMEChest(WrapperMCISidedInventory i, TileChest meChest) {
+        super(i);
         this.meChest = meChest;
+        this.i = i;
+    }
+
+    @Override
+    public ItemStack addItems(final ItemStack toBeAdded) {
+        return this.addItems(toBeAdded, InsertionMode.DEFAULT);
     }
 
     @Override
     public ItemStack addItems(ItemStack toBeAdded, InsertionMode insertionMode) {
         if (meChest.getItemInventory() == null) {
+            if (CellInventory.isCell(toBeAdded)) {
+                return addCell(toBeAdded, true);
+            }
             return toBeAdded;
         }
         // Ignore insertion mode since injecting into a ME system doesn't have this concept
@@ -28,14 +40,38 @@ public ItemStack addItems(ItemStack toBeAdded, InsertionMode insertionMode) {
         return result == null ? null : result.getItemStack();
     }
 
+    @Override
+    public ItemStack simulateAdd(final ItemStack toBeSimulated) {
+        return this.simulateAdd(toBeSimulated, InsertionMode.DEFAULT);
+    }
+
     @Override
     public ItemStack simulateAdd(ItemStack toBeSimulated, InsertionMode insertionMode) {
         if (meChest.getItemInventory() == null) {
+            if (CellInventory.isCell(toBeSimulated)) {
+                return addCell(toBeSimulated, false);
+            }
             return toBeSimulated;
         }
         // Ignore insertion mode since injecting into a ME system doesn't have this concept
         IAEItemStack result = (IAEItemStack) meChest.getItemInventory()
                 .injectItems(AEItemStack.create(toBeSimulated), Actionable.SIMULATE, meChest.getActionSource());
         return result == null ? null : result.getItemStack();
     }
+
+    private ItemStack addCell(final ItemStack cell, final boolean modulate) {
+        // Snippet of AdaptorIInventory to prevent invalid stacks from transferring
+        final ItemStack leftoverItems = cell.copy();
+        final ItemStack nextItem = leftoverItems.copy();
+        nextItem.stackSize = 1; // Max stack size of cell should be 1
+        leftoverItems.stackSize -= nextItem.stackSize;
+        if (modulate) {
+            this.i.setInventorySlotContents(0, nextItem);
+            this.i.markDirty();
+        }
+        if (leftoverItems.stackSize <= 0) {
+            return null;
+        }
+        return leftoverItems;
+    }
 }
diff --git a/src/test/java/appeng/util/IterationCounterGlobalTest.java b/src/test/java/appeng/util/IterationCounterGlobalTest.java
@@ -17,7 +17,7 @@ public void cleanup() {
 
     @Test
     public void incrementGlobalDepthIterationTest() {
-        var prev = IterationCounter.fetchNewId();
+        int prev = IterationCounter.fetchNewId();
         IterationCounter.incrementGlobalDepthWith(prev);
         IterationCounter.decrementGlobalDepth();
         assertEquals(IterationCounter.incrementGlobalDepth(), prev + 1);