From 5ce4f9a73ce721fe6eb0fa45cb6f4d3323c30a24 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Sun, 2 Jun 2024 17:40:08 -0500 Subject: [PATCH] Fixing redstone things --- .../actuallyadditions/mod/blocks/BlockAtomicReconstructor.java | 2 +- .../de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java | 2 +- .../de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java | 2 +- .../ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java | 2 +- .../actuallyadditions/mod/blocks/BlockLongRangeBreaker.java | 2 +- .../actuallyadditions/mod/blocks/BlockRangedCollector.java | 2 +- .../de/ellpeck/actuallyadditions/mod/event/CommonEvents.java | 1 - 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index e769ed31b..5a03327fe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -64,7 +64,7 @@ public class BlockAtomicReconstructor extends FullyDirectionalBlock.Container im public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { ItemStack heldItem = player.getItemInHand(hand); if (this.tryToggleRedstone(world, pos, player)) { - return InteractionResult.CONSUME; + return InteractionResult.SUCCESS; } if (!world.isClientSide) { TileEntityAtomicReconstructor reconstructor = (TileEntityAtomicReconstructor) world.getBlockEntity(pos); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java index d8133a23a..787ffc443 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java @@ -57,7 +57,7 @@ public class BlockBreaker extends FullyDirectionalBlock.Container { @Override public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (this.tryToggleRedstone(world, pos, player)) { - return InteractionResult.CONSUME; + return InteractionResult.SUCCESS; } return this.openGui(world, player, pos, TileEntityBreaker.class); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java index c852d2d7e..c17afd3d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java @@ -49,7 +49,7 @@ public class BlockDropper extends FullyDirectionalBlock.Container { @Override public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { if (this.tryToggleRedstone(world, pos, player)) { - return InteractionResult.CONSUME; + return InteractionResult.SUCCESS; } return this.openGui(world, player, pos, TileEntityDropper.class); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java index 5ed4f2160..05db6022e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java @@ -36,7 +36,7 @@ public class BlockFireworkBox extends BlockContainerBase { @Override public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (this.tryToggleRedstone(world, pos, player)) { - return InteractionResult.PASS; + return InteractionResult.SUCCESS; } return this.openGui(world, player, pos, TileEntityFireworkBox.class); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLongRangeBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLongRangeBreaker.java index 80753002b..479b9a620 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLongRangeBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLongRangeBreaker.java @@ -49,7 +49,7 @@ public class BlockLongRangeBreaker extends FullyDirectionalBlock.Container { @Override public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (this.tryToggleRedstone(world, pos, player)) { - return InteractionResult.PASS; + return InteractionResult.SUCCESS; } return this.openGui(world, player, pos, TileEntityLongRangeBreaker.class); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java index c263e9e9e..1838106f8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java @@ -49,7 +49,7 @@ public class BlockRangedCollector extends BlockContainerBase { @Override public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (this.tryToggleRedstone(world, pos, player)) { - return InteractionResult.PASS; + return InteractionResult.SUCCESS; } return this.openGui(world, player, pos, TileEntityRangedCollector.class); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java index 466963403..deb59c95c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java @@ -59,7 +59,6 @@ public class CommonEvents { event.setUseItem(Event.Result.DENY); event.setUseBlock(Event.Result.ALLOW); } - } @SubscribeEvent