Conveyor belts now work as part of mechanical network

src/main/java/resonantinduction/api/IBelt.java

@@ -3,19 +3,26 @@ package resonantinduction.api;
 import java.util.List;
 
 import net.minecraft.entity.Entity;
-import universalelectricity.api.net.IConnector;
+import resonantinduction.mechanical.network.IMechanicalConnector;
 
-/** An interface applied to the tile entity of a conveyor belt
+/**
- * @Author DarkGuardsman */
+ * An interface applied to the tile entity of a conveyor belt
-public interface IBelt extends IConnector<IBeltNetwork>
-{
-    /** Used to get a list of entities the belt exerts an effect upon.
  * 
-     * @return list of entities in the belts are of effect */
+ * @Author DarkGuardsman
+ */
+public interface IBelt extends IMechanicalConnector
+{
+	/**
+	 * Used to get a list of entities the belt exerts an effect upon.
+	 * 
+	 * @return list of entities in the belts are of effect
+	 */
 	public List<Entity> getAffectedEntities();
 
-    /** Adds and entity to the ignore list so its not moved has to be done every 20 ticks
+	/**
+	 * Adds and entity to the ignore list so its not moved has to be done every 20 ticks
 	 * 
-     * @param entity */
+	 * @param entity
+	 */
 	public void ignoreEntity(Entity entity);
 }

src/main/java/resonantinduction/api/IBeltNetwork.java

@@ -1,15 +0,0 @@
-package resonantinduction.api;
-
-import net.minecraft.tileentity.TileEntity;
-import universalelectricity.api.net.INetwork;
-
-public interface IBeltNetwork extends INetwork<IBeltNetwork, IBelt, TileEntity>
-{
-    /** Frame of animation the belts all share */
-    public int frame();
-
-    /** Speed to apply to each entity */
-    public float speed();
-
-    public void reconstruct();
-}

src/main/java/resonantinduction/mechanical/MultipartMechanical.java

@@ -2,8 +2,8 @@ package resonantinduction.mechanical;
 
 import resonantinduction.mechanical.gear.PartGear;
 import codechicken.multipart.MultiPartRegistry;
-import codechicken.multipart.MultipartGenerator;
 import codechicken.multipart.MultiPartRegistry.IPartFactory;
+import codechicken.multipart.MultipartGenerator;
 import codechicken.multipart.TMultiPart;
 
 public class MultipartMechanical implements IPartFactory
@@ -15,7 +15,8 @@ public class MultipartMechanical implements IPartFactory
 	public MultipartMechanical()
 	{
 		MultiPartRegistry.registerParts(this, PART_TYPES);
-		MultipartGenerator.registerTrait("resonantinduction.mechanical.network.IMechanical", "resonantinduction.mechanical.gear.TraitMechanical");
+		MultipartGenerator.registerTrait("resonantinduction.mechanical.network.IMechanical", "resonantinduction.mechanical.trait.TraitMechanical");
+		MultipartGenerator.registerTrait("resonantinduction.mechanical.network.IMechanicalConnector", "resonantinduction.mechanical.trait.TraitMechanicalConnector");
 	}
 
 	@Override

src/main/java/resonantinduction/mechanical/belt/BeltNetwork.java

@@ -1,160 +0,0 @@
-package resonantinduction.mechanical.belt;
-
-import net.minecraft.tileentity.TileEntity;
-import resonantinduction.api.IBelt;
-import resonantinduction.api.IBeltNetwork;
-import resonantinduction.mechanical.network.IMechanicalNetwork;
-import resonantinduction.mechanical.network.MechanicalNetwork;
-import universalelectricity.api.net.IConnector;
-import universalelectricity.core.net.ConnectionPathfinder;
-import universalelectricity.core.net.Network;
-
-/** Network used to update belts in a uniform way
- * 
- * @author DarkGuardsman */
-public class BeltNetwork extends Network<IBeltNetwork, IBelt, TileEntity> implements IBeltNetwork
-{
-
-    @Override
-    public boolean canUpdate()
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean continueUpdate()
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void update()
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public IBeltNetwork merge(IBeltNetwork network)
-    {
-        if (network.getClass().isAssignableFrom(this.getClass()) && network != this)
-        {
-            BeltNetwork newNetwork = new BeltNetwork();
-            newNetwork.getConnectors().addAll(this.getConnectors());
-            newNetwork.getConnectors().addAll(network.getConnectors());
-
-            network.getConnectors().clear();
-            network.getNodes().clear();
-            this.getConnectors().clear();
-            this.getNodes().clear();
-
-            newNetwork.reconstruct();
-            return newNetwork;
-        }
-
-        return null;
-    }
-
-    @Override
-    public void split(IBelt splitPoint)
-    {
-        this.removeConnector(splitPoint);
-        this.reconstruct();
-
-        /** Loop through the connected blocks and attempt to see if there are connections between the
-         * two points elsewhere. */
-        Object[] connectedBlocks = splitPoint.getConnections();
-
-        for (int i = 0; i < connectedBlocks.length; i++)
-        {
-            Object connectedBlockA = connectedBlocks[i];
-
-            if (connectedBlockA instanceof IBelt)
-            {
-                for (int ii = 0; ii < connectedBlocks.length; ii++)
-                {
-                    final Object connectedBlockB = connectedBlocks[ii];
-
-                    if (connectedBlockA != connectedBlockB && connectedBlockB instanceof IBelt)
-                    {
-                        ConnectionPathfinder finder = new ConnectionPathfinder((IConnector) connectedBlockB, splitPoint);
-                        finder.findNodes((IConnector) connectedBlockA);
-
-                        if (finder.results.size() <= 0)
-                        {
-                            try
-                            {
-                                /** The connections A and B are not connected anymore. Give them both
-                                 * a new common network. */
-                                IBeltNetwork newNetwork = new BeltNetwork();
-                                for (IConnector node : finder.closedSet)
-                                {
-                                    if (node != splitPoint && node instanceof IBelt)
-                                    {
-                                        newNetwork.addConnector((IBelt) node);
-                                    }
-                                }
-                                newNetwork.reconstruct();
-                            }
-                            catch (Exception e)
-                            {
-                                e.printStackTrace();
-                            }
-
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public void split(IBelt connectorA, IBelt connectorB)
-    {
-        /** Check if connectorA connects with connectorB. */
-        ConnectionPathfinder finder = new ConnectionPathfinder(connectorB);
-        finder.findNodes(connectorA);
-
-        if (finder.results.size() <= 0)
-        {
-            /** The connections A and B are not connected anymore. Give them both a new common
-             * network. */
-            IMechanicalNetwork newNetwork = new MechanicalNetwork();
-
-            for (IConnector node : finder.closedSet)
-            {
-            	//TODO: Fix this
-               /* if (node instanceof IMechanicalConnector)
-                {
-                    newNetwork.addConnector((IMechanicalConnector) node);
-                }*/
-            }
-
-            newNetwork.reconstruct();
-        }
-    }
-
-    @Override
-    public int frame()
-    {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public float speed()
-    {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public void reconstruct()
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-}

src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java

@@ -3,7 +3,6 @@ package resonantinduction.mechanical.belt;
 import java.util.List;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -33,6 +32,43 @@ public class BlockConveyorBelt extends BlockRI
 		this.setBlockBounds(0, 0, 0, 1, 0.3f, 1);
 	}
 
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
+	{
+		TileEntity t = world.getBlockTileEntity(x, y, z);
+
+		if (t != null && t instanceof TileConveyorBelt)
+		{
+			TileConveyorBelt tileEntity = (TileConveyorBelt) t;
+			System.out.println(world.isRemote + " : " + tileEntity.getNetwork());
+		}
+		return false;
+	}
+
+	@Override
+	public void onBlockAdded(World world, int x, int y, int z)
+	{
+		TileEntity t = world.getBlockTileEntity(x, y, z);
+
+		if (t != null && t instanceof TileConveyorBelt)
+		{
+			TileConveyorBelt tileEntity = (TileConveyorBelt) t;
+			tileEntity.refresh();
+		}
+	}
+
+	@Override
+	public void onNeighborBlockChange(World world, int x, int y, int z, int par5)
+	{
+		TileEntity t = world.getBlockTileEntity(x, y, z);
+
+		if (t != null && t instanceof TileConveyorBelt)
+		{
+			TileConveyorBelt tileEntity = (TileConveyorBelt) t;
+			tileEntity.refresh();
+		}
+	}
+
 	@Override
 	public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z)
 	{
@@ -80,21 +116,20 @@ public class BlockConveyorBelt extends BlockRI
 	@Override
 	public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity)
 	{
-
 		TileEntity t = world.getBlockTileEntity(x, y, z);
 
 		if (t != null && t instanceof TileConveyorBelt)
 		{
-			TileConveyorBelt tileEntity = (TileConveyorBelt) t;
+			TileConveyorBelt tile = (TileConveyorBelt) t;
 
-			if (tileEntity.getSlant() == SlantType.UP || tileEntity.getSlant() == SlantType.DOWN)
+			if (tile.getSlant() == SlantType.UP || tile.getSlant() == SlantType.DOWN)
 			{
 				AxisAlignedBB boundBottom = AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 0.3, z + 1);
 				AxisAlignedBB boundTop = null;
 
-				ForgeDirection direction = tileEntity.getDirection();
+				ForgeDirection direction = tile.getDirection();
 
-				if (tileEntity.getSlant() == SlantType.UP)
+				if (tile.getSlant() == SlantType.UP)
 				{
 					if (direction.offsetX > 0)
 					{
@@ -113,7 +148,7 @@ public class BlockConveyorBelt extends BlockRI
 						boundTop = AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 0.8, z + (float) direction.offsetZ / -2);
 					}
 				}
-				else if (tileEntity.getSlant() == SlantType.DOWN)
+				else if (tile.getSlant() == SlantType.DOWN)
 				{
 					if (direction.offsetX > 0)
 					{
@@ -145,7 +180,7 @@ public class BlockConveyorBelt extends BlockRI
 				return;
 			}
 
-			if (tileEntity.getSlant() == SlantType.TOP)
+			if (tile.getSlant() == SlantType.TOP)
 			{
 				AxisAlignedBB newBounds = AxisAlignedBB.getAABBPool().getAABB(x, y + 0.68, z, x + 1, y + 0.98, z + 1);
 
@@ -237,7 +272,7 @@ public class BlockConveyorBelt extends BlockRI
 		return true;
 	}
 
-	/** Moves the entity if the conductor is powered. */
+	/** Moves the entity if the belt is powered. */
 	@Override
 	public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity)
 	{
@@ -246,23 +281,21 @@ public class BlockConveyorBelt extends BlockRI
 		if (tileEntity instanceof TileConveyorBelt)
 		{
 			TileConveyorBelt tile = (TileConveyorBelt) tileEntity;
-			if (tile.IgnoreList.contains(entity))
+
+			if (tile.ignoreList.contains(entity))
 			{
 				return;
 			}
+
 			if (!world.isBlockIndirectlyGettingPowered(x, y, z))
 			{
-				float acceleration = tile.acceleration;
+				float maxSpeed = tile.getMoveVelocity() / 20;
-				float maxSpeed = tile.maxSpeed;
 
+				if (maxSpeed > 0)
+				{
 					SlantType slantType = tile.getSlant();
 					ForgeDirection direction = tile.getDirection();
 
-				if (entity instanceof EntityLiving)
-				{
-					acceleration *= 5;
-					maxSpeed *= 10;
-				}
 					if (slantType == SlantType.UP)
 					{
 						if (entity.motionY < 0.2)
@@ -277,16 +310,14 @@ public class BlockConveyorBelt extends BlockRI
 							entity.addVelocity(0, -0.1, 0);
 						}
 					}
-				// Move the entity based on the conveyor belt's direction.
-				entity.addVelocity(direction.offsetX * acceleration, 0, direction.offsetZ * acceleration);
 
-				if (direction.offsetX != 0 && Math.abs(entity.motionX) > maxSpeed)
+					if (direction.offsetX != 0)
 					{
 						entity.motionX = direction.offsetX * maxSpeed;
 						entity.motionZ = 0;
 					}
 
-				if (direction.offsetZ != 0 && Math.abs(entity.motionZ) > maxSpeed)
+					if (direction.offsetZ != 0)
 					{
 						entity.motionZ = direction.offsetZ * maxSpeed;
 						entity.motionX = 0;
@@ -327,6 +358,7 @@ public class BlockConveyorBelt extends BlockRI
 				}
 			}
 		}
+	}
 
 	/** Returns the TileEntity used by this block. */
 	@Override

src/main/java/resonantinduction/mechanical/belt/RenderConveyorBelt.java

@@ -102,7 +102,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer implements ICu
 				bindTexture(name);
 				GL11.glRotatef(180, 0f, 1f, 0f);
 				GL11.glTranslatef(0f, -0.68f, 0f);
-				MODEL.render(0.0625f, (float) Math.toRadians(tileEntity.wheelRotation), false, false, false, false);
+				MODEL.render(0.0625f, (float) Math.toRadians(tileEntity.getNetwork().getRotation()), false, false, false, false);
 			}
 		}
 		else
@@ -124,7 +124,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer implements ICu
 			}
 			ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "belt/frame" + frame + ".png");
 			bindTexture(name);
-			MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.wheelRotation), false, false, false, true);
+			MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.getNetwork().getRotation()), false, false, false, true);
 
 		}
 

