diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c91e33d5..65875a8ee 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Fixed not being able to change some configs in blocks - Fixed serverside configs not syncing up with clientside - Fixed not being able to move inventory items in Grid GUI's to hotbar via the number keys +- Fixed Relays when being in "Ignore Redstone" mode using up energy - Improved collisions of Cable parts **Features** diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index 70d111caa..ef407b0fc 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -133,8 +133,8 @@ public class BlockCable extends BlockCoverable { if (facing instanceof INetworkMaster || facing instanceof INetworkNode) { // Do not render a cable extension where our cable "head" is (e.g. importer, exporter, external storage heads). - if (getPlacementType() != null) { - return ((TileMultipartNode) world.getTileEntity(pos)).getFacingTile() != facing; + if (getPlacementType() != null && ((TileMultipartNode) world.getTileEntity(pos)).getFacingTile() == facing) { + return false; } return !TileMultipartNode.hasBlockingMicroblock(world, pos, direction) && !TileMultipartNode.hasBlockingMicroblock(world, pos.offset(direction), direction.getOpposite()); diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java index b287de644..9c33d3db2 100755 --- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java @@ -99,6 +99,10 @@ public class GuiGrid extends GuiBase { GuiGrid gui = (GuiGrid) screen; + if (gui.searchField == null) { + return; + } + SORTED_ITEMS.clear(); if (gui.getGrid().isConnected()) { diff --git a/src/main/java/refinedstorage/tile/TileRelay.java b/src/main/java/refinedstorage/tile/TileRelay.java index d41e9788b..37b0f971b 100755 --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/refinedstorage/tile/TileRelay.java @@ -13,7 +13,7 @@ public class TileRelay extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.relayUsage; + return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RefinedStorage.INSTANCE.relayUsage; } @Override