Work around schematicannon item requirement bug by using multiple Sta…

…ckRequirements, fixes #155
copycats-plus · Sep 8, 2024 · e115afd · e115afd
1 parent 12f1f79
commit e115afd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/ICopycatBlock.java b/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/ICopycatBlock.java
@@ -43,6 +43,7 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import java.util.Optional;
+import java.util.stream.IntStream;
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.*;
 
@@ -338,10 +339,13 @@ static BlockState getMaterial(BlockGetter reader, BlockPos targetPos) {
      * Utility to get the required items for a layer of a block state.
      */
     static ItemRequirement getRequiredItemsForLayer(BlockState state, IntegerProperty property) {
-        return new ItemRequirement(
-                ItemRequirement.ItemUseType.CONSUME,
-                new ItemStack(state.getBlock().asItem(), state.getValue(property))
-        );
+        int count = state.getValue(property);
+        if (count == 0)
+            return ItemRequirement.NONE;
+        return new ItemRequirement(IntStream.range(0, count).mapToObj($ -> new ItemRequirement.StackRequirement(
+                new ItemStack(state.getBlock().asItem()),
+                ItemRequirement.ItemUseType.CONSUME
+        )).toList());
     }
 
     /**

diff --git a/...java/com/copycatsplus/copycats/foundation/copycat/multistate/IMultiStateCopycatBlock.java b/...java/com/copycatsplus/copycats/foundation/copycat/multistate/IMultiStateCopycatBlock.java
@@ -49,6 +49,7 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.IntStream;
 
 /**
  * An interface with implementation for all multi-state copycats.
@@ -435,10 +436,10 @@ static ItemRequirement getRequiredItemsForParts(BlockState state, BooleanPropert
                 count++;
         }
         if (count == 0) return ItemRequirement.NONE;
-        return new ItemRequirement(
-                ItemRequirement.ItemUseType.CONSUME,
-                new ItemStack(state.getBlock().asItem(), count)
-        );
+        return new ItemRequirement(IntStream.range(0, count).mapToObj($ -> new ItemRequirement.StackRequirement(
+                new ItemStack(state.getBlock().asItem()),
+                ItemRequirement.ItemUseType.CONSUME
+        )).toList());
     }
 
     @Override