From f0b6799409ee914b3741e3e4cb65b47a66478290 Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Thu, 31 Oct 2013 14:46:14 -0400
Subject: [PATCH] Machines eject into transporters.

---
 common/mekanism/client/ThreadClientUpdate.java      | 10 ++++------
 common/mekanism/client/gui/GuiLogisticalSorter.java |  8 ++++----
 common/mekanism/client/sound/SoundHandler.java      |  2 +-
 common/mekanism/common/TileComponentEjector.java    | 10 +++++++++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/common/mekanism/client/ThreadClientUpdate.java b/common/mekanism/client/ThreadClientUpdate.java
index 859613dce..380ebe20a 100644
--- a/common/mekanism/client/ThreadClientUpdate.java
+++ b/common/mekanism/client/ThreadClientUpdate.java
@@ -63,16 +63,14 @@ public class ThreadClientUpdate extends Thread
 			
 			modulesBeingDownloaded--;
 			finalize();
-		} catch(Throwable e)
-		{
+		} catch(Throwable t) {
 			GuiCredits.onErrorDownloading();
-			System.err.println("[Mekanism] Error while finishing update thread: " + e.getMessage());
+			System.err.println("[Mekanism] Error while finishing update thread: " + t.getMessage());
+			
 			try {
 				modulesBeingDownloaded--;
 				finalize();
-			} catch (Throwable e1) {
-				System.err.println("[Mekanism] Error while finalizing update thread: " + e1.getMessage());
-			}
+			} catch (Throwable t1) {}
 		}
 	}
 	
diff --git a/common/mekanism/client/gui/GuiLogisticalSorter.java b/common/mekanism/client/gui/GuiLogisticalSorter.java
index c8dc4522e..6dbef5f11 100644
--- a/common/mekanism/client/gui/GuiLogisticalSorter.java
+++ b/common/mekanism/client/gui/GuiLogisticalSorter.java
@@ -238,7 +238,7 @@ public class GuiLogisticalSorter extends GuiMekanism
 	
 	@Override
 	protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
-    {	
+    {
 		int xAxis = (mouseX - (width - xSize) / 2);
 		int yAxis = (mouseY - (height - ySize) / 2);
 		
@@ -281,9 +281,6 @@ public class GuiLogisticalSorter extends GuiMekanism
 				{
 					OreDictFilter oreFilter = (OreDictFilter)filter;
 					
-					fontRenderer.drawString("OreDict Filter", 78, yStart + 2, 0x404040);
-					fontRenderer.drawString(filter.color != null ? filter.color.getName() : "None", 78, yStart + 11, 0x404040);
-					
 					if(!oreDictStacks.containsKey(oreFilter))
 					{
 						updateStackList(oreFilter);
@@ -297,6 +294,9 @@ public class GuiLogisticalSorter extends GuiMekanism
 						GL11.glDisable(GL11.GL_LIGHTING);
 						GL11.glPopMatrix();
 					}
+					
+					fontRenderer.drawString("OreDict Filter", 78, yStart + 2, 0x404040);
+					fontRenderer.drawString(filter.color != null ? filter.color.getName() : "None", 78, yStart + 11, 0x404040);
 				}
 			}
 		}
diff --git a/common/mekanism/client/sound/SoundHandler.java b/common/mekanism/client/sound/SoundHandler.java
index 8801cec7f..7f435387a 100644
--- a/common/mekanism/client/sound/SoundHandler.java
+++ b/common/mekanism/client/sound/SoundHandler.java
@@ -61,7 +61,7 @@ public class SoundHandler
 		}
 	}
 	
-	public void preloadSound(String sound)
+	private void preloadSound(String sound)
 	{
 		String id = "pre_" + sound;
 		URL url = getClass().getClassLoader().getResource("assets/mekanism/sound/" + sound);
diff --git a/common/mekanism/common/TileComponentEjector.java b/common/mekanism/common/TileComponentEjector.java
index 38c6695b5..96ad29b18 100644
--- a/common/mekanism/common/TileComponentEjector.java
+++ b/common/mekanism/common/TileComponentEjector.java
@@ -8,6 +8,7 @@ import mekanism.api.IEjector;
 import mekanism.api.Object3D;
 import mekanism.api.SideData;
 import mekanism.common.tileentity.TileEntityContainerBlock;
+import mekanism.common.tileentity.TileEntityLogisticalTransporter;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.TransporterUtils;
 import net.minecraft.inventory.IInventory;
@@ -92,10 +93,17 @@ public class TileComponentEjector implements ITileComponent, IEjector
 				TileEntity tile = Object3D.get(tileEntity).getFromSide(side).getTileEntity(tileEntity.worldObj);
 				ItemStack prev = stack.copy();
 				
-				if(tile instanceof IInventory)
+				if(tile instanceof IInventory && !(tile instanceof TileEntityLogisticalTransporter))
 				{
 					stack = TransporterUtils.putStackInInventory((IInventory)tile, stack, side.ordinal());
 				}
+				else if(tile instanceof TileEntityLogisticalTransporter)
+				{
+					if(TransporterUtils.insert(tileEntity, (TileEntityLogisticalTransporter)tile, stack, null))
+					{
+						stack = null;
+					}
+				}
 				
 				if(stack == null || prev.stackSize != stack.stackSize)
 				{