Pipe Config Card to extract blocks from items containing items (such as Banks from Bank Storage) (#1022)

Also fix some bugs in `TransferHelper#extractMatching`.

Author: Swedz

src/main/java/aztech/modern_industrialization/pipes/impl/PipeBlockEntity.java

@@ -66,7 +66,6 @@
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.neoforged.neoforge.client.model.data.ModelData;
 import net.neoforged.neoforge.client.model.data.ModelProperty;
-import net.neoforged.neoforge.items.wrapper.PlayerInvWrapper;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -253,7 +252,11 @@ public ItemStack getCamouflageStack() {
     /**
      * Set the camouflage directly. The camouflage block should be consumed from the player before calling this.
      */
-    private void setCamouflage(Player player, @Nullable BlockState newCamouflage) {
+    private void setCamouflage(@Nullable BlockState newCamouflage) {
+        if (level.isClientSide) {
+            throw new IllegalStateException("Cannot call setCamouflage on the client");
+        }
+
         boolean hadCamouflage = hasCamouflage();
 
         if (camouflage != null) {
@@ -267,16 +270,14 @@ private void setCamouflage(Player player, @Nullable BlockState newCamouflage) {
             if (newCamouflage == null) {
                 var group = camouflage.getSoundType();
                 var sound = group.getBreakSound();
-                level.playSound(player, worldPosition, sound, SoundSource.BLOCKS, (group.getVolume() + 1.0F) / 4.0F, group.getPitch() * 0.8F);
+                level.playSound(null, worldPosition, sound, SoundSource.BLOCKS, (group.getVolume() + 1.0F) / 4.0F, group.getPitch() * 0.8F);
             }
 
             // Remove camouflage
             camouflage = null;
             setChanged();
-            if (!level.isClientSide()) {
-                sync();
-                rebuildCollisionShape();
-            }
+            sync();
+            rebuildCollisionShape();
         }
 
         camouflage = newCamouflage;
@@ -285,13 +286,11 @@ private void setCamouflage(Player player, @Nullable BlockState newCamouflage) {
             // Play a cool sound
             var group = newCamouflage.getSoundType();
             var sound = group.getPlaceSound();
-            level.playSound(player, worldPosition, sound, SoundSource.BLOCKS, (group.getVolume() + 1.0F) / 4.0F, group.getPitch() * 0.8F);
+            level.playSound(null, worldPosition, sound, SoundSource.BLOCKS, (group.getVolume() + 1.0F) / 4.0F, group.getPitch() * 0.8F);
 
             setChanged();
-            if (!level.isClientSide()) {
-                sync();
-                rebuildCollisionShape();
-            }
+            sync();
+            rebuildCollisionShape();
         }
 
         if (hadCamouflage != hasCamouflage()) {
@@ -310,7 +309,9 @@ public boolean tryRemoveCamouflage(Player player, InteractionHand hand) {
             return false;
         }
 
-        setCamouflage(player, null);
+        if (!player.level().isClientSide) {
+            setCamouflage(null);
+        }
 
         return true;
     }
@@ -340,11 +341,16 @@ public boolean tryApplyCamouflage(Player player, InteractionHand hand) {
             return true;
         }
 
+        // Item capabilities shouldn't be messed with (and in some cases cannot - leading to inconsistent behavior) on the client side
+        if (player.level().isClientSide) {
+            return true;
+        }
+
         boolean itemChanged = camouflage == null || newCamouflage.getBlock() != camouflage.getBlock();
 
         if (!player.getAbilities().instabuild && itemChanged) {
             var itemToUse = newCamouflage.getBlock().asItem();
-            var extracted = TransferHelper.extractMatching(new PlayerInvWrapper(player.getInventory()), s -> s.is(itemToUse), 1);
+            var extracted = TransferHelper.extractMatching(player.getInventory(), s -> s.is(itemToUse), 1, true);
 
             if (extracted.isEmpty()) {
                 player.displayClientMessage(MITooltips.line(MIText.ConfigCardNoCamouflageInInventory)
@@ -353,7 +359,7 @@ public boolean tryApplyCamouflage(Player player, InteractionHand hand) {
             }
         }
 
-        setCamouflage(player, newCamouflage);
+        setCamouflage(newCamouflage);
         return true;
     }
 

src/main/java/aztech/modern_industrialization/pipes/item/ItemNetworkNode.java

@@ -61,7 +61,6 @@
 import net.neoforged.neoforge.capabilities.BlockCapabilityCache;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.items.IItemHandler;
-import net.neoforged.neoforge.items.wrapper.PlayerInvWrapper;
 import org.jetbrains.annotations.Nullable;
 
 public class ItemNetworkNode extends PipeNetworkNode {
@@ -371,7 +370,7 @@ void applyConfig(PipeBlockEntity pipe, @Nullable SavedItemPipeConfig config, Pla
         }
 
         private int fetchItems(Player player, ItemVariant what, int maxAmount) {
-            return TransferHelper.extractMatching(new PlayerInvWrapper(player.getInventory()), what::matches, maxAmount).getCount();
+            return TransferHelper.extractMatching(player.getInventory(), what::matches, maxAmount, false).getCount();
         }
 
         private class ScreenHandlerFactory implements IPipeMenuProvider {

src/main/java/aztech/modern_industrialization/util/TransferHelper.java

@@ -25,9 +25,12 @@
 
 import aztech.modern_industrialization.MI;
 import java.util.function.Predicate;
+import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.ItemStack;
+import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.neoforge.items.ItemHandlerHelper;
+import net.neoforged.neoforge.items.wrapper.PlayerInvWrapper;
 
 public class TransferHelper {
     public static void moveAll(IItemHandler src, IItemHandler target, boolean stackInTarget) {
@@ -67,6 +70,37 @@ public static void moveAll(IItemHandler src, IItemHandler target, boolean stackI
         }
     }
 
+    public static ItemStack extractMatching(Inventory inventory, Predicate<ItemStack> predicate, int maxAmount, boolean containers) {
+        int srcSlots = inventory.getContainerSize();
+
+        var ret = extractMatching(new PlayerInvWrapper(inventory), predicate, maxAmount);
+
+        // Try to extract from item containing items
+        if (containers) {
+            if (!ret.isEmpty()) {
+                final var finalRet = ret;
+                predicate = other -> ItemStack.isSameItemSameComponents(finalRet, other);
+            }
+            for (int slot = 0; slot < srcSlots && maxAmount > ret.getCount(); ++slot) {
+                var stack = inventory.getItem(slot);
+                if (stack.getCount() != 1) {
+                    continue;
+                }
+                var capability = stack.getCapability(Capabilities.ItemHandler.ITEM);
+                if (capability != null) {
+                    var extracted = extractMatching(capability, predicate, maxAmount - ret.getCount());
+                    if (ret.isEmpty()) {
+                        ret = extracted;
+                    } else {
+                        ret.grow(extracted.getCount());
+                    }
+                }
+            }
+        }
+
+        return ret;
+    }
+
     public static ItemStack extractMatching(IItemHandler src, Predicate<ItemStack> predicate, int maxAmount) {
         int srcSlots = src.getSlots();
 
@@ -84,11 +118,10 @@ public static ItemStack extractMatching(IItemHandler src, Predicate<ItemStack> p
         }
 
         // Try to extract more
-        ++slot;
-        for (; slot < srcSlots && maxAmount < ret.getCount(); ++slot) {
+        for (; slot < srcSlots && maxAmount > ret.getCount(); ++slot) {
             var stack = src.getStackInSlot(slot);
-            if (ItemStack.matches(stack, ret)) {
-                var extracted = src.extractItem(slot, maxAmount - ret.getCount(), true);
+            if (ItemStack.isSameItemSameComponents(stack, ret)) {
+                var extracted = src.extractItem(slot, maxAmount - ret.getCount(), false);
                 ret.grow(extracted.getCount());
             }
         }