From 0e51852baafb91ba8aece221a8292d1772b3c9b2 Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Tue, 24 Mar 2015 18:33:13 -0400
Subject: [PATCH] Cleanup, fixed a transporter bug

---
 .../common/content/transporter/TransporterPathfinder.java      | 2 +-
 .../mekanism/common/content/transporter/TransporterStack.java  | 3 +--
 .../mekanism/common/multipart/PartLogisticalTransporter.java   | 2 +-
 .../java/mekanism/common/tile/TileEntityAdvancedFactory.java   | 1 -
 .../java/mekanism/common/tile/TileEntityChanceMachine.java     | 2 ++
 src/main/java/mekanism/common/tile/TileEntityEliteFactory.java | 1 -
 src/main/java/mekanism/common/tile/TileEntityFactory.java      | 1 -
 7 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
index 925640816..816958505 100644
--- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
+++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
@@ -204,7 +204,7 @@ public final class TransporterPathfinder
 	}
 
 	public static List<Destination> getPaths(ILogisticalTransporter start, TransporterStack stack, int min)
-	{		
+	{
 		InventoryNetwork network = start.getTransmitterNetwork();
 		List<AcceptorData> acceptors = network.calculateAcceptors(stack.itemStack, stack.color);
 		List<Destination> paths = new ArrayList<Destination>();
diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java
index 2171d9896..61c25b0dc 100644
--- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java
+++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java
@@ -286,10 +286,9 @@ public class TransporterStack
 			return false;
 		}
 
-		TileEntity from = Coord4D.get(tileEntity).getFromSide(side.getOpposite()).getTileEntity(tileEntity.getWorldObj());
 		ILogisticalTransporter transporter = (ILogisticalTransporter)tileEntity;
 
-		if(!transporter.canConnectMutual(side.getOpposite()))
+		if(!transporter.canConnectMutual(side))
 		{
 			return false;
 		}
diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
index f622cc959..6c58ee319 100644
--- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
+++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
@@ -407,7 +407,7 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
 		stack.originalLocation = original;
 		stack.homeLocation = original;
 		stack.color = color;
-
+		
 		if((force && !canReceiveFrom(original.getTileEntity(world()), from)) || !stack.canInsertToTransporter(tile(), from))
 		{
 			return itemStack;
diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java
index 8e4736730..ed49980fc 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java
@@ -25,7 +25,6 @@ public class TileEntityAdvancedFactory extends TileEntityFactory
 		configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {10, 11, 12, 13, 14}));
 		configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0});
 		
-		configComponent.addSupported(TransmissionType.GAS);
 		configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY));
 		configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0}));
 		configComponent.fillConfig(TransmissionType.GAS, 1);
diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java
index 79cfea0ae..f15dc9daf 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java
@@ -147,10 +147,12 @@ public abstract class TileEntityChanceMachine<RECIPE extends ChanceMachineRecipe
 	public RECIPE getRecipe()
 	{
 		ItemStackInput input = getInput();
+		
 		if(cachedRecipe == null || !input.testEquality(cachedRecipe.getInput()))
 		{
 			cachedRecipe = RecipeHandler.getChanceRecipe(input, getRecipes());
 		}
+		
 		return cachedRecipe;
 	}
 
diff --git a/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java b/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java
index 88a0023fe..0031b8f21 100644
--- a/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java
@@ -25,7 +25,6 @@ public class TileEntityEliteFactory extends TileEntityFactory
 		configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {12, 13, 14, 15, 16, 17, 18}));
 		configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0});
 		
-		configComponent.addSupported(TransmissionType.GAS);
 		configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY));
 		configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0}));
 		configComponent.fillConfig(TransmissionType.GAS, 1);
diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java
index af08db9ed..622bd49a2 100644
--- a/src/main/java/mekanism/common/tile/TileEntityFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java
@@ -132,7 +132,6 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
 		configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {8, 9, 10}));
 		configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0});
 		
-		configComponent.addSupported(TransmissionType.GAS);
 		configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY));
 		configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0}));
 		configComponent.fillConfig(TransmissionType.GAS, 1);