From 8b450709cd9c2335d159ba9bb7a738e2e8f604aa Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Wed, 27 Jan 2016 15:14:09 +0100
Subject: [PATCH] fix bug that occurs with changing redstone setting

---
 .../network/MessageCompareUpdate.java           |  6 +++---
 .../network/MessageRedstoneModeUpdate.java      |  6 +++---
 .../java/storagecraft/tile/ICompareSetting.java |  2 +-
 .../java/storagecraft/tile/INetworkTile.java    |  2 +-
 .../storagecraft/tile/IRedstoneModeSetting.java |  2 +-
 .../java/storagecraft/tile/TileController.java  | 17 ++++++++++++++---
 .../java/storagecraft/tile/TileMachine.java     | 12 ++++++++++++
 7 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/main/java/storagecraft/network/MessageCompareUpdate.java b/src/main/java/storagecraft/network/MessageCompareUpdate.java
index 4effab36e..28d871a0d 100644
--- a/src/main/java/storagecraft/network/MessageCompareUpdate.java
+++ b/src/main/java/storagecraft/network/MessageCompareUpdate.java
@@ -20,9 +20,9 @@ public class MessageCompareUpdate extends MessageHandlerPlayerToServer<MessageCo
 
 	public MessageCompareUpdate(ICompareSetting setting, int compare)
 	{
-		this.x = setting.getPos().getX();
-		this.y = setting.getPos().getY();
-		this.z = setting.getPos().getZ();
+		this.x = setting.getMachinePos().getX();
+		this.y = setting.getMachinePos().getY();
+		this.z = setting.getMachinePos().getZ();
 		this.compare = compare;
 	}
 
diff --git a/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java b/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java
index 5162b548b..64518391b 100644
--- a/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java
+++ b/src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java
@@ -19,9 +19,9 @@ public class MessageRedstoneModeUpdate extends MessageHandlerPlayerToServer<Mess
 
 	public MessageRedstoneModeUpdate(IRedstoneModeSetting setting)
 	{
-		this.x = setting.getPos().getX();
-		this.y = setting.getPos().getY();
-		this.z = setting.getPos().getZ();
+		this.x = setting.getMachinePos().getX();
+		this.y = setting.getMachinePos().getY();
+		this.z = setting.getMachinePos().getZ();
 	}
 
 	@Override
diff --git a/src/main/java/storagecraft/tile/ICompareSetting.java b/src/main/java/storagecraft/tile/ICompareSetting.java
index 80d76943a..4ec06df4a 100644
--- a/src/main/java/storagecraft/tile/ICompareSetting.java
+++ b/src/main/java/storagecraft/tile/ICompareSetting.java
@@ -8,5 +8,5 @@ public interface ICompareSetting
 
 	public void setCompare(int compare);
 
-	public BlockPos getPos();
+	public BlockPos getMachinePos();
 }
diff --git a/src/main/java/storagecraft/tile/INetworkTile.java b/src/main/java/storagecraft/tile/INetworkTile.java
index 88b79bddd..ddd230a1b 100644
--- a/src/main/java/storagecraft/tile/INetworkTile.java
+++ b/src/main/java/storagecraft/tile/INetworkTile.java
@@ -9,5 +9,5 @@ public interface INetworkTile
 
 	public void toBytes(ByteBuf buf);
 
-	public BlockPos getPos();
+	public BlockPos getTilePos();
 }
diff --git a/src/main/java/storagecraft/tile/IRedstoneModeSetting.java b/src/main/java/storagecraft/tile/IRedstoneModeSetting.java
index 0255a67b0..87eda5fad 100644
--- a/src/main/java/storagecraft/tile/IRedstoneModeSetting.java
+++ b/src/main/java/storagecraft/tile/IRedstoneModeSetting.java
@@ -8,5 +8,5 @@ public interface IRedstoneModeSetting
 
 	public void setRedstoneMode(RedstoneMode mode);
 
-	public BlockPos getPos();
+	public BlockPos getMachinePos();
 }
diff --git a/src/main/java/storagecraft/tile/TileController.java b/src/main/java/storagecraft/tile/TileController.java
index 50a5645b2..c3f73d198 100644
--- a/src/main/java/storagecraft/tile/TileController.java
+++ b/src/main/java/storagecraft/tile/TileController.java
@@ -3,6 +3,8 @@ package storagecraft.tile;
 import cofh.api.energy.EnergyStorage;
 import cofh.api.energy.IEnergyReceiver;
 import io.netty.buffer.ByteBuf;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -16,9 +18,6 @@ import storagecraft.storage.IStorageProvider;
 import storagecraft.storage.StorageItem;
 import storagecraft.util.InventoryUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneModeSetting
 {
 	private List<StorageItem> items = new ArrayList<StorageItem>();
@@ -371,6 +370,18 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
 		this.redstoneMode = mode;
 	}
 
+	@Override
+	public BlockPos getTilePos()
+	{
+		return pos;
+	}
+
+	@Override
+	public BlockPos getMachinePos()
+	{
+		return pos;
+	}
+
 	@Override
 	public void fromBytes(ByteBuf buf)
 	{
diff --git a/src/main/java/storagecraft/tile/TileMachine.java b/src/main/java/storagecraft/tile/TileMachine.java
index 4dd15bba4..6ebda76c9 100644
--- a/src/main/java/storagecraft/tile/TileMachine.java
+++ b/src/main/java/storagecraft/tile/TileMachine.java
@@ -70,6 +70,18 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
 		}
 	}
 
+	@Override
+	public BlockPos getMachinePos()
+	{
+		return pos;
+	}
+
+	@Override
+	public BlockPos getTilePos()
+	{
+		return pos;
+	}
+
 	public TileController getController()
 	{
 		return (TileController) worldObj.getTileEntity(controllerPos);