From 4f0a7cb24b02b14da70cb2643336015d8bb360c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 8 Jan 2021 19:17:28 +0100 Subject: [PATCH] Fixed vertical redstone output for redstone card. --- .../cil/oc2/common/block/ComputerBlock.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java b/src/main/java/li/cil/oc2/common/block/ComputerBlock.java index 302afa5c..c394e81f 100644 --- a/src/main/java/li/cil/oc2/common/block/ComputerBlock.java +++ b/src/main/java/li/cil/oc2/common/block/ComputerBlock.java @@ -50,6 +50,8 @@ public final class ComputerBlock extends HorizontalBlock { setDefaultState(getStateContainer().getBaseState().with(HORIZONTAL_FACING, Direction.NORTH)); } + /////////////////////////////////////////////////////////////////// + @OnlyIn(Dist.CLIENT) @Override public void addInformation(final ItemStack stack, @Nullable final IBlockReader world, final List tooltip, final ITooltipFlag advanced) { @@ -81,16 +83,15 @@ public final class ComputerBlock extends HorizontalBlock { @SuppressWarnings("deprecation") @Override public int getWeakPower(final BlockState state, final IBlockReader world, final BlockPos pos, final Direction side) { - if (side.getAxis().getPlane() == Direction.Plane.HORIZONTAL) { - final TileEntity tileEntity = world.getTileEntity(pos); - if (tileEntity != null) { - // Redstone requests info for faces with external perspective. Capabilities treat - // the Direction from internal perspective, so flip it. - return tileEntity.getCapability(Capabilities.REDSTONE_EMITTER, side.getOpposite()) - .map(RedstoneEmitter::getRedstoneOutput) - .orElse(0); - } + final TileEntity tileEntity = world.getTileEntity(pos); + if (tileEntity != null) { + // Redstone requests info for faces with external perspective. Capabilities treat + // the Direction from internal perspective, so flip it. + return tileEntity.getCapability(Capabilities.REDSTONE_EMITTER, side.getOpposite()) + .map(RedstoneEmitter::getRedstoneOutput) + .orElse(0); } + return super.getWeakPower(state, world, pos, side); }