diff --git a/projects/common/src/main/java/dan200/computercraft/shared/common/DefaultBundledRedstoneProvider.java b/projects/common/src/main/java/dan200/computercraft/shared/common/DefaultBundledRedstoneProvider.java index a824aef72..4770b80d2 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/common/DefaultBundledRedstoneProvider.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/common/DefaultBundledRedstoneProvider.java @@ -18,11 +18,6 @@ public class DefaultBundledRedstoneProvider implements BundledRedstoneProvider { public static int getDefaultBundledRedstoneOutput(Level world, BlockPos pos, Direction side) { var block = world.getBlockState(pos).getBlock(); - if (block instanceof IBundledRedstoneBlock generic) { - if (generic.getBundledRedstoneConnectivity(world, pos, side)) { - return generic.getBundledRedstoneOutput(world, pos, side); - } - } - return -1; + return block instanceof IBundledRedstoneBlock bundledBlock ? bundledBlock.getBundledRedstoneOutput(world, pos, side) : -1; } } diff --git a/projects/common/src/main/java/dan200/computercraft/shared/common/IBundledRedstoneBlock.java b/projects/common/src/main/java/dan200/computercraft/shared/common/IBundledRedstoneBlock.java index e1b93c96d..f71d44284 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/common/IBundledRedstoneBlock.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/common/IBundledRedstoneBlock.java @@ -9,7 +9,5 @@ import net.minecraft.core.Direction; import net.minecraft.world.level.Level; public interface IBundledRedstoneBlock { - boolean getBundledRedstoneConnectivity(Level world, BlockPos pos, Direction side); - int getBundledRedstoneOutput(Level world, BlockPos pos, Direction side); } diff --git a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java b/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java index 5f225f65c..9438da0e0 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java @@ -92,11 +92,6 @@ public abstract class AbstractComputerBlock