From f555f378dbdc2d0ac81fb1f4d39fabd24c001032 Mon Sep 17 00:00:00 2001 From: Buuz135 Date: Sun, 12 Sep 2021 12:03:57 +0200 Subject: [PATCH] Fixed cables not connecting to things that dont support covers --- .../refinedstorage/apiimpl/network/node/cover/CoverManager.java | 1 - .../java/com/refinedmods/refinedstorage/block/CableBlock.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java index 977b16b4a..37b7ae91e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java @@ -90,7 +90,6 @@ public class CoverManager { public void readFromNbt(CompoundNBT nbt) { covers.clear(); - System.out.println(nbt); for (String s : nbt.keySet()) { CompoundNBT tag = nbt.getCompound(s); if (tag.contains(NBT_DIRECTION) && tag.contains(NBT_ITEM)) { diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java index c19bc0bea..bfb46e3ed 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java @@ -169,7 +169,7 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { if (tile == null){ return false; } - return tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).map(INetworkNodeProxy::getNode).map(iNetworkNode -> iNetworkNode instanceof ICoverable && (!((ICoverable) iNetworkNode).getCoverManager().hasCover(direction) || ((ICoverable) iNetworkNode).getCoverManager().getCover(direction).getType() == CoverType.HOLLOW)).orElse(false); + return tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).map(INetworkNodeProxy::getNode).map(iNetworkNode -> !(iNetworkNode instanceof ICoverable) || (!((ICoverable) iNetworkNode).getCoverManager().hasCover(direction) || ((ICoverable) iNetworkNode).getCoverManager().getCover(direction).getType() == CoverType.HOLLOW)).orElse(false); } private BlockState getState(BlockState currentState, IWorld world, BlockPos pos) {