src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java

@@ -12,9 +12,12 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.api.IBelt;
-import resonantinduction.api.IBeltNetwork;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.mechanical.Mechanical;
+import resonantinduction.mechanical.network.IMechanical;
+import resonantinduction.mechanical.network.IMechanicalConnector;
+import resonantinduction.mechanical.network.IMechanicalNetwork;
+import resonantinduction.mechanical.network.MechanicalNetwork;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.IPacketReceiverWithID;
 import calclavia.lib.prefab.tile.IRotatable;
@@ -22,43 +25,52 @@ import calclavia.lib.prefab.tile.TileAdvanced;
 
 import com.google.common.io.ByteArrayDataInput;
 
-/** Conveyer belt TileEntity that allows entities of all kinds to be moved
+import cpw.mods.fml.common.network.PacketDispatcher;
- * 
- * @author DarkGuardsman */
-public class TileConveyorBelt extends TileAdvanced implements IBelt, IRotatable, IPacketReceiverWithID
-{
 
+/**
+ * Conveyer belt TileEntity that allows entities of all kinds to be moved
+ * 
+ * @author DarkGuardsman
+ */
+public class TileConveyorBelt extends TileAdvanced implements IMechanicalConnector, IBelt, IRotatable, IPacketReceiverWithID
+{
 	public enum SlantType
 	{
-        NONE,
+		NONE, UP, DOWN, TOP
-        UP,
-        DOWN,
-        TOP
 	}
 
+	/**
+	 * Static constants.
+	 */
 	public static final int MAX_FRAME = 13;
 	public static final int MAX_SLANT_FRAME = 23;
-    /** Packet name to ID the packet containing info on the angle of the belt */
+	public static final int PACKET_SLANT = Mechanical.contentRegistry.getNextPacketID();
-    public static final String slantPacketID = "slantPacket";
+	public static final int PACKET_REFRESH = Mechanical.contentRegistry.getNextPacketID();
 	/** Acceleration of entities on the belt */
-    public final float acceleration = 0.01f;
+	public static final float ACCELERATION = 0.01f;
-    /** max speed of entities on the belt */
+
-    public final float maxSpeed = 0.1f;
+	private IMechanicalNetwork network;
-    /** Current rotation of the model wheels */
+
-    public float wheelRotation = 0;
+	/** The mechanical connections this connector has made */
+	protected Object[] connections = new Object[6];
+
 	/** Frame count for texture animation from 0 - maxFrame */
-    private int animFrame = 0;
+	private int animationFrame = 0;
+
 	private SlantType slantType = SlantType.NONE;
+
 	/** Entities that are ignored allowing for other tiles to interact with them */
-    public List<Entity> IgnoreList = new ArrayList<Entity>();
+	public List<Entity> ignoreList = new ArrayList<Entity>();
-    private boolean functioning;
+
+	private boolean markRefresh = true;
 
 	@Override
 	public void updateEntity()
 	{
 		super.updateEntity();
+
 		/* PROCESSES IGNORE LIST AND REMOVES UNNEED ENTRIES */
-        Iterator<Entity> it = this.IgnoreList.iterator();
+		Iterator<Entity> it = this.ignoreList.iterator();
 		while (it.hasNext())
 		{
 			if (!this.getAffectedEntities().contains(it.next()))
@@ -66,32 +78,39 @@ public class TileConveyorBelt extends TileAdvanced implements IBelt, IRotatable,
 				it.remove();
 			}
 		}
+
 		if (this.worldObj.isRemote)
 		{
 			if (this.ticks % 10 == 0 && this.worldObj.isRemote && this.worldObj.getBlockId(this.xCoord - 1, this.yCoord, this.zCoord) != Mechanical.blockConveyorBelt.blockID && this.worldObj.getBlockId(xCoord, yCoord, zCoord - 1) != Mechanical.blockConveyorBelt.blockID)
 			{
 				this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "mods.assemblyline.conveyor", 0.5f, 0.7f, true);
 			}
-            this.wheelRotation = (40 + this.wheelRotation) % 360;
 
-            float wheelRotPct = wheelRotation / 360f;
+			double wheelRotPct = getNetwork().getRotation() / Math.PI;
 
 			// Sync the animation. Slant belts are slower.
 			if (this.getSlant() == SlantType.NONE || this.getSlant() == SlantType.TOP)
 			{
-                this.animFrame = (int) (wheelRotPct * MAX_FRAME);
+				this.animationFrame = (int) (wheelRotPct * MAX_FRAME);
-                if (this.animFrame < 0)
+				if (this.animationFrame < 0)
-                    this.animFrame = 0;
+					this.animationFrame = 0;
-                if (this.animFrame > MAX_FRAME)
+				if (this.animationFrame > MAX_FRAME)
-                    this.animFrame = MAX_FRAME;
+					this.animationFrame = MAX_FRAME;
 			}
 			else
 			{
-                this.animFrame = (int) (wheelRotPct * MAX_SLANT_FRAME);
+				this.animationFrame = (int) (wheelRotPct * MAX_SLANT_FRAME);
-                if (this.animFrame < 0)
+				if (this.animationFrame < 0)
-                    this.animFrame = 0;
+					this.animationFrame = 0;
-                if (this.animFrame > MAX_SLANT_FRAME)
+				if (this.animationFrame > MAX_SLANT_FRAME)
-                    this.animFrame = MAX_SLANT_FRAME;
+					this.animationFrame = MAX_SLANT_FRAME;
+			}
+		}
+		else
+		{
+			if (markRefresh)
+			{
+				sendRefreshPacket();
 			}
 		}
 
@@ -102,11 +121,16 @@ public class TileConveyorBelt extends TileAdvanced implements IBelt, IRotatable,
 	{
 		if (this.slantType != SlantType.NONE)
 		{
-            return ResonantInduction.PACKET_TILE.getPacket(this, slantPacketID, true, this.slantType.ordinal());
+			return ResonantInduction.PACKET_TILE.getPacket(this, PACKET_SLANT, this.slantType.ordinal());
 		}
 		return super.getDescriptionPacket();
 	}
 
+	public void sendRefreshPacket()
+	{
+		PacketDispatcher.sendPacketToAllPlayers(ResonantInduction.PACKET_TILE.getPacket(this, PACKET_REFRESH));
+	}
+
 	@Override
 	public boolean onReceivePacket(int id, ByteArrayDataInput data, EntityPlayer player, Object... extra)
 	{
@@ -114,12 +138,16 @@ public class TileConveyorBelt extends TileAdvanced implements IBelt, IRotatable,
 		{
 			try
 			{
-                if (id == 0)
+				if (id == PACKET_SLANT)
 				{
-                    this.functioning = data.readBoolean();
 					this.slantType = SlantType.values()[data.readInt()];
 					return true;
 				}
+				else if (id == PACKET_REFRESH)
+				{
+					refresh();
+					return true;
+				}
 			}
 			catch (Exception e)
 			{
@@ -164,7 +192,7 @@ public class TileConveyorBelt extends TileAdvanced implements IBelt, IRotatable,
 
 	public int getAnimationFrame()
 	{
-        return this.animFrame;
+		return this.animationFrame;
 	}
 
 	/** NBT Data */
@@ -186,9 +214,9 @@ public class TileConveyorBelt extends TileAdvanced implements IBelt, IRotatable,
 	@Override
 	public void ignoreEntity(Entity entity)
 	{
-        if (!this.IgnoreList.contains(entity))
+		if (!this.ignoreList.contains(entity))
 		{
-            this.IgnoreList.add(entity);
+			this.ignoreList.add(entity);
 		}
 	}
 
@@ -200,57 +228,90 @@ public class TileConveyorBelt extends TileAdvanced implements IBelt, IRotatable,
 
 	public void refresh()
 	{
-        if (this.worldObj != null && !this.worldObj.isRemote)
+		boolean didRefresh = false;
+
+		for (int i = 2; i < 6; i++)
 		{
-            Vector3 face = new Vector3(this).modifyPositionFromSide(this.getDirection());
+			ForgeDirection dir = ForgeDirection.getOrientation(i);
-            Vector3 back = new Vector3(this).modifyPositionFromSide(this.getDirection().getOpposite());
+			Vector3 pos = new Vector3(this).modifyPositionFromSide(dir);
-            TileEntity front, rear;
+			TileEntity tile = pos.getTileEntity(this.worldObj);
-            if (this.slantType == SlantType.DOWN)
+
+			if (dir == this.getDirection() || dir == this.getDirection().getOpposite())
 			{
-                face.translate(new Vector3(0, -1, 0));
+				if (tile instanceof IBelt)
-                back.translate(new Vector3(0, 1, 0));
+				{
+					connections[dir.ordinal()] = tile;
+					this.getNetwork().merge(((IBelt) tile).getNetwork());
+					didRefresh = true;
 				}
-            else if (this.slantType == SlantType.UP)
-            {
-                face.translate(new Vector3(0, 1, 0));
-                back.translate(new Vector3(0, -1, 0));
 			}
-            else
+			else if (tile instanceof IMechanical)
 			{
-                return;
+				// TODO: Fix split connection in network.
+				// connections[dir.ordinal()] = tile;
 			}
-            front = face.getTileEntity(this.worldObj);
-            rear = back.getTileEntity(this.worldObj);
-            if (front instanceof IBelt)
-            {
-                this.getNetwork().merge(((IBelt) front).getNetwork());
-            }
-            if (rear instanceof IBelt)
-            {
-                this.getNetwork().merge(((IBelt) rear).getNetwork());
 		}
 
+		if (didRefresh)
+		{
+			if (!worldObj.isRemote)
+			{
+				markRefresh = true;
 			}
 		}
+	}
+
+	@Override
+	public void invalidate()
+	{
+		this.getNetwork().split(this);
+		super.invalidate();
+	}
+
+	public float getMoveVelocity()
+	{
+		return Math.max(this.getNetwork().getAngularVelocity(), this.getNetwork().getPrevAngularVelocity());
+	}
+
+	@Override
+	public long onReceiveEnergy(ForgeDirection from, long torque, float angularVelocity, boolean doReceive)
+	{
+		return this.getNetwork().onReceiveEnergy(torque, angularVelocity);
+	}
 
 	@Override
 	public Object[] getConnections()
 	{
-        // TODO Auto-generated method stub
+		return connections;
-        return null;
 	}
 
 	@Override
-    public IBeltNetwork getNetwork()
+	public IMechanicalNetwork getNetwork()
 	{
-        // TODO Auto-generated method stub
+		if (this.network == null)
-        return null;
+		{
+			this.network = new MechanicalNetwork();
+			this.network.addConnector(this);
+		}
+		return this.network;
 	}
 
 	@Override
-    public void setNetwork(IBeltNetwork network)
+	public void setNetwork(IMechanicalNetwork network)
 	{
-        // TODO Auto-generated method stub
+		this.network = network;
-
 	}
+
+	@Override
+	public boolean sendNetworkPacket(long torque, float angularVelocity)
+	{
+		return false;
+	}
+
+	@Override
+	public float getResistance()
+	{
+		return 0.5f;
+	}
+
 }

src/main/java/resonantinduction/mechanical/gear/PartGear.java

@@ -36,7 +36,7 @@ import cpw.mods.fml.relauncher.SideOnly;
  * @author Calclavia
  * 
  */
-public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart, IMechanical, IMechanicalConnector
+public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart, IMechanicalConnector
 {
 	public static Cuboid6[][] oBoxes = new Cuboid6[6][2];
 
@@ -54,6 +54,9 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart
 
 	private IMechanicalNetwork network;
 
+	/** The mechanical connections this connector has made */
+	protected Object[] connections = new Object[6];
+
 	/** Side of the block this is placed on */
 	public ForgeDirection placementSide;
 
@@ -68,9 +71,6 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart
 	/** When true, it will start marking nearby gears for update */
 	public boolean markRotationUpdate = true;
 
-	/** The mechanical connections this gear has made */
-	protected Object[] connections = new Object[6];
-
 	private int manualCrankTime = 0;
 
 	public void preparePlacement(int side, int itemDamage)
@@ -226,6 +226,10 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart
 		else if (tile instanceof IMechanical)
 		{
 			connections[this.placementSide.getOpposite().ordinal()] = tile;
+			if (tile instanceof IMechanicalConnector)
+			{
+				getNetwork().merge(((IMechanicalConnector) tile).getNetwork());
+			}
 		}
 
 		/** Look for gears outside this block space, the relative UP, DOWN, LEFT, RIGHT */
@@ -262,6 +266,11 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart
 		}
 
 		getNetwork().reconstruct();
+
+		if (!world().isRemote)
+		{
+			sendRefreshPacket();
+		}
 	}
 
 	@Override
@@ -290,7 +299,7 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart
 	@Override
 	public boolean activate(EntityPlayer player, MovingObjectPosition hit, ItemStack item)
 	{
-		System.out.println(world().isRemote + " : " + this.getNetwork().getAngularVelocity());
+		System.out.println(world().isRemote + ": " + getNetwork());
 		if (player.isSneaking())
 		{
 			this.manualCrankTime = 20;
@@ -303,7 +312,7 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart
 	{
 		if (!world().isRemote && doReceive)
 		{
-			getNetwork().applyEnergy(torque, angularVelocity);
+			getNetwork().onReceiveEnergy(torque, angularVelocity);
 			markRotationUpdate = true;
 		}
 
@@ -336,12 +345,22 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart
 	}
 
 	@Override
-	public void sendNetworkPacket(long torque, float angularVelocity)
+	public boolean sendNetworkPacket(long torque, float angularVelocity)
 	{
 		if (tile() != null)
 		{
 			tile().getWriteStream(this).writeByte(0).writeLong(torque).writeFloat(angularVelocity).writeBoolean(isClockwise);
 		}
+
+		return true;
+	}
+
+	public void sendRefreshPacket()
+	{
+		if (tile() != null)
+		{
+			tile().getWriteStream(this).writeByte(1);
+		}
 	}
 
 	public void read(MCDataInput packet, int packetID)
@@ -352,6 +371,10 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart
 			isClockwise = packet.readBoolean();
 			markRotationUpdate = true;
 		}
+		else if (packetID == 1)
+		{
+			this.refresh();
+		}
 	}
 
 	@Override

src/main/java/resonantinduction/mechanical/network/IMechanicalConnector.java

@@ -12,8 +12,10 @@ public interface IMechanicalConnector extends IMechanical, IConnector<IMechanica
 {
 	/**
 	 * Uses this connector to send a packet to the client.
+	 * 
+	 * @return True if the packet was successfully sent.
 	 */
-	public void sendNetworkPacket(long torque, float angularVelocity);
+	public boolean sendNetworkPacket(long torque, float angularVelocity);
 
 	/**
 	 * The percentage of resistance caused by this connector.

src/main/java/resonantinduction/mechanical/network/IMechanicalNetwork.java

@@ -16,6 +16,8 @@ public interface IMechanicalNetwork extends INetwork<IMechanicalNetwork, IMechan
 	 */
 	public long getPower();
 
+	public void setPower(long torque, float angularVelocity);
+
 	/** Torque applied by the network at the given speed */
 	public long getTorque();
 
@@ -33,7 +35,10 @@ public interface IMechanicalNetwork extends INetwork<IMechanicalNetwork, IMechan
 	/** Called to rebuild the network */
 	public void reconstruct();
 
-	public void applyEnergy(long torque, float angularVelocity);
+	public long onReceiveEnergy(long torque, float angularVelocity);
 
-	public void setPower(long readLong, float readFloat);
+	/**
+	 * @return The current rotation value of the network.
+	 */
+	public float getRotation();
 }

src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java

@@ -38,6 +38,10 @@ public class MechanicalNetwork extends Network<IMechanicalNetwork, IMechanicalCo
 	/** The cached resistance caused by all connectors */
 	private float connectorResistance = 0;
 
+	/** The current rotation of the network */
+	private float rotation = 0;
+	private long lastRotateTime;
+
 	/** The direction in which a conductor is placed relative to a specific conductor. */
 	protected final HashMap<Object, EnumSet<ForgeDirection>> handlerDirectionMap = new LinkedHashMap<Object, EnumSet<ForgeDirection>>();
 
@@ -79,10 +83,12 @@ public class MechanicalNetwork extends Network<IMechanicalNetwork, IMechanicalCo
 			 */
 			for (IMechanicalConnector connector : this.getConnectors())
 			{
-				connector.sendNetworkPacket(torque, angularVelocity);
+				if (connector.sendNetworkPacket(torque, angularVelocity))
+				{
 					break;
 				}
 			}
+		}
 
 		/**
 		 * Distribute energy to handlers
@@ -109,11 +115,12 @@ public class MechanicalNetwork extends Network<IMechanicalNetwork, IMechanicalCo
 	 * Note: Server side only.
 	 */
 	@Override
-	public void applyEnergy(long torque, float angularVelocity)
+	public long onReceiveEnergy(long torque, float angularVelocity)
 	{
-		this.torque += Math.abs(torque);
+		this.torque += torque;
-		this.angularVelocity += Math.abs(angularVelocity);
+		this.angularVelocity += angularVelocity;
 		NetworkTickHandler.addNetwork(this);
+		return (long) (torque * angularVelocity);
 	}
 
 	@Override
@@ -337,4 +344,24 @@ public class MechanicalNetwork extends Network<IMechanicalNetwork, IMechanicalCo
 		}
 	}
 
+	@Override
+	public float getRotation()
+	{
+		long deltaTime = System.currentTimeMillis() - lastRotateTime;
+
+		if (deltaTime > 1)
+		{
+			rotation = (float) (((angularVelocity) * ((float) deltaTime / 1000f) + rotation) % Math.PI);
+			lastRotateTime = System.currentTimeMillis();
+		}
+
+		return rotation;
+	}
+
+	@Override
+	public String toString()
+	{
+		return this.getClass().getSimpleName() + "[" + this.hashCode() + ", Handlers: " + getNodes().size() + ", Connectors: " + getConnectors().size() + ", Power:" + getPower() + "]";
+	}
+
 }

