Fix list-based aspects only moving one ingredient at a time

Closes CyclopsMC/IntegratedDynamics#1349 Related to #286
CyclopsMC · May 4, 2024 · bcb0b26 · bcb0b26
1 parent 5588b2f
commit bcb0b26
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateBlockList.java b/src/main/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateBlockList.java
@@ -24,7 +24,7 @@ public IngredientPredicateBlockList(boolean blacklist, int amount, boolean exact
         super(IngredientComponent.ITEMSTACK,
                 Iterables.transform(
                         Iterables.filter(blocks, block -> block.getRawValue().isPresent()),
-                        block -> BlockHelpers.getItemStackFromBlockState(block.getRawValue().get())),
+                        block -> TunnelItemHelpers.prototypeWithCount(BlockHelpers.getItemStackFromBlockState(block.getRawValue().get()), amount)),
                 matchFlags, blacklist, false, amount, exactAmount);
         this.blacklist = blacklist;
         this.blocks = blocks;

diff --git a/.../java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateFluidStackList.java b/.../java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateFluidStackList.java
@@ -20,7 +20,7 @@ public class IngredientPredicateFluidStackList extends IngredientPredicate<Fluid
     private final boolean checkNbt;
 
     public IngredientPredicateFluidStackList(boolean blacklist, int amount, boolean exactAmount, IValueTypeListProxy<ValueObjectTypeFluidStack, ValueObjectTypeFluidStack.ValueFluidStack> fluidStacks, int matchFlags, boolean checkFluid, boolean checkAmount, boolean checkNbt) {
-        super(IngredientComponent.FLUIDSTACK, Iterables.transform(fluidStacks, ValueObjectTypeFluidStack.ValueFluidStack::getRawValue), matchFlags, blacklist, false, amount, exactAmount);
+        super(IngredientComponent.FLUIDSTACK, Iterables.transform(fluidStacks, stack -> TunnelFluidHelpers.prototypeWithCount(stack.getRawValue(), amount)), matchFlags, blacklist, false, amount, exactAmount);
         this.blacklist = blacklist;
         this.fluidStacks = fluidStacks;
         this.checkFluid = checkFluid;

diff --git a/...n/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateItemStackList.java b/...n/java/org/cyclops/integratedtunnels/core/predicate/IngredientPredicateItemStackList.java
@@ -20,7 +20,7 @@ public class IngredientPredicateItemStackList extends IngredientPredicate<ItemSt
     private final boolean checkNbt;
 
     public IngredientPredicateItemStackList(boolean blacklist, int amount, boolean exactAmount, IValueTypeListProxy<ValueObjectTypeItemStack, ValueObjectTypeItemStack.ValueItemStack> itemStacks, int matchFlags, boolean checkStackSize, boolean checkItem, boolean checkNbt) {
-        super(IngredientComponent.ITEMSTACK, Iterables.transform(itemStacks, ValueObjectTypeItemStack.ValueItemStack::getRawValue), matchFlags, blacklist, false, amount, exactAmount);
+        super(IngredientComponent.ITEMSTACK, Iterables.transform(itemStacks, stack -> TunnelItemHelpers.prototypeWithCount(stack.getRawValue(), amount)), matchFlags, blacklist, false, amount, exactAmount);
         this.blacklist = blacklist;
         this.itemStacks = itemStacks;
         this.checkStackSize = checkStackSize;