From de5cc8c76deebadd8cb6d35ebb1aa7176c714b71 Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Sun, 16 Nov 2014 11:45:05 -0500
Subject: [PATCH] Merge fix changes

---
 .../multipart/PartLogisticalTransporter.java  | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
index e84eac2f4..eb1657b9d 100644
--- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
+++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
@@ -649,31 +649,6 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
 		}
 	}
 
-	@Override
-	public PipeType getPipeType()
-	{
-		return PipeType.ITEM;
-	}
-
-	@Override
-	public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, buildcraft.api.core.EnumColor color) {
-		return 0;
-	}
-
-	@Override
-	public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from)
-	{
-		if(doAdd)
-		{
-			TileEntity tile = Coord4D.get(tile()).getFromSide(from).getTileEntity(world());
-
-			ItemStack rejects = TransporterUtils.insert(tile, this, stack, null, true, 0);
-			return TransporterManager.getToUse(stack, rejects).stackSize;
-		}
-
-		return 0;
-	}
-
 	@Override
 	protected boolean onConfigure(EntityPlayer player, int part, int side)
 	{
@@ -754,6 +729,34 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
 	{
 		return 1;
 	}
+	
+	@Override
+	@Method(modid = "BuildCraftAPI|transport")
+	public PipeType getPipeType()
+	{
+		return PipeType.ITEM;
+	}
+
+	@Override
+	@Method(modid = "BuildCraftAPI|transport")
+	public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, buildcraft.api.core.EnumColor color) {
+		return 0;
+	}
+
+	@Override
+	@Method(modid = "BuildCraftAPI|transport")
+	public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from)
+	{
+		if(doAdd)
+		{
+			TileEntity tile = Coord4D.get(tile()).getFromSide(from).getTileEntity(world());
+
+			ItemStack rejects = TransporterUtils.insert(tile, this, stack, null, true, 0);
+			return TransporterManager.getToUse(stack, rejects).stackSize;
+		}
+
+		return 0;
+	}
 
 	@Override
 	@Method(modid = "BuildCraftAPI|transport")
@@ -764,13 +767,15 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
 
 	@Override
 	@Method(modid = "BuildCraftAPI|transport")
-	public TileEntity getAdjacentTile(ForgeDirection dir) {
+	public TileEntity getAdjacentTile(ForgeDirection dir) 
+	{
 		return Coord4D.get(tile()).getFromSide(dir).getTileEntity(world());
 	}
 
 	@Override
 	@Method(modid = "BuildCraftAPI|transport")
-	public IPipe getPipe() {
+	public IPipe getPipe() 
+	{
 		return pipe;
 	}
 
@@ -813,6 +818,7 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
 		}
 
 		@Override
+		@Method(modid = "BuildCraftAPI|transport")
 		public boolean hasGate(ForgeDirection side) 
 		{
 			return false;