src/main/java/resonantinduction/mechanical/trait/TraitMechanical.java

@@ -1,10 +1,10 @@
-package resonantinduction.mechanical.gear;
+package resonantinduction.mechanical.trait;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.mechanical.network.IMechanical;
+import net.minecraftforge.common.ForgeDirection;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
 

src/main/java/resonantinduction/mechanical/trait/TraitMechanicalConnector.java

@@ -0,0 +1,116 @@
+package resonantinduction.mechanical.trait;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraftforge.common.ForgeDirection;
+import resonantinduction.mechanical.network.IMechanical;
+import resonantinduction.mechanical.network.IMechanicalConnector;
+import resonantinduction.mechanical.network.IMechanicalNetwork;
+import codechicken.multipart.TMultiPart;
+import codechicken.multipart.TileMultipart;
+
+public class TraitMechanicalConnector extends TileMultipart implements IMechanicalConnector
+{
+	public Set<IMechanicalConnector> mechanicalConnectorInterfaces = new HashSet<IMechanicalConnector>();
+
+	@Override
+	public void copyFrom(TileMultipart that)
+	{
+		super.copyFrom(that);
+
+		if (that instanceof TraitMechanicalConnector)
+		{
+			this.mechanicalConnectorInterfaces = ((TraitMechanicalConnector) that).mechanicalConnectorInterfaces;
+		}
+	}
+
+	@Override
+	public void bindPart(TMultiPart part)
+	{
+		super.bindPart(part);
+
+		if (part instanceof IMechanicalConnector)
+		{
+			this.mechanicalConnectorInterfaces.add((IMechanicalConnector) part);
+		}
+	}
+
+	@Override
+	public void partRemoved(TMultiPart part, int p)
+	{
+		super.partRemoved(part, p);
+
+		if (part instanceof IMechanicalConnector)
+		{
+			this.mechanicalConnectorInterfaces.remove(part);
+		}
+	}
+
+	@Override
+	public void clearParts()
+	{
+		super.clearParts();
+		this.mechanicalConnectorInterfaces.clear();
+	}
+
+	@Override
+	public boolean canConnect(ForgeDirection direction)
+	{
+		for (IMechanicalConnector connector : this.mechanicalConnectorInterfaces)
+		{
+			if (connector.canConnect(direction.getOpposite()))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public long onReceiveEnergy(ForgeDirection from, long torque, float angularVelocity, boolean doReceive)
+	{
+		TMultiPart part = this.partMap(from.ordinal());
+
+		if (part != null)
+		{
+			if (this.mechanicalConnectorInterfaces.contains(part))
+			{
+				return ((IMechanicalConnector) part).onReceiveEnergy(from, torque, angularVelocity, doReceive);
+			}
+		}
+
+		return 0;
+	}
+
+	@Override
+	public Object[] getConnections()
+	{
+		return null;
+	}
+
+	@Override
+	public IMechanicalNetwork getNetwork()
+	{
+		return null;
+	}
+
+	@Override
+	public void setNetwork(IMechanicalNetwork network)
+	{
+
+	}
+
+	@Override
+	public boolean sendNetworkPacket(long torque, float angularVelocity)
+	{
+		return false;
+	}
+
+	@Override
+	public float getResistance()
+	{
+		return 0;
+	}
+}