1.17.1

closes #211

gradle.properties

@@ -34,7 +34,7 @@ mod_name=PrettyPipes
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=1.17.0
+mod_version=1.17.1
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/de/ellpeck/prettypipes/Utility.java

@@ -167,6 +167,18 @@ public final class Utility {
         return null;
     }
 
+    public static void copyInto(ItemStackHandler handler, ItemStackHandler dest) {
+        dest.setSize(handler.getSlots());
+        for (var i = 0; i < handler.getSlots(); i++)
+            dest.setStackInSlot(i, handler.getStackInSlot(i).copy());
+    }
+
+    public static ItemStackHandler copy(ItemStackHandler handler) {
+        var ret = new ItemStackHandler();
+        copyInto(handler, ret);
+        return ret;
+    }
+
     public interface IMergeItemStack {
 
         boolean mergeItemStack(ItemStack stack, int startIndex, int endIndex, boolean reverseDirection);

src/main/java/de/ellpeck/prettypipes/misc/ItemFilter.java

@@ -138,9 +138,7 @@ public class ItemFilter {
     public void load() {
         var content = this.stack.get(Data.TYPE);
         if (content != null) {
-            this.content.setSize(content.items.getSlots());
+            Utility.copyInto(content.items, this.content);
-            for (var i = 0; i < this.content.getSlots(); i++)
-                this.content.setStackInSlot(i, content.items.getStackInSlot(i));
             this.isWhitelist = content.whitelist;
         }
     }

src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java

@@ -284,7 +284,7 @@ public class PipeNetwork extends SavedData implements GraphListener<BlockPos, Ne
         while (craftingPipes.hasNext()) {
             var pipe = craftingPipes.next();
             for (var request : pipe.craftResultRequests) {
-                var dest = request.getLeft();
+                var dest = request.getMiddle();
                 var stack = request.getRight();
                 // add up all the items that should go to the same location
                 var existing = items.stream()

src/main/java/de/ellpeck/prettypipes/packets/PacketButton.java

@@ -80,6 +80,10 @@ public record PacketButton(BlockPos pos, int result, List<Integer> data) impleme
                         return ((IModule) stack.getItem()).getContainer(stack, tile, windowId, inv, player, data.getFirst());
                     }
 
+                    @Override
+                    public boolean shouldTriggerClientSideContainerClosingOnOpen() {
+                        return false;
+                    }
                 }, buf -> {
                     buf.writeBlockPos(pos);
                     buf.writeInt(data.getFirst());

src/main/java/de/ellpeck/prettypipes/pipe/PipeBlock.java

@@ -271,7 +271,7 @@ public class PipeBlock extends BaseEntityBlock implements SimpleWaterloggedBlock
             if (worldIn.getBlockEntity(pos) instanceof PipeBlockEntity pipe) {
                 pipe.getItems().clear();
                 for (var lock : pipe.craftIngredientRequests)
-                    network.resolveNetworkLock(lock);
+                    network.resolveNetworkLock(lock.getRight());
             }
             super.onRemove(state, worldIn, pos, newState, isMoving);
         }

src/main/java/de/ellpeck/prettypipes/pipe/PipeBlockEntity.java

@@ -4,6 +4,7 @@ import de.ellpeck.prettypipes.PrettyPipes;
 import de.ellpeck.prettypipes.Registry;
 import de.ellpeck.prettypipes.Utility;
 import de.ellpeck.prettypipes.items.IModule;
+import de.ellpeck.prettypipes.misc.EquatableItemStack;
 import de.ellpeck.prettypipes.misc.ItemFilter;
 import de.ellpeck.prettypipes.network.NetworkLock;
 import de.ellpeck.prettypipes.network.PipeNetwork;
@@ -40,6 +41,7 @@ import net.neoforged.neoforge.common.util.Lazy;
 import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.neoforge.items.ItemStackHandler;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.lang3.tuple.Triple;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -69,8 +71,10 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
             PipeBlockEntity.this.setChanged();
         }
     };
