From afc996fae5729057b0eaa30c9ff6934319326b5d Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Thu, 27 Mar 2014 21:17:14 +0800
Subject: [PATCH] Fixed #462, 463 - Shaft connection logic

---
 .../mechanical/energy/gear/PartGear.java      |  2 +-
 .../mechanical/energy/gear/PartGearShaft.java | 56 ++++++++++---------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGear.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGear.java
index c846e165..55c84012 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGear.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGear.java
@@ -192,7 +192,7 @@ public class PartGear extends PartMechanical implements IMultiBlockStructure<Par
 			 * Can this gear be connected BY the source?
 			 * 
 			 * @param from - Direction source is coming from.
-			 * @param source - The source of the connection.
+			 * @param with - The source of the connection.
 			 * @return True is so.
 			 */
 			@Override
diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java
index e4c2f4c3..58b1e142 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/gear/PartGearShaft.java
@@ -1,15 +1,5 @@
 package resonantinduction.mechanical.energy.gear;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.mechanical.Mechanical;
-import resonantinduction.mechanical.energy.grid.MechanicalNode;
-import resonantinduction.mechanical.energy.grid.PartMechanical;
 import calclavia.api.resonantinduction.IMechanicalNode;
 import calclavia.lib.grid.INodeProvider;
 import codechicken.lib.raytracer.IndexedCuboid6;
@@ -18,12 +8,21 @@ import codechicken.lib.vec.Vector3;
 import codechicken.multipart.PartMap;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.ForgeDirection;
+import resonantinduction.mechanical.Mechanical;
+import resonantinduction.mechanical.energy.grid.MechanicalNode;
+import resonantinduction.mechanical.energy.grid.PartMechanical;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * We assume all the force acting on the gear is 90 degrees.
- * 
+ *
  * @author Calclavia
- * 
  */
 public class PartGearShaft extends PartMechanical
 {
@@ -40,15 +39,6 @@ public class PartGearShaft extends PartMechanical
 		sides[6] = new IndexedCuboid6(6, new Cuboid6(0.36, 0.36, 0.36, 0.64, 0.64, 0.64));
 	}
 
-	@Override
-	public void preparePlacement(int side, int itemDamage)
-	{
-		ForgeDirection dir = ForgeDirection.getOrientation((byte) (side ^ 1));
-		// Unwind rotation. We can only have "3" axis.
-		this.placementSide = ForgeDirection.getOrientation(!(dir.ordinal() % 2 == 0) ? dir.ordinal() - 1 : dir.ordinal());
-		tier = itemDamage;
-	}
-
 	public PartGearShaft()
 	{
 		super();
@@ -132,12 +122,17 @@ public class PartGearShaft extends PartMechanical
 			@Override
 			public boolean canConnect(ForgeDirection from, Object source)
 			{
-				if (source instanceof PartGear)
+				if (source instanceof MechanicalNode)
 				{
-					PartGear gear = (PartGear) source;
+					if (((MechanicalNode) source).parent instanceof PartGear)
+					{
+						PartGear gear = (PartGear) ((MechanicalNode) source).parent;
 
-					if (!(Math.abs(gear.placementSide.offsetX) == Math.abs(placementSide.offsetX) && Math.abs(gear.placementSide.offsetY) == Math.abs(placementSide.offsetY) && Math.abs(gear.placementSide.offsetZ) == Math.abs(placementSide.offsetZ)))
-						return false;
+						if (!(Math.abs(gear.placementSide.offsetX) == Math.abs(placementSide.offsetX) && Math.abs(gear.placementSide.offsetY) == Math.abs(placementSide.offsetY) && Math.abs(gear.placementSide.offsetZ) == Math.abs(placementSide.offsetZ)))
+						{
+							return false;
+						}
+					}
 				}
 
 				return from == placementSide || from == placementSide.getOpposite();
@@ -156,6 +151,15 @@ public class PartGearShaft extends PartMechanical
 		};
 	}
 
+	@Override
+	public void preparePlacement(int side, int itemDamage)
+	{
+		ForgeDirection dir = ForgeDirection.getOrientation((byte) (side ^ 1));
+		// Unwind rotation. We can only have "3" axis.
+		this.placementSide = ForgeDirection.getOrientation(!(dir.ordinal() % 2 == 0) ? dir.ordinal() - 1 : dir.ordinal());
+		tier = itemDamage;
+	}
+
 	@Override
 	protected ItemStack getItem()
 	{
@@ -213,7 +217,9 @@ public class PartGearShaft extends PartMechanical
 			for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
 			{
 				if (side == placementSide || side == placementSide.getOpposite())
+				{
 					subParts.add(currentSides[side.ordinal()]);
+				}
 			}
 		}