From 8352961a94fad985cd1227a1837fb638f852064e Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Fri, 21 Feb 2014 22:33:48 +0800
Subject: [PATCH] Fixed #250 - Conveyor belts not sending packets

---
 .../mechanical/belt/TileConveyorBelt.java     | 33 +++++--------------
 .../mechanical/fluid/pipe/PartPipe.java       |  3 +-
 .../mechanical/network/TileMechanical.java    | 13 ++++++--
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/mechanical/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java b/mechanical/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java
index 25812119..1aafe15b 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java
@@ -30,7 +30,7 @@ import cpw.mods.fml.common.network.PacketDispatcher;
  * 
  * @author DarkGuardsman
  */
-public class TileConveyorBelt extends TileMechanical implements IBelt, IRotatable, IPacketReceiverWithID
+public class TileConveyorBelt extends TileMechanical implements IBelt, IRotatable
 {
 	public enum SlantType
 	{
@@ -108,7 +108,6 @@ public class TileConveyorBelt extends TileMechanical implements IBelt, IRotatabl
 				markRefresh = false;
 			}
 		}
-
 	}
 
 	@Override
@@ -127,29 +126,15 @@ public class TileConveyorBelt extends TileMechanical implements IBelt, IRotatabl
 	}
 
 	@Override
-	public boolean onReceivePacket(int id, ByteArrayDataInput data, EntityPlayer player, Object... extra)
+	public void onReceivePacket(int id, ByteArrayDataInput data, EntityPlayer player, Object... extra)
 	{
-		if (this.worldObj.isRemote)
-		{
-			try
-			{
-				if (id == PACKET_SLANT)
-				{
-					this.slantType = SlantType.values()[data.readInt()];
-					return true;
-				}
-				else if (id == PACKET_REFRESH)
-				{
-					refresh();
-					return true;
-				}
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-		return false;
+		super.onReceivePacket(id, data, player, extra);
+
+		if (id == PACKET_SLANT)
+			this.slantType = SlantType.values()[data.readInt()];
+		else if (id == PACKET_REFRESH)
+			refresh();
+
 	}
 
 	public SlantType getSlant()
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
index 120c1a25..92f97224 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
@@ -189,7 +189,8 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 	protected IFluidPipe getConnector(TileEntity tile)
 	{
 		if (tile instanceof IFluidPipe)
-			return (IFluidPipe) ((IFluidPipe) tile).getInstance(ForgeDirection.UNKNOWN);
+			if (((IFluidPipe) tile).getInstance(ForgeDirection.UNKNOWN) instanceof IFluidPipe)
+				return (IFluidPipe) ((IFluidPipe) tile).getInstance(ForgeDirection.UNKNOWN);
 
 		return null;
 	}
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/network/TileMechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/network/TileMechanical.java
index 92291345..f2497e5d 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/network/TileMechanical.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/network/TileMechanical.java
@@ -7,6 +7,7 @@ import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.api.mechanical.IMechanical;
 import resonantinduction.api.mechanical.IMechanicalNetwork;
 import resonantinduction.core.ResonantInduction;
+import resonantinduction.mechanical.Mechanical;
 import resonantinduction.mechanical.gear.PartGearShaft;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.IPacketReceiver;
@@ -17,6 +18,8 @@ import com.google.common.io.ByteArrayDataInput;
 
 public abstract class TileMechanical extends TileAdvanced implements IMechanical, IPacketReceiver
 {
+	protected static final int PACKET_VELOCITY = Mechanical.contentRegistry.getNextPacketID();
+
 	/** The mechanical connections this connector has made */
 	protected Object[] connections = new Object[6];
 	private IMechanicalNetwork network;
@@ -59,13 +62,19 @@ public abstract class TileMechanical extends TileAdvanced implements IMechanical
 
 	private void sendRotationPacket()
 	{
-		PacketHandler.sendPacketToClients(ResonantInduction.PACKET_TILE.getPacket(this, angularVelocity), worldObj, new Vector3(this), 20);
+		PacketHandler.sendPacketToClients(ResonantInduction.PACKET_TILE.getPacket(this, PACKET_VELOCITY, angularVelocity), worldObj, new Vector3(this), 20);
 	}
 
 	@Override
 	public void onReceivePacket(ByteArrayDataInput data, EntityPlayer player, Object... extra)
 	{
-		angularVelocity = data.readFloat();
+		onReceivePacket(data.readInt(), data, player, extra);
+	}
+
+	public void onReceivePacket(int id, ByteArrayDataInput data, EntityPlayer player, Object... extra)
+	{
+		if (id == PACKET_VELOCITY)
+			angularVelocity = data.readFloat();
 	}
 
 	@Override