Fix redstone control modules getting consumed when applying in creati…

…ve mode (#958)
AztechMC · Dec 12, 2024 · 5847e58 · 5847e58
1 parent 51faadc
commit 5847e58
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/aztech/modern_industrialization/machines/components/CasingComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/CasingComponent.java
@@ -114,9 +114,7 @@ public ItemInteractionResult onUse(MachineBlockEntity be, Player player, Interac
                     dropCasing(be.getLevel(), be.getBlockPos());
                 }
                 setCasingStack(stackInHand.copyWithCount(1));
-                if (!player.isCreative()) {
-                    stackInHand.shrink(1);
-                }
+                stackInHand.consume(1, player);
                 be.setChanged();
                 if (!be.getLevel().isClientSide()) {
                     be.sync();

diff --git a/src/main/java/aztech/modern_industrialization/machines/components/OverdriveComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/OverdriveComponent.java
@@ -61,9 +61,8 @@ public ItemInteractionResult onUse(MachineBlockEntity be, Player player, Interac
             return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
         }
         if (MIItem.OVERDRIVE_MODULE.is(stackInHand) && overdriveModule.isEmpty()) {
-            overdriveModule = stackInHand.copy();
-            overdriveModule.setCount(1);
-            stackInHand.shrink(1);
+            overdriveModule = stackInHand.copyWithCount(1);
+            stackInHand.consume(1, player);
 
             be.setChanged();
             return ItemInteractionResult.sidedSuccess(player.level().isClientSide);

diff --git a/...in/java/aztech/modern_industrialization/machines/components/RedstoneControlComponent.java b/...in/java/aztech/modern_industrialization/machines/components/RedstoneControlComponent.java
@@ -66,9 +66,8 @@ public ItemInteractionResult onUse(MachineBlockEntity be, Player player, Interac
             return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
         }
         if (MIItem.REDSTONE_CONTROL_MODULE.is(stackInHand) && controlModule.isEmpty()) {
-            controlModule = stackInHand.copy();
-            controlModule.setCount(1);
-            stackInHand.shrink(1);
+            controlModule = stackInHand.copyWithCount(1);
+            stackInHand.consume(1, player);
 
             be.setChanged();
             return ItemInteractionResult.sidedSuccess(player.level().isClientSide);

diff --git a/src/main/java/aztech/modern_industrialization/machines/components/UpgradeComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/UpgradeComponent.java
@@ -76,9 +76,7 @@ public ItemInteractionResult onUse(MachineBlockEntity be, Player player, Interac
                 int maxAdded = Math.min(stackInHand.getCount(), itemStack.getMaxStackSize() - itemStack.getCount());
                 changed = maxAdded > 0;
                 itemStack.grow(maxAdded);
-                if (!player.isCreative()) {
-                    stackInHand.shrink(maxAdded);
-                }
+                stackInHand.consume(maxAdded, player);
             }
             if (changed) {
                 be.setChanged();