-    public final Queue<NetworkLock> craftIngredientRequests = new LinkedList<>();
+    // crafting module slot, ingredient request network lock
-    public final List<Pair<BlockPos, ItemStack>> craftResultRequests = new ArrayList<>();
+    public final Queue<Pair<Integer, NetworkLock>> craftIngredientRequests = new LinkedList<>();
+    // crafting module slot, destination pipe for the result, result item
+    public final List<Triple<Integer, BlockPos, ItemStack>> craftResultRequests = new ArrayList<>();
     public PressurizerBlockEntity pressurizer;
     public BlockState cover;
     public int moduleDropCheck;
@@ -97,13 +101,21 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
         super.saveAdditional(compound, provider);
         compound.put("modules", this.modules.serializeNBT(provider));
         compound.putInt("module_drop_check", this.moduleDropCheck);
-        compound.put("requests", Utility.serializeAll(provider, this.craftIngredientRequests));
+        var requests = new ListTag();
+        for (var tuple : this.craftIngredientRequests) {
+            var nbt = new CompoundTag();
+            nbt.putInt("module_slot", tuple.getLeft());
+            nbt.put("lock", tuple.getRight().serializeNBT(provider));
+            requests.add(nbt);
+        }
+        compound.put("craft_requests", requests);
         if (this.cover != null)
             compound.put("cover", NbtUtils.writeBlockState(this.cover));
         var results = new ListTag();
         for (var triple : this.craftResultRequests) {
             var nbt = new CompoundTag();
-            nbt.putLong("dest_pipe", triple.getLeft().asLong());
+            nbt.putInt("module_slot", triple.getLeft());
+            nbt.putLong("dest_pipe", triple.getMiddle().asLong());
             nbt.put("item", triple.getRight().save(provider));
             results.add(nbt);
         }
@@ -116,12 +128,19 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
         this.moduleDropCheck = compound.getInt("module_drop_check");
         this.cover = compound.contains("cover") ? NbtUtils.readBlockState(this.level != null ? this.level.holderLookup(Registries.BLOCK) : BuiltInRegistries.BLOCK.asLookup(), compound.getCompound("cover")) : null;
         this.craftIngredientRequests.clear();
-        this.craftIngredientRequests.addAll(Utility.deserializeAll(compound.getList("requests", Tag.TAG_COMPOUND), l -> new NetworkLock(provider, l)));
+        var requests = compound.getList("craft_requests", Tag.TAG_COMPOUND);
+        for (var i = 0; i < requests.size(); i++) {
+            var nbt = requests.getCompound(i);
+            this.craftIngredientRequests.add(Pair.of(
+                nbt.getInt("module_slot"),
+                new NetworkLock(provider, nbt.getCompound("lock"))));
+        }
         this.craftResultRequests.clear();
         var results = compound.getList("craft_results", Tag.TAG_COMPOUND);
         for (var i = 0; i < results.size(); i++) {
             var nbt = results.getCompound(i);
-            this.craftResultRequests.add(Pair.of(
+            this.craftResultRequests.add(Triple.of(
+                nbt.getInt("module_slot"),
                 BlockPos.of(nbt.getLong("dest_pipe")),
                 ItemStack.parseOptional(provider, nbt.getCompound("item"))));
         }
@@ -359,6 +378,14 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
         return builder.build();
     }
 
+    public int getModuleSlot(ItemStack module) {
+        for (var i = 0; i < this.modules.getSlots(); i++) {
+            if (this.modules.getStackInSlot(i) == module)
+                return i;
+        }
+        return -1;
+    }
+
     public void removeCover(Player player, InteractionHand hand) {
         if (this.level.isClientSide)
             return;
@@ -400,6 +427,11 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
         return new MainPipeContainer(Registry.pipeContainer, window, player, PipeBlockEntity.this.worldPosition);
     }
 
+    @Override
+    public boolean shouldTriggerClientSideContainerClosingOnOpen() {
+        return false;
+    }
+
     @Override
     public ConnectionType getConnectionType(BlockPos pipePos, Direction direction) {
         var state = this.level.getBlockState(pipePos.relative(direction));

src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleContainer.java

@@ -1,5 +1,6 @@
 package de.ellpeck.prettypipes.pipe.modules.craft;
 
+import de.ellpeck.prettypipes.Utility;
 import de.ellpeck.prettypipes.misc.FilterSlot;
 import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer;
 import net.minecraft.core.BlockPos;
@@ -20,7 +21,7 @@ public class CraftingModuleContainer extends AbstractPipeContainer<CraftingModul
     @Override
     protected void addSlots() {
         var contents = this.moduleStack.get(CraftingModuleItem.Contents.TYPE);
-        this.input = contents.input();
+        this.input = Utility.copy(contents.input());
         for (var i = 0; i < this.input.getSlots(); i++) {
             this.addSlot(new FilterSlot(this.input, i, (176 - this.input.getSlots() * 18) / 2 + 1 + i % 9 * 18, 17 + 32 + i / 9 * 18, false) {
                 @Override
@@ -32,7 +33,7 @@ public class CraftingModuleContainer extends AbstractPipeContainer<CraftingModul
             });
         }
 
-        this.output = contents.output();
+        this.output = Utility.copy(contents.output());
         for (var i = 0; i < this.output.getSlots(); i++) {
             this.addSlot(new FilterSlot(this.output, i, (176 - this.output.getSlots() * 18) / 2 + 1 + i % 9 * 18, 85 + i / 9 * 18, false) {
                 @Override
@@ -47,8 +48,10 @@ public class CraftingModuleContainer extends AbstractPipeContainer<CraftingModul
     @Override
     public void removed(Player playerIn) {
         super.removed(playerIn);
-        if (this.modified)
+        if (this.modified) {
             this.moduleStack.set(CraftingModuleItem.Contents.TYPE, new CraftingModuleItem.Contents(this.input, this.output));
+            this.tile.setChanged();
+        }
     }
 
 }

src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleItem.java

@@ -25,6 +25,7 @@ import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.neoforge.items.ItemStackHandler;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.lang3.tuple.Triple;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -69,25 +70,29 @@ public class CraftingModuleItem extends ModuleItem {
     public void tick(ItemStack module, PipeBlockEntity tile) {
         if (!tile.shouldWorkNow(this.speed) || !tile.canWork())
             return;
+        var slot = tile.getModuleSlot(module);
         var network = PipeNetwork.get(tile.getLevel());
         // process crafting ingredient requests
         if (!tile.craftIngredientRequests.isEmpty()) {
             network.startProfile("crafting_ingredients");
             var request = tile.craftIngredientRequests.peek();
-            var equalityTypes = ItemFilter.getEqualityTypes(tile);
+            if (request.getLeft() == slot) {
-            var dest = tile.getAvailableDestination(Direction.values(), request.stack, true, true);
+                var lock = request.getRight();
-            if (dest != null) {
+                var equalityTypes = ItemFilter.getEqualityTypes(tile);
-                var requestRemain = network.requestExistingItem(request.location, tile.getBlockPos(), dest.getLeft(), request, dest.getRight(), equalityTypes);
+                var dest = tile.getAvailableDestination(Direction.values(), lock.stack, true, true);
-                network.resolveNetworkLock(request);
+                if (dest != null) {
-                tile.craftIngredientRequests.remove();
+                    var requestRemain = network.requestExistingItem(lock.location, tile.getBlockPos(), dest.getLeft(), lock, dest.getRight(), equalityTypes);
+                    network.resolveNetworkLock(lock);
+                    tile.craftIngredientRequests.remove();
 
-                // if we couldn't fit all items into the destination, create another request for the rest
+                    // if we couldn't fit all items into the destination, create another request for the rest
-                var remain = request.stack.copy();
+                    var remain = lock.stack.copy();
-                remain.shrink(dest.getRight().getCount() - requestRemain.getCount());
+                    remain.shrink(dest.getRight().getCount() - requestRemain.getCount());
-                if (!remain.isEmpty()) {
+                    if (!remain.isEmpty()) {
-                    var remainRequest = new NetworkLock(request.location, remain);
+                        var remainRequest = new NetworkLock(lock.location, remain);
-                    tile.craftIngredientRequests.add(remainRequest);
+                        tile.craftIngredientRequests.add(Pair.of(slot, remainRequest));
-                    network.createNetworkLock(remainRequest);
+                        network.createNetworkLock(remainRequest);
+                    }
                 }
             }
             network.endProfile();
@@ -98,25 +103,27 @@ public class CraftingModuleItem extends ModuleItem {
             var items = network.getOrderedNetworkItems(tile.getBlockPos());
             var equalityTypes = ItemFilter.getEqualityTypes(tile);
             for (var request : tile.craftResultRequests) {
-                var remain = request.getRight().copy();
+                if (request.getLeft() == slot) {
-                var destPipe = network.getPipe(request.getLeft());
+                    var remain = request.getRight().copy();
-                if (destPipe != null) {
+                    var destPipe = network.getPipe(request.getMiddle());
-                    var dest = destPipe.getAvailableDestinationOrConnectable(remain, true, true);
+                    if (destPipe != null) {
-                    if (dest == null)
+                        var dest = destPipe.getAvailableDestinationOrConnectable(remain, true, true);
-                        continue;
+                        if (dest == null)
-                    for (var item : items) {
+                            continue;
-                        var requestRemain = network.requestExistingItem(item, request.getLeft(), dest.getLeft(), null, dest.getRight(), equalityTypes);
+                        for (var item : items) {
-                        remain.shrink(dest.getRight().getCount() - requestRemain.getCount());
+                            var requestRemain = network.requestExistingItem(item, request.getMiddle(), dest.getLeft(), null, dest.getRight(), equalityTypes);
-                        if (remain.isEmpty())
+                            remain.shrink(dest.getRight().getCount() - requestRemain.getCount());
-                            break;
+                            if (remain.isEmpty())
-                    }
+                                break;
-                    if (remain.getCount() != request.getRight().getCount()) {
+                        }
-                        tile.craftResultRequests.remove(request);
+                        if (remain.getCount() != request.getRight().getCount()) {
-                        // if we couldn't pull everything, log a new request
+                            tile.craftResultRequests.remove(request);
-                        if (!remain.isEmpty())
+                            // if we couldn't pull everything, log a new request
-                            tile.craftResultRequests.add(Pair.of(request.getLeft(), remain));
+                            if (!remain.isEmpty())
-                        network.endProfile();
+                                tile.craftResultRequests.add(Triple.of(slot, request.getMiddle(), remain));
-                        return;
+                            network.endProfile();
+                            return;
+                        }
                     }
                 }
             }
@@ -162,6 +169,7 @@ public class CraftingModuleItem extends ModuleItem {
         var craftableAmount = this.getCraftableAmount(module, tile, unavailableConsumer, stack, dependencyChain);
         if (craftableAmount <= 0)
             return stack;
+        var slot = tile.getModuleSlot(module);
 
         var network = PipeNetwork.get(tile.getLevel());
         var items = network.getOrderedNetworkItems(tile.getBlockPos());
@@ -181,7 +189,8 @@ public class CraftingModuleItem extends ModuleItem {
             var copy = in.copy();
             copy.setCount(in.getCount() * toCraft);
             var ret = ItemTerminalBlockEntity.requestItemLater(tile.getLevel(), tile.getBlockPos(), items, unavailableConsumer, copy, CraftingModuleItem.addDependency(dependencyChain, module), equalityTypes);
-            tile.craftIngredientRequests.addAll(ret.getLeft());
+            for (var lock : ret.getLeft())
+                tile.craftIngredientRequests.add(Pair.of(slot, lock));
         }
 
         var remain = stack.copy();
@@ -189,7 +198,7 @@ public class CraftingModuleItem extends ModuleItem {
 
         var result = stack.copy();
         result.shrink(remain.getCount());
-        tile.craftResultRequests.add(Pair.of(destPipe, result));
+        tile.craftResultRequests.add(Triple.of(slot, destPipe, result));
 
         return remain;
     }

src/main/java/de/ellpeck/prettypipes/pipe/modules/stacksize/StackSizeModuleGui.java

@@ -35,8 +35,8 @@ public class StackSizeModuleGui extends AbstractPipeGui<StackSizeModuleContainer
             }
 
         });
-        var data = this.menu.moduleStack.getOrDefault(StackSizeModuleItem.Data.TYPE, StackSizeModuleItem.Data.DEFAULT);
+        Supplier<StackSizeModuleItem.Data> data = () -> this.menu.moduleStack.getOrDefault(StackSizeModuleItem.Data.TYPE, StackSizeModuleItem.Data.DEFAULT);
-        textField.setValue(String.valueOf(data.maxStackSize()));
+        textField.setValue(String.valueOf(data.get().maxStackSize()));
         textField.setMaxLength(4);
         textField.setResponder(s -> {
             if (s.isEmpty())
@@ -44,7 +44,7 @@ public class StackSizeModuleGui extends AbstractPipeGui<StackSizeModuleContainer
             var amount = Integer.parseInt(s);
             PacketButton.sendAndExecute(this.menu.tile.getBlockPos(), ButtonResult.STACK_SIZE_AMOUNT, List.of(amount));
         });
-        Supplier<Component> buttonText = () -> Component.translatable("info." + PrettyPipes.ID + ".limit_to_max_" + (data.limitToMaxStackSize() ? "on" : "off"));
+        Supplier<Component> buttonText = () -> Component.translatable("info." + PrettyPipes.ID + ".limit_to_max_" + (data.get().limitToMaxStackSize() ? "on" : "off"));
         this.addRenderableWidget(Button.builder(buttonText.get(), b -> {
             PacketButton.sendAndExecute(this.menu.tile.getBlockPos(), ButtonResult.STACK_SIZE_MODULE_BUTTON, List.of());
             b.setMessage(buttonText.get());

src/main/java/de/ellpeck/prettypipes/terminal/ItemTerminalBlockEntity.java

@@ -218,7 +218,7 @@ public class ItemTerminalBlockEntity extends BlockEntity implements IPipeConnect
             var otherPipe = network.getPipe(craftable.getLeft());
             if (otherPipe != null) {
                 for (var lock : otherPipe.craftIngredientRequests)
-                    network.resolveNetworkLock(lock);
+                    network.resolveNetworkLock(lock.getRight());
                 otherPipe.craftIngredientRequests.clear();
                 otherPipe.craftResultRequests.clear();
             }

src/main/java/de/ellpeck/prettypipes/terminal/containers/CraftingTerminalContainer.java

@@ -64,10 +64,17 @@ public class CraftingTerminalContainer extends ItemTerminalContainer {
 
     @Override
     public void clicked(int slotId, int dragType, ClickType clickTypeIn, Player player) {
-        if (slotId > 0 && clickTypeIn == ClickType.PICKUP) {
+        if (slotId > 0) {
-            var slot = this.slots.get(slotId);
+            var ghostItems = this.getTile().ghostItems;
-            if (slot.container == this.craftInventory && !slot.hasItem())
+            if (clickTypeIn == ClickType.PICKUP) {
-                this.getTile().ghostItems.setStackInSlot(slot.getSlotIndex(), ItemStack.EMPTY);
+                var slot = this.slots.get(slotId);
+                if (slot.container == this.craftInventory && !slot.hasItem())
+                    ghostItems.setStackInSlot(slot.getSlotIndex(), ItemStack.EMPTY);
+            } else if (clickTypeIn == ClickType.QUICK_MOVE) {
+                // clear the entire grid when holding shift
+                for (var i = 0; i < ghostItems.getSlots(); i++)
+                    ghostItems.setStackInSlot(i, ItemStack.EMPTY);
+            }
         }
         super.clicked(slotId, dragType, clickTypeIn, player);
     }