From be563c56499b65e96d60a6228798a9cb6a3a952a Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 14 Feb 2017 21:14:26 +0100 Subject: [PATCH] Fixed useless mark dirty calls --- .../refinedstorage/apiimpl/network/node/NetworkNode.java | 4 +--- .../apiimpl/network/node/NetworkNodeRelay.java | 2 +- .../apiimpl/network/node/NetworkNodeSolderer.java | 8 ++++---- .../apiimpl/network/node/NetworkNodeStorageMonitor.java | 6 ++++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java index 9268ccca1..08cac3ff2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -24,11 +24,9 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA protected INetworkMaster network; protected INetworkNodeHolder holder; protected int ticks; - - private RedstoneMode redstoneMode = RedstoneMode.IGNORE; + protected RedstoneMode redstoneMode = RedstoneMode.IGNORE; private boolean couldUpdate; - private boolean active; public NetworkNode(INetworkNodeHolder holder) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java index 4f3ca61c2..8b5f0c993 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java @@ -12,7 +12,7 @@ public class NetworkNodeRelay extends NetworkNode { public NetworkNodeRelay(INetworkNodeHolder holder) { super(holder); - setRedstoneMode(RedstoneMode.LOW); + this.redstoneMode = RedstoneMode.LOW; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java index 89ccbbd76..021d9c458 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java @@ -67,6 +67,8 @@ public class NetworkNodeSolderer extends NetworkNode { if (wasWorking != working) { wasWorking = working; + markDirty(); + RSUtils.updateBlock(holder.world(), holder.pos()); } @@ -110,9 +112,9 @@ public class NetworkNodeSolderer extends NetworkNode { recipe = null; progress = 0; // Don't set working to false yet, wait till the next update because we may have another stack waiting. - - markDirty(); } + + markDirty(); } } } @@ -130,8 +132,6 @@ public class NetworkNodeSolderer extends NetworkNode { progress = 0; working = false; recipe = null; - - markDirty(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java index 3c808377a..5c17caba3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java @@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode; import com.raoulvdberge.refinedstorage.tile.TileStorageMonitor; import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IType; +import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; @@ -179,4 +180,9 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl public boolean hasConnectivityState() { return true; } + + @Override + public void setRedstoneMode(RedstoneMode mode) { + // NO OP + } }