From 97064eab7297327018ced787aa614991235fd5b8 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Fri, 21 Feb 2014 20:32:58 +0800
Subject: [PATCH] Fixed pipes not connecting

---
 .../mechanical/MultipartMechanical.java               |  2 +-
 .../mechanical/fluid/pipe/PartPipe.java               | 11 ++++++++++-
 .../core/prefab/fluid/PipeNetwork.java                |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mechanical/src/main/java/resonantinduction/mechanical/MultipartMechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/MultipartMechanical.java
index 5ebf00eb..9b133357 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/MultipartMechanical.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/MultipartMechanical.java
@@ -17,7 +17,7 @@ public class MultipartMechanical implements IPartFactory
 	public MultipartMechanical()
 	{
 		MultiPartRegistry.registerParts(this, PART_TYPES);
-		MultipartGenerator.registerPassThroughInterface("resonantinduction.api.fluid.IFluidPipe");
+		MultipartGenerator.registerPassThroughInterface("resonantinduction.api.mechanical.fluid.IFluidPipe");
 		MultipartGenerator.registerTrait("resonantinduction.api.mechanical.IMechanical", "resonantinduction.mechanical.trait.TraitMechanical");
 	}
 
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 48f44f78..120c1a25 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
@@ -19,6 +19,7 @@ import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.prefab.fluid.PipeNetwork;
 import resonantinduction.core.prefab.part.PartFramedConnection;
 import resonantinduction.mechanical.Mechanical;
+import universalelectricity.api.energy.IConductor;
 import calclavia.lib.utility.WrenchUtility;
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.IconTransformation;
@@ -56,10 +57,13 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 	@Override
 	public void update()
 	{
+		super.update();
+
 		if (!world().isRemote)
 		{
 			if (isExtracting && getNetwork().getTank().getFluidAmount() < getNetwork().getTank().getCapacity())
 			{
+
 				for (int i = 0; i < this.getConnections().length; i++)
 				{
 					Object obj = this.getConnections()[i];
@@ -77,6 +81,8 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 	@Override
 	public boolean activate(EntityPlayer player, MovingObjectPosition part, ItemStack item)
 	{
+		if (!world().isRemote)
+			System.out.println(getNetwork());
 		if (WrenchUtility.isUsableWrench(player, player.getCurrentEquippedItem(), x(), y(), z()))
 		{
 			if (!world().isRemote)
@@ -182,7 +188,10 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 	@Override
 	protected IFluidPipe getConnector(TileEntity tile)
 	{
-		return tile instanceof IFluidPipe ? (IFluidPipe) tile : null;
+		if (tile instanceof IFluidPipe)
+			return (IFluidPipe) ((IFluidPipe) tile).getInstance(ForgeDirection.UNKNOWN);
+
+		return null;
 	}
 
 	@Override
diff --git a/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java b/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java
index 3e99117f..7836aabc 100644
--- a/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java
+++ b/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java
@@ -58,7 +58,7 @@ public class PipeNetwork extends FluidNetwork
 				{
 					stack.amount -= handler.fill(dir, FluidUtility.getStack(stack, Math.min(volPerSide, this.maxFlowRate)), true);
 				}
-
+				
 				if (sideCount > 1)
 					--sideCount;
 				if (volPer <= 0)