Fixed Relays when being in "Ignore Redstone" mode using up energy, fixes #246

This commit is contained in:
Raoul Van den Berge
2016-08-06 23:17:36 +02:00
parent 9a932726ce
commit 97d703f429
4 changed files with 8 additions and 3 deletions

View File

@@ -8,6 +8,7 @@
- Fixed not being able to change some configs in blocks - Fixed not being able to change some configs in blocks
- Fixed serverside configs not syncing up with clientside - 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 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 - Improved collisions of Cable parts
**Features** **Features**

View File

@@ -133,8 +133,8 @@ public class BlockCable extends BlockCoverable {
if (facing instanceof INetworkMaster || facing instanceof INetworkNode) { 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). // Do not render a cable extension where our cable "head" is (e.g. importer, exporter, external storage heads).
if (getPlacementType() != null) { if (getPlacementType() != null && ((TileMultipartNode) world.getTileEntity(pos)).getFacingTile() == facing) {
return ((TileMultipartNode) world.getTileEntity(pos)).getFacingTile() != facing; return false;
} }
return !TileMultipartNode.hasBlockingMicroblock(world, pos, direction) && !TileMultipartNode.hasBlockingMicroblock(world, pos.offset(direction), direction.getOpposite()); return !TileMultipartNode.hasBlockingMicroblock(world, pos, direction) && !TileMultipartNode.hasBlockingMicroblock(world, pos.offset(direction), direction.getOpposite());

View File

@@ -99,6 +99,10 @@ public class GuiGrid extends GuiBase {
GuiGrid gui = (GuiGrid) screen; GuiGrid gui = (GuiGrid) screen;
if (gui.searchField == null) {
return;
}
SORTED_ITEMS.clear(); SORTED_ITEMS.clear();
if (gui.getGrid().isConnected()) { if (gui.getGrid().isConnected()) {

View File

@@ -13,7 +13,7 @@ public class TileRelay extends TileNode {
@Override @Override
public int getEnergyUsage() { public int getEnergyUsage() {
return RefinedStorage.INSTANCE.relayUsage; return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RefinedStorage.INSTANCE.relayUsage;
} }
@Override @Override