From 9496f7dfa3b3073d190480e57d68636145cb3d98 Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Tue, 29 Oct 2013 18:13:30 -0400
Subject: [PATCH] Rewrote pathfinder, added in Restrictive Transporters, added
 option to have null color in filters, added default outputting filter for
 sorter whoo!

---
 .../client/gui/GuiItemStackFilter.java        |  33 +-
 .../client/gui/GuiLogisticalSorter.java       |  89 ++++--
 .../mekanism/client/gui/GuiOreDictFilter.java |  35 +-
 .../block/TransmitterRenderingHandler.java    |   5 +-
 .../RenderLogisticalTransporter.java          |  13 +-
 .../common/block/BlockTransmitter.java        |   6 +-
 .../common/item/ItemBlockTransmitter.java     |  12 +
 .../TileEntityLogisticalSorter.java           |  73 ++++-
 .../common/transporter/OreDictFilter.java     |   2 +-
 .../common/transporter/TransporterFilter.java |  29 +-
 .../transporter/TransporterPathfinder.java    | 301 ++++++------------
 .../common/transporter/TransporterStack.java  |  10 +-
 .../mekanism/common/util/MekanismUtils.java   |  76 ++---
 .../common/util/TransporterUtils.java         |   7 +-
 .../mekanism/gui/GuiHydrogenGenerator.png     | Bin 4117 -> 3730 bytes
 .../mekanism/gui/GuiLogisticalSorter.png      | Bin 3652 -> 3722 bytes
 resources/assets/mekanism/lang/en_US.lang     |   1 +
 .../render/RestrictiveTransporter.png         | Bin 0 -> 9783 bytes
 18 files changed, 379 insertions(+), 313 deletions(-)
 create mode 100644 resources/assets/mekanism/render/RestrictiveTransporter.png

diff --git a/common/mekanism/client/gui/GuiItemStackFilter.java b/common/mekanism/client/gui/GuiItemStackFilter.java
index 2ba6f8856..6041e7804 100644
--- a/common/mekanism/client/gui/GuiItemStackFilter.java
+++ b/common/mekanism/client/gui/GuiItemStackFilter.java
@@ -51,8 +51,6 @@ public class GuiItemStackFilter extends GuiMekanism
 		tileEntity = tentity;
 		
 		isNew = true;
-		
-		filter.color = TransporterUtils.colors.get(0);
 	}
 	
 	@Override
@@ -128,20 +126,29 @@ public class GuiItemStackFilter extends GuiMekanism
 			GL11.glPopMatrix();
 		}
 		
-		GL11.glPushMatrix();
-		GL11.glColor4f(1, 1, 1, 1);
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-        
-        mc.getTextureManager().bindTexture(MekanismRenderer.getColorResource(filter.color));
-		itemRenderer.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16);
-		
-		GL11.glDisable(GL11.GL_LIGHTING);
-		GL11.glPopMatrix();
+		if(filter.color != null)
+		{
+			GL11.glPushMatrix();
+			GL11.glColor4f(1, 1, 1, 1);
+	        GL11.glEnable(GL11.GL_LIGHTING);
+	        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+	        
+	        mc.getTextureManager().bindTexture(MekanismRenderer.getColorResource(filter.color));
+			itemRenderer.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16);
+			
+			GL11.glDisable(GL11.GL_LIGHTING);
+			GL11.glPopMatrix();
+		}
 		
 		if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60)
 		{
-			drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis);
+			if(filter.color != null)
+			{
+				drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis);
+			}
+			else {
+				drawCreativeTabHoveringText("None", xAxis, yAxis);
+			}
 		}
 		
 		super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/common/mekanism/client/gui/GuiLogisticalSorter.java b/common/mekanism/client/gui/GuiLogisticalSorter.java
index 3c5142df5..5e5bfd20c 100644
--- a/common/mekanism/client/gui/GuiLogisticalSorter.java
+++ b/common/mekanism/client/gui/GuiLogisticalSorter.java
@@ -3,21 +3,25 @@ package mekanism.client.gui;
 import java.util.ArrayList;
 
 import mekanism.api.Object3D;
+import mekanism.client.render.MekanismRenderer;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerNull;
 import mekanism.common.network.PacketLogisticalSorterGui;
 import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket;
+import mekanism.common.network.PacketTileEntity;
 import mekanism.common.tileentity.TileEntityLogisticalSorter;
 import mekanism.common.transporter.ItemStackFilter;
 import mekanism.common.transporter.OreDictFilter;
 import mekanism.common.transporter.TransporterFilter;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
+import mekanism.common.util.TransporterUtils;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.EntityPlayer;
 
 import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -60,35 +64,48 @@ public class GuiLogisticalSorter extends GuiMekanism
 	{
 		super.mouseClicked(mouseX, mouseY, button);
 		
-		int xAxis = (mouseX - (width - xSize) / 2);
-		int yAxis = (mouseY - (height - ySize) / 2);
-		
-		if(xAxis >= 154 && xAxis <= 166 && yAxis >= getScroll()+18 && yAxis <= getScroll()+18+15)
+		if(button == 0)
 		{
-			dragOffset = yAxis - (getScroll()+18);
-			isDragging = true;
-		}
-		
-		for(int i = 0; i < 4; i++)
-		{
-			if(tileEntity.filters.get(getFilterIndex()+i) != null)
+			int xAxis = (mouseX - (width - xSize) / 2);
+			int yAxis = (mouseY - (height - ySize) / 2);
+			
+			if(xAxis >= 154 && xAxis <= 166 && yAxis >= getScroll()+18 && yAxis <= getScroll()+18+15)
 			{
-				int yStart = i*29 + 18;
-				
-				if(xAxis >= 56 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+29)
+				dragOffset = yAxis - (getScroll()+18);
+				isDragging = true;
+			}
+			
+			for(int i = 0; i < 4; i++)
+			{
+				if(tileEntity.filters.get(getFilterIndex()+i) != null)
 				{
-					TransporterFilter filter = tileEntity.filters.get(getFilterIndex()+i);
+					int yStart = i*29 + 18;
 					
-					if(filter instanceof ItemStackFilter)
+					if(xAxis >= 56 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+29)
 					{
-						PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER_INDEX, Object3D.get(tileEntity), 1, getFilterIndex()+i));
-					}
-					else if(filter instanceof OreDictFilter)
-					{
-						PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER_INDEX, Object3D.get(tileEntity), 2, getFilterIndex()+i));
+						TransporterFilter filter = tileEntity.filters.get(getFilterIndex()+i);
+						
+						if(filter instanceof ItemStackFilter)
+						{
+							mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
+							PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER_INDEX, Object3D.get(tileEntity), 1, getFilterIndex()+i));
+						}
+						else if(filter instanceof OreDictFilter)
+						{
+							mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
+							PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER_INDEX, Object3D.get(tileEntity), 2, getFilterIndex()+i));
+						}
 					}
 				}
 			}
+			
+			if(xAxis >= 13 && xAxis <= 29 && yAxis >= 137 && yAxis <= 153)
+			{
+				ArrayList data = new ArrayList();
+				data.add(0);
+				
+				PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data));
+			}
 		}
 	}
 	
@@ -153,11 +170,14 @@ public class GuiLogisticalSorter extends GuiMekanism
 		int yAxis = (mouseY - (height - ySize) / 2);
 		
 		fontRenderer.drawString("Logistical Sorter", 43, 6, 0x404040);
+		
 		fontRenderer.drawString("Filters:", 11, 19, 0x00CD00);
 		fontRenderer.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00);
 		fontRenderer.drawString("IS: " + getItemStackFilters().size(), 11, 37, 0x00CD00);
 		fontRenderer.drawString("OD: " + getOreDictFilters().size(), 11, 46, 0x00CD00);
 		
+		fontRenderer.drawString("Default:", 12, 126, 0x00CD00);
+		
 		for(int i = 0; i < 4; i++)
 		{
 			if(tileEntity.filters.get(getFilterIndex()+i) != null)
@@ -168,7 +188,7 @@ public class GuiLogisticalSorter extends GuiMekanism
 				if(filter instanceof ItemStackFilter)
 				{
 					fontRenderer.drawString("ItemStack Filter", 58, yStart + 2, 0x404040);
-					fontRenderer.drawString("Color: " + filter.color.getName(), 58, yStart + 11, 0x404040);
+					fontRenderer.drawString("Color: " + filter.color != null ? filter.color.getName() : "None", 58, yStart + 11, 0x404040);
 				}
 				else if(filter instanceof OreDictFilter)
 				{
@@ -178,6 +198,31 @@ public class GuiLogisticalSorter extends GuiMekanism
 			}
 		}
 		
+		if(tileEntity.color != null)
+		{
+			GL11.glPushMatrix();
+			GL11.glColor4f(1, 1, 1, 1);
+	        GL11.glEnable(GL11.GL_LIGHTING);
+	        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+	        
+	        mc.getTextureManager().bindTexture(MekanismRenderer.getColorResource(tileEntity.color));
+			itemRenderer.renderIcon(13, 137, MekanismRenderer.getColorIcon(tileEntity.color), 16, 16);
+			
+			GL11.glDisable(GL11.GL_LIGHTING);
+			GL11.glPopMatrix();
+		}
+		
+		if(xAxis >= 13 && xAxis <= 29 && yAxis >= 137 && yAxis <= 153)
+		{
+			if(tileEntity.color != null)
+			{
+				drawCreativeTabHoveringText(tileEntity.color.getName(), xAxis, yAxis);
+			}
+			else {
+				drawCreativeTabHoveringText("None", xAxis, yAxis);
+			}
+		}
+		
 		super.drawGuiContainerForegroundLayer(mouseX, mouseY);
     }
 
diff --git a/common/mekanism/client/gui/GuiOreDictFilter.java b/common/mekanism/client/gui/GuiOreDictFilter.java
index 2d967ffcd..f52a49cb9 100644
--- a/common/mekanism/client/gui/GuiOreDictFilter.java
+++ b/common/mekanism/client/gui/GuiOreDictFilter.java
@@ -71,8 +71,6 @@ public class GuiOreDictFilter extends GuiMekanism
 		tileEntity = tentity;
 		
 		isNew = true;
-		
-		filter.color = TransporterUtils.colors.get(0);
 	}
 	
 	@Override
@@ -172,20 +170,29 @@ public class GuiOreDictFilter extends GuiMekanism
 			GL11.glPopMatrix();
 		}
 		
-		GL11.glPushMatrix();
-		GL11.glColor4f(1, 1, 1, 1);
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-        
-        mc.getTextureManager().bindTexture(MekanismRenderer.getColorResource(filter.color));
-		itemRenderer.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16);
-		
-		GL11.glDisable(GL11.GL_LIGHTING);
-		GL11.glPopMatrix();
+		if(filter.color != null)
+		{
+			GL11.glPushMatrix();
+			GL11.glColor4f(1, 1, 1, 1);
+	        GL11.glEnable(GL11.GL_LIGHTING);
+	        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+	        
+	        mc.getTextureManager().bindTexture(MekanismRenderer.getColorResource(filter.color));
+			itemRenderer.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16);
+			
+			GL11.glDisable(GL11.GL_LIGHTING);
+			GL11.glPopMatrix();
+		}
 		
 		if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60)
 		{
-			drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis);
+			if(filter.color != null)
+			{
+				drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis);
+			}
+			else {
+				drawCreativeTabHoveringText("None", xAxis, yAxis);
+			}
 		}
 		
 		super.drawGuiContainerForegroundLayer(mouseX, mouseY);
@@ -310,7 +317,7 @@ public class GuiOreDictFilter extends GuiMekanism
     	
     	for(String s : OreDictionary.getOreNames())
     	{
-    		if(oreName.equals(s))
+    		if(oreName.equals(s) || oreName.equals("*"))
     		{
     			keys.add(s);
     		}
diff --git a/common/mekanism/client/render/block/TransmitterRenderingHandler.java b/common/mekanism/client/render/block/TransmitterRenderingHandler.java
index 2e539c3f0..5328e2142 100644
--- a/common/mekanism/client/render/block/TransmitterRenderingHandler.java
+++ b/common/mekanism/client/render/block/TransmitterRenderingHandler.java
@@ -45,9 +45,12 @@ public class TransmitterRenderingHandler implements ISimpleBlockRenderingHandler
     		case 3:
     			Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalTransporter.png"));
     			break;
+    		case 4:
+    			Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RestrictiveTransporter.png"));
+    			break;
     	}
     	
-    	if(metadata != 3)
+    	if(metadata != 3 && metadata != 4)
     	{
 	    	smallTransmitter.renderSide(ForgeDirection.UP, true);
 	    	smallTransmitter.renderSide(ForgeDirection.DOWN, true);
diff --git a/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java b/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java
index f2a9fb9e1..6b386eec3 100644
--- a/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java
+++ b/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java
@@ -1,5 +1,6 @@
 package mekanism.client.render.tileentity;
 
+import mekanism.api.Object3D;
 import mekanism.client.model.ModelTransmitter;
 import mekanism.client.model.ModelTransmitter.Size;
 import mekanism.client.model.ModelTransporterBox;
@@ -38,7 +39,17 @@ public class RenderLogisticalTransporter extends TileEntitySpecialRenderer
 
 	public void renderAModelAt(TileEntityLogisticalTransporter tileEntity, double x, double y, double z, float partialTick)
 	{
-		bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalTransporter.png"));
+		int meta = Object3D.get(tileEntity).getMetadata(tileEntity.worldObj);
+		
+		if(meta == 3)
+		{
+			bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalTransporter.png"));
+		}
+		else if(meta == 4)
+		{
+			bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RestrictiveTransporter.png"));
+		}
+		
 		GL11.glPushMatrix();
 		GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F);
 		GL11.glScalef(1.0F, -1F, -1F);
diff --git a/common/mekanism/common/block/BlockTransmitter.java b/common/mekanism/common/block/BlockTransmitter.java
index a965161bf..78067c719 100644
--- a/common/mekanism/common/block/BlockTransmitter.java
+++ b/common/mekanism/common/block/BlockTransmitter.java
@@ -44,6 +44,7 @@ import cpw.mods.fml.relauncher.SideOnly;
  * 1: Universal Cable
  * 2: Mechanical Pipe
  * 3: Logistical Transporter
+ * 4: Restrictive Transporter
  * @author AidanBrady
  *
  */
@@ -101,6 +102,7 @@ public class BlockTransmitter extends Block
 		list.add(new ItemStack(i, 1, 1));
 		list.add(new ItemStack(i, 1, 2));
 		list.add(new ItemStack(i, 1, 3));
+		list.add(new ItemStack(i, 1, 4));
 	}
 	
 	@Override
@@ -241,7 +243,7 @@ public class BlockTransmitter extends Block
 			{
 				connectable = PipeUtils.getConnections(tileEntity);
 			}
-			else if(world.getBlockMetadata(x, y, z) == 3)
+			else if(world.getBlockMetadata(x, y, z) == 3 || world.getBlockMetadata(x, y, z) == 4)
 			{
 				connectable = TransporterUtils.getConnections((TileEntityLogisticalTransporter)tileEntity);
 			}
@@ -371,6 +373,8 @@ public class BlockTransmitter extends Block
 				return new TileEntityMechanicalPipe();
 			case 3:
 				return new TileEntityLogisticalTransporter();
+			case 4:
+				return new TileEntityLogisticalTransporter();
 			default:
 				return null;
 		}
diff --git a/common/mekanism/common/item/ItemBlockTransmitter.java b/common/mekanism/common/item/ItemBlockTransmitter.java
index 9b6acc2b0..0a86070e1 100644
--- a/common/mekanism/common/item/ItemBlockTransmitter.java
+++ b/common/mekanism/common/item/ItemBlockTransmitter.java
@@ -67,6 +67,13 @@ public class ItemBlockTransmitter extends ItemBlock
 				list.add("- " + EnumColor.PURPLE + "Items (universal)");
 				list.add("- " + EnumColor.PURPLE + "Blocks (universal)");
 			}
+			else if(itemstack.getItemDamage() == 4)
+			{
+				list.add(EnumColor.DARK_GREY + "Capable of transferring:");
+				list.add("- " + EnumColor.PURPLE + "Items (universal)");
+				list.add("- " + EnumColor.PURPLE + "Blocks (universal)");
+				list.add("- " + EnumColor.DARK_RED + "Only used if no other paths available");
+			}
 		}
 	}
 	
@@ -86,6 +93,7 @@ public class ItemBlockTransmitter extends ItemBlock
 	public String getUnlocalizedName(ItemStack itemstack)
 	{
 		String name = "";
+		
 		switch(itemstack.getItemDamage())
 		{
 			case 0:
@@ -100,10 +108,14 @@ public class ItemBlockTransmitter extends ItemBlock
 			case 3:
 				name = "LogisticalTransporter";
 				break;
+			case 4:
+				name = "RestrictiveTransporter";
+				break;
 			default:
 				name = "Unknown";
 				break;
 		}
+		
 		return getUnlocalizedName() + "." + name;
 	}
 }
\ No newline at end of file
diff --git a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java b/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java
index 87a377ce7..51b68ac27 100644
--- a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java
+++ b/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java
@@ -31,6 +31,8 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 	
 	public RedstoneControl controlType = RedstoneControl.DISABLED;
 	
+	public EnumColor color;
+	
 	public final int MAX_DELAY = 10;
 	
 	public int delayTicks;
@@ -74,18 +76,18 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 					
 					if(inInventory != null && inInventory.itemStack != null)
 					{
-						EnumColor color = null;
+						EnumColor filterColor = color;
 						
 						for(TransporterFilter filter : filters)
 						{
 							if(filter.canFilter(inInventory.itemStack))
 							{
-								color = filter.color;
+								filterColor = filter.color;
 								break;
 							}
 						}
 						
-						if(TransporterUtils.insert(this, transporter, inInventory.itemStack, color))
+						if(TransporterUtils.insert(this, transporter, inInventory.itemStack, filterColor))
 						{
 							inventory.setInventorySlotContents(inInventory.slotID, null);
 							setActive(true);
@@ -116,6 +118,11 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
         
         nbtTags.setInteger("controlType", controlType.ordinal());
         
+        if(color != null)
+        {
+        	nbtTags.setInteger("color", TransporterUtils.colors.indexOf(color));
+        }
+        
         NBTTagList filterTags = new NBTTagList();
         
         for(TransporterFilter filter : filters)
@@ -138,6 +145,11 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
     	
     	controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")];
     	
+    	if(nbtTags.hasKey("color"))
+    	{
+    		color = TransporterUtils.colors.get(nbtTags.getInteger("color"));
+    	}
+    	
        	if(nbtTags.hasKey("filters"))
     	{
     		NBTTagList tagList = nbtTags.getTagList("filters");
@@ -152,6 +164,16 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 	@Override
 	public void handlePacketData(ByteArrayDataInput dataStream)
 	{
+		if(!worldObj.isRemote)
+		{
+			if(dataStream.readInt() == 0)
+			{
+				color = TransporterUtils.increment(color);
+			}
+			
+			return;
+		}
+		
 		super.handlePacketData(dataStream);
 		
 		int type = dataStream.readInt();
@@ -161,6 +183,16 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 			isActive = dataStream.readBoolean();
 			controlType = RedstoneControl.values()[dataStream.readInt()];
 			
+			int c = dataStream.readInt();
+			
+			if(c != -1)
+			{
+				color = TransporterUtils.colors.get(c);
+			}
+			else {
+				color = null;
+			}
+			
 			filters.clear();
 			
 			int amount = dataStream.readInt();
@@ -175,7 +207,17 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 		else if(type == 1)
 		{
 			isActive = dataStream.readBoolean();
-			controlType = RedstoneControl.values()[dataStream.readInt()];	
+			controlType = RedstoneControl.values()[dataStream.readInt()];
+			
+			int c = dataStream.readInt();
+			
+			if(c != -1)
+			{
+				color = TransporterUtils.colors.get(c);
+			}
+			else {
+				color = null;
+			}
 			
 			MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord);
 		}
@@ -202,6 +244,14 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 		data.add(isActive);
 		data.add(controlType.ordinal());
 		
+		if(color != null)
+		{
+			data.add(TransporterUtils.colors.indexOf(color));
+		}
+		else {
+			data.add(-1);
+		}
+		
 		data.add(filters.size());
 		
 		for(TransporterFilter filter : filters)
@@ -221,6 +271,14 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 		data.add(isActive);
 		data.add(controlType.ordinal());
 		
+		if(color != null)
+		{
+			data.add(TransporterUtils.colors.indexOf(color));
+		}
+		else {
+			data.add(-1);
+		}
+		
 		return data;
 		
 	}
@@ -262,7 +320,12 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 	@Override
 	public int[] getAccessibleSlotsFromSide(int side) 
 	{
-		return new int[] {0};
+		if(side == ForgeDirection.getOrientation(facing).ordinal() || side == ForgeDirection.getOrientation(facing).getOpposite().ordinal())
+		{
+			return new int[] {0};
+		}
+		
+		return null;
 	}
 
 	@Override
diff --git a/common/mekanism/common/transporter/OreDictFilter.java b/common/mekanism/common/transporter/OreDictFilter.java
index 4084bb880..e97115aee 100644
--- a/common/mekanism/common/transporter/OreDictFilter.java
+++ b/common/mekanism/common/transporter/OreDictFilter.java
@@ -23,7 +23,7 @@ public class OreDictFilter extends TransporterFilter
 			return false;
 		}
 		
-		if(oreDictName.equals(oreKey))
+		if(oreDictName.equals(oreKey) || oreDictName.equals("*"))
 		{
 			return true;
 		}
diff --git a/common/mekanism/common/transporter/TransporterFilter.java b/common/mekanism/common/transporter/TransporterFilter.java
index 5cfe19451..079da7f19 100644
--- a/common/mekanism/common/transporter/TransporterFilter.java
+++ b/common/mekanism/common/transporter/TransporterFilter.java
@@ -17,22 +17,43 @@ public abstract class TransporterFilter
 	
 	public void write(NBTTagCompound nbtTags)
 	{
-		nbtTags.setInteger("color", TransporterUtils.colors.indexOf(color));
+		if(color != null)
+		{
+			nbtTags.setInteger("color", TransporterUtils.colors.indexOf(color));
+		
+		}
 	}
 	
 	protected void read(NBTTagCompound nbtTags)
 	{
-		color = TransporterUtils.colors.get(nbtTags.getInteger("color"));
+		if(nbtTags.hasKey("color"))
+		{
+			color = TransporterUtils.colors.get(nbtTags.getInteger("color"));
+		}
 	}
 	
 	public void write(ArrayList data)
 	{
-		data.add(TransporterUtils.colors.indexOf(color));
+		if(color != null)
+		{
+			data.add(TransporterUtils.colors.indexOf(color));
+		}
+		else {
+			data.add(-1);
+		}
 	}
 	
 	protected void read(ByteArrayDataInput dataStream)
 	{
-		color = TransporterUtils.colors.get(dataStream.readInt());
+		int c = dataStream.readInt();
+		
+		if(c != -1)
+		{
+			color = TransporterUtils.colors.get(c);
+		}
+		else {
+			color = null;
+		}
 	}
 	
 	public static TransporterFilter readFromNBT(NBTTagCompound nbtTags)
diff --git a/common/mekanism/common/transporter/TransporterPathfinder.java b/common/mekanism/common/transporter/TransporterPathfinder.java
index 635aec34d..b4eb3db17 100644
--- a/common/mekanism/common/transporter/TransporterPathfinder.java
+++ b/common/mekanism/common/transporter/TransporterPathfinder.java
@@ -1,13 +1,13 @@
 package mekanism.common.transporter;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import mekanism.api.EnumColor;
 import mekanism.api.Object3D;
 import mekanism.common.tileentity.TileEntityLogisticalTransporter;
 import mekanism.common.util.TransporterUtils;
@@ -17,35 +17,33 @@ import net.minecraftforge.common.ForgeDirection;
 
 public final class TransporterPathfinder
 {
-	public static class IdleDest
+	public static class IdlePath
 	{
 		public World worldObj;
 		
-		public Set<TileEntityLogisticalTransporter> iterated = new HashSet<TileEntityLogisticalTransporter>();
+		public Object3D start;
 		
-		public TileEntityLogisticalTransporter start;
-		
-		public Map<Object3D, Integer> destinations = new HashMap<Object3D, Integer>();
+		public Set<Destination> destinations = new HashSet<Destination>();
 		
 		public TransporterStack transportStack;
 		
-		public IdleDest(World world, TileEntityLogisticalTransporter tileEntity, TransporterStack stack)
+		public IdlePath(World world, Object3D obj, TransporterStack stack)
 		{
 			worldObj = world;
-			start = tileEntity;
+			start = obj;
 			transportStack = stack;
 		}
 		
-		public void loop(TileEntityLogisticalTransporter pointer, int dist)
+		public void loop(Object3D pointer, ArrayList<Object3D> currentPath, int dist)
 		{
 			if(pointer == null)
 			{
 				return;
 			}
 			
-			iterated.add(pointer);
+			currentPath.add(pointer);
 			
-			if(pointer.color == EnumColor.BLACK)
+			if(pointer.getMetadata(worldObj) == 4)
 			{
 				dist += 1000;
 			}
@@ -57,69 +55,108 @@ public final class TransporterPathfinder
 			
 			for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
 			{
-				TileEntity tile = Object3D.get(pointer).getFromSide(side).getTileEntity(worldObj);
+				TileEntity tile = pointer.getFromSide(side).getTileEntity(worldObj);
 				
-				if(transportStack.canInsertToTransporter(tile) && !iterated.contains(tile))
+				if(transportStack.canInsertToTransporter(tile) && !currentPath.contains(Object3D.get(tile)))
 				{
-					loop((TileEntityLogisticalTransporter)tile, dist);
+					loop(Object3D.get(tile), (ArrayList<Object3D>)currentPath.clone(), dist);
 					found = true;
 				}
 			}
 			
 			if(!found)
 			{
-				destinations.put(Object3D.get(pointer), dist);
+				destinations.add(new Destination(currentPath, null, dist));
 			}
 		}
 		
-		public Object3D find()
+		public List<Object3D> find()
 		{
-			loop(start, 0);
+			loop(start, new ArrayList<Object3D>(), 0);
 			
-			Object3D farthest = null;
+		    Destination farthest = null;
 			
-			for(Map.Entry<Object3D, Integer> entry : destinations.entrySet())
+			for(Destination obj : destinations)
 			{
-				if(farthest == null || destinations.get(farthest) < entry.getValue())
+				if(farthest == null || obj.distance > farthest.distance)
 				{
-					farthest = entry.getKey();
+					if(!obj.path.isEmpty() && !obj.path.get(0).equals(start))
+					{
+						farthest = obj;
+					}
 				}
 			}
 			
-			return farthest;
+			if(farthest == null)
+			{
+				return null;
+			}
+			
+			return farthest.path;
 		}
 	}
 	
 	public static class Destination
+	{
+		public List<Object3D> path = new ArrayList<Object3D>();
+		public int distance;
+		
+		public Destination(ArrayList<Object3D> list, Object3D dest, int i)
+		{
+			path = (List<Object3D>)list.clone();
+			
+			if(dest != null)
+			{
+				path.add(dest);
+			}
+			
+			Collections.reverse(path);
+			distance = i;
+		}
+		
+		@Override
+		public int hashCode() 
+		{
+			int code = 1;
+			code = 31 * code + path.hashCode();
+			code = 31 * code + distance;
+			return code;
+		}
+		
+		@Override
+		public boolean equals(Object dest)
+		{
+			return dest instanceof Destination && ((Destination)dest).path.equals(path) && ((Destination)dest).distance == distance;
+		}
+	}
+	
+	public static class DestPath
 	{
 		public World worldObj;
 		
-		public Set<TileEntityLogisticalTransporter> iterated = new HashSet<TileEntityLogisticalTransporter>();
+		public Set<Destination> destinations = new HashSet<Destination>();
 		
-		public Map<Object3D, Integer> destinations = new HashMap<Object3D, Integer>();
-		public Map<Object3D, Object3D> prevNodes = new HashMap<Object3D, Object3D>();
-		
-		public TileEntityLogisticalTransporter start;
+		public Object3D start;
 		
 		public TransporterStack transportStack;
 		
-		public Destination(World world, TileEntityLogisticalTransporter tileEntity, TransporterStack stack)
+		public DestPath(World world, Object3D obj, TransporterStack stack)
 		{
 			worldObj = world;
-			start = tileEntity;
+			start = obj;
 			transportStack = stack;
 		}
 		
-		public void loop(TileEntityLogisticalTransporter pointer, int dist)
+		public void loop(Object3D pointer, ArrayList<Object3D> currentPath, int dist)
 		{
 			if(pointer == null)
 			{
 				return;
 			}
 			
-			iterated.add(pointer);
+			currentPath.add(pointer);
 			
-			if(pointer.color == EnumColor.BLACK)
+			if(pointer.getMetadata(worldObj) == 4)
 			{
 				dist += 1000;
 			}
@@ -129,225 +166,69 @@ public final class TransporterPathfinder
 			
 			for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
 			{
-				TileEntity tile = Object3D.get(pointer).getFromSide(side).getTileEntity(worldObj);
+				TileEntity tile = pointer.getFromSide(side).getTileEntity(worldObj);
 				
 				if(TransporterUtils.canInsert(tile, transportStack.itemStack, side.ordinal()) && !(tile instanceof TileEntityLogisticalTransporter))
 				{
-					destinations.put(Object3D.get(tile), dist);
-					prevNodes.put(Object3D.get(tile), Object3D.get(pointer));
-					return;
+					destinations.add(new Destination(currentPath, Object3D.get(tile), dist));
 				}
 				
-				if(transportStack.canInsertToTransporter(tile) && !iterated.contains(tile))
+				if(transportStack.canInsertToTransporter(tile) && !currentPath.contains(Object3D.get(tile)))
 				{
-					loop((TileEntityLogisticalTransporter)tile, dist);
+					loop(Object3D.get(tile), (ArrayList<Object3D>)currentPath.clone(), dist);
 				}
 			}
 		}
 		
-		public Object3D find()
+		public List<Object3D> find()
 		{
-			loop(start, 0);
+			loop(start, new ArrayList<Object3D>(), 0);
 			
-			Object3D closest = null;
+		    Destination closest = null;
 			
-			for(Map.Entry<Object3D, Integer> entry : destinations.entrySet())
+			for(Destination obj : destinations)
 			{
-				if(closest == null || destinations.get(closest) > entry.getValue())
+				if(closest == null || obj.distance < closest.distance)
 				{
-					closest = entry.getKey();
-				}
-			}
-			
-			return closest;
-		}
-	}
-	
-	public static class Path
-	{
-		public final Set<Object3D> openSet, closedSet;
-
-		public final HashMap<Object3D, Object3D> navMap;
-
-		public final HashMap<Object3D, Double> gScore, fScore;
-
-		public final Object3D target;
-		
-		public final Object3D start;
-		
-		public final Object3D finalNode;
-		
-		public final TransporterStack transportStack;
-
-		public List<Object3D> results;
-
-		private World worldObj;
-
-		public Path(World world, Object3D node, Object3D startObj, Object3D finishObj, TransporterStack stack) 
-		{
-			worldObj = world;
-			finalNode = node;
-			start = startObj;
-			target = finishObj;
-			transportStack = stack;
-
-			openSet = new HashSet<Object3D>();
-			closedSet = new HashSet<Object3D>();
-			
-			navMap = new HashMap<Object3D, Object3D>();
-			
-			gScore = new HashMap<Object3D, Double>();
-			fScore = new HashMap<Object3D, Double>();
-			
-			results = new ArrayList<Object3D>();
-		}
-
-		public boolean find(final Object3D start)
-		{
-			openSet.add(start);
-			gScore.put(start, 0d);
-			fScore.put(start, gScore.get(start) + getEstimate(start, finalNode));
-
-			int blockCount = 0;
-
-			for(int i = 0; i < 6; i++) 
-			{
-				ForgeDirection direction = ForgeDirection.getOrientation(i);
-				Object3D neighbor = finalNode.translate(direction.offsetX, direction.offsetY, direction.offsetZ);
-
-				if(!transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj))) 
-				{
-					blockCount++;
-				}
-			}
-
-			if(blockCount >= 6) 
-			{
-				return false;
-			}
-
-			double maxSearchDistance = start.distanceTo(finalNode) * 2;
-
-			while(!openSet.isEmpty())
-			{
-				Object3D currentNode = null;
-				double lowestFScore = 0;
-
-				for(Object3D node : openSet) 
-				{
-					if(currentNode == null || fScore.get(node) < lowestFScore) 
+					if(!obj.path.isEmpty() && !obj.path.get(0).equals(start))
 					{
-						currentNode = node;
-						lowestFScore = fScore.get(node);
-					}
-				}
-
-				if(currentNode == null && start.distanceTo(currentNode) > maxSearchDistance)
-				{
-					break;
-				}
-
-				if(currentNode.equals(finalNode))
-				{
-					results = reconstructPath(navMap, finalNode);
-					return true;
-				}
-
-				openSet.remove(currentNode);
-				closedSet.add(currentNode);
-
-				for(int i = 0; i < 6; i++) 
-				{
-					ForgeDirection direction = ForgeDirection.getOrientation(i);
-					Object3D neighbor = currentNode.getFromSide(direction);
-
-					if(transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj))) 
-					{
-						double tentativeG = gScore.get(currentNode) + currentNode.distanceTo(neighbor);
-
-						if(closedSet.contains(neighbor))
-						{
-							if(tentativeG >= gScore.get(neighbor)) 
-							{
-								continue;
-							}
-						}
-
-						if(!openSet.contains(neighbor) || tentativeG < gScore.get(neighbor)) 
-						{
-							navMap.put(neighbor, currentNode);
-							gScore.put(neighbor, tentativeG);
-							fScore.put(neighbor, gScore.get(neighbor) + getEstimate(neighbor, finalNode));
-							openSet.add(neighbor);
-						}
+						closest = obj;
 					}
 				}
 			}
-
-			return false;
-		}
-		
-		public List<Object3D> getPath()
-		{
-			boolean foundPath = find(start);
 			
-			if(foundPath)
+			if(closest == null)
 			{
-				if(target != null)
-				{
-					results.add(0, target);
-				}
-				
-				return results;
+				return null;
 			}
 			
-			return null;
-		}
-
-		private List<Object3D> reconstructPath(HashMap<Object3D, Object3D> naviMap, Object3D currentNode) 
-		{
-			List<Object3D> path = new ArrayList<Object3D>();
-			path.add(currentNode);
-
-			if(naviMap.containsKey(currentNode)) 
-			{
-				path.addAll(reconstructPath(naviMap, naviMap.get(currentNode)));
-			}
-
-			return path;
-		}
-
-		private double getEstimate(Object3D start, Object3D target2) 
-		{
-			return start.distanceTo(target2);
+			return closest.path;
 		}
 	}
 	
 	public static List<Object3D> getNewPath(TileEntityLogisticalTransporter start, TransporterStack stack)
 	{
-		Destination d = new Destination(start.worldObj, start, stack);
-		Object3D closest = d.find();
+		DestPath d = new DestPath(start.worldObj, Object3D.get(start), stack);
+		List<Object3D> path = d.find();
 		
-		if(closest == null)
+		if(path == null)
 		{
 			return null;
 		}
 		
-		Path p = new Path(d.worldObj, d.prevNodes.get(closest), Object3D.get(start), closest, stack);
-		return p.getPath();
+		return path;
 	}
 	
 	public static List<Object3D> getIdlePath(TileEntityLogisticalTransporter start, TransporterStack stack)
 	{
-		IdleDest d = new IdleDest(start.worldObj, start, stack);
-		Object3D farthest = d.find();
+		IdlePath d = new IdlePath(start.worldObj, Object3D.get(start), stack);
+		List<Object3D> path = d.find();
 		
-		if(farthest == null || farthest.equals(Object3D.get(start)))
+		if(path == null)
 		{
 			return null;
 		}
 		
-		Path p = new Path(start.worldObj, farthest, Object3D.get(start), null, stack);
-		return p.getPath();
+		return path;
 	}
 }
diff --git a/common/mekanism/common/transporter/TransporterStack.java b/common/mekanism/common/transporter/TransporterStack.java
index 9182a6dfb..0070945b5 100644
--- a/common/mekanism/common/transporter/TransporterStack.java
+++ b/common/mekanism/common/transporter/TransporterStack.java
@@ -204,7 +204,10 @@ public class TransporterStack
 	{
 		if(progress < 50)
 		{
-			return Object3D.get(tileEntity).sideDifference(getPrev(tileEntity)).ordinal();
+			if(getPrev(tileEntity) != null)
+			{
+				return Object3D.get(tileEntity).sideDifference(getPrev(tileEntity)).ordinal();
+			}
 		}
 		else if(progress == 50)
 		{
@@ -215,7 +218,10 @@ public class TransporterStack
 		}
 		else if(progress > 50)
 		{
-			return getNext(tileEntity).sideDifference(Object3D.get(tileEntity)).ordinal();
+			if(getNext(tileEntity) != null)
+			{
+				return getNext(tileEntity).sideDifference(Object3D.get(tileEntity)).ordinal();
+			}
 		}
 		
 		return 0;
diff --git a/common/mekanism/common/util/MekanismUtils.java b/common/mekanism/common/util/MekanismUtils.java
index 24c579be5..0715ddc85 100644
--- a/common/mekanism/common/util/MekanismUtils.java
+++ b/common/mekanism/common/util/MekanismUtils.java
@@ -71,50 +71,52 @@ public final class MekanismUtils
 	 */
 	public static boolean checkForUpdates(EntityPlayer entityplayer)
 	{
-		if(Mekanism.updateNotifications && Mekanism.latestVersionNumber != null && Mekanism.recentNews != null)
-		{
-			if(!Mekanism.latestVersionNumber.equals("null"))
+		try {
+			if(Mekanism.updateNotifications && Mekanism.latestVersionNumber != null && Mekanism.recentNews != null)
 			{
-				ArrayList<IModule> list = new ArrayList<IModule>();
-				
-				for(IModule module : Mekanism.modulesLoaded)
+				if(!Mekanism.latestVersionNumber.equals("null"))
 				{
-					if(Version.get(Mekanism.latestVersionNumber).comparedState(module.getVersion()) == 1)
+					ArrayList<IModule> list = new ArrayList<IModule>();
+					
+					for(IModule module : Mekanism.modulesLoaded)
 					{
-						list.add(module);
+						if(Version.get(Mekanism.latestVersionNumber).comparedState(module.getVersion()) == 1)
+						{
+							list.add(module);
+						}
+					}
+					
+					if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1 || !list.isEmpty())
+					{
+						entityplayer.addChatMessage(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------");
+						entityplayer.addChatMessage(EnumColor.GREY + " Using outdated version on one or more modules.");
+						
+						if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1)
+						{
+							entityplayer.addChatMessage(EnumColor.INDIGO + " Mekanism: " + EnumColor.DARK_RED + Mekanism.versionNumber);
+						}
+						
+						for(IModule module : list)
+						{
+							entityplayer.addChatMessage(EnumColor.INDIGO + " Mekanism" + module.getName() + ": " + EnumColor.DARK_RED + module.getVersion());
+						}
+						
+						entityplayer.addChatMessage(EnumColor.GREY + " Consider updating to version " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber);
+						entityplayer.addChatMessage(EnumColor.GREY + " New features: " + EnumColor.INDIGO + Mekanism.recentNews);
+						entityplayer.addChatMessage(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------");
+						return true;
+					}
+					else if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == -1)
+					{
+						entityplayer.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Using developer build " + EnumColor.DARK_GREY + Mekanism.versionNumber);
+						return true;
 					}
 				}
-				
-				if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1 || !list.isEmpty())
-				{
-					entityplayer.addChatMessage(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------");
-					entityplayer.addChatMessage(EnumColor.GREY + " Using outdated version on one or more modules.");
-					
-					if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1)
-					{
-						entityplayer.addChatMessage(EnumColor.INDIGO + " Mekanism: " + EnumColor.DARK_RED + Mekanism.versionNumber);
-					}
-					
-					for(IModule module : list)
-					{
-						entityplayer.addChatMessage(EnumColor.INDIGO + " Mekanism" + module.getName() + ": " + EnumColor.DARK_RED + module.getVersion());
-					}
-					
-					entityplayer.addChatMessage(EnumColor.GREY + " Consider updating to version " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber);
-					entityplayer.addChatMessage(EnumColor.GREY + " New features: " + EnumColor.INDIGO + Mekanism.recentNews);
-					entityplayer.addChatMessage(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------");
-					return true;
-				}
-				else if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == -1)
-				{
-					entityplayer.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Using developer build " + EnumColor.DARK_GREY + Mekanism.versionNumber);
-					return true;
+				else {
+					System.out.println("[Mekanism] Minecraft is in offline mode, could not check for updates.");
 				}
 			}
-			else {
-				System.out.println("[Mekanism] Minecraft is in offline mode, could not check for updates.");
-			}
-		}
+		} catch(Exception e) {}
 		
 		return false;
 	}
diff --git a/common/mekanism/common/util/TransporterUtils.java b/common/mekanism/common/util/TransporterUtils.java
index 6b089314d..1c45786c8 100644
--- a/common/mekanism/common/util/TransporterUtils.java
+++ b/common/mekanism/common/util/TransporterUtils.java
@@ -35,7 +35,6 @@ public final class TransporterUtils
 		ret.add(EnumColor.RED);
 		ret.add(EnumColor.PINK);
 		ret.add(EnumColor.YELLOW);
-		ret.add(EnumColor.BLACK);
 		
 		return ret;
 	}
@@ -357,10 +356,14 @@ public final class TransporterUtils
 	
 	public static EnumColor increment(EnumColor color)
 	{
-		if(colors.indexOf(color) == colors.size()-1)
+		if(color == null)
 		{
 			return colors.get(0);
 		}
+		else if(colors.indexOf(color) == colors.size()-1)
+		{
+			return null;
+		}
 		
 		return colors.get(colors.indexOf(color)+1);
 	}
diff --git a/resources/assets/mekanism/gui/GuiHydrogenGenerator.png b/resources/assets/mekanism/gui/GuiHydrogenGenerator.png
index 772f62574034aa970c7edda1590b5b6742b661b9..8d870a167dfb2d6ba752a065e9ec003f60d558d6 100644
GIT binary patch
delta 2651
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
W5&x$~uFfw3ez|S;a;ezLJo!&hNeRUO

literal 4117
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
Ks`MA%-~I+!0n$1E

diff --git a/resources/assets/mekanism/gui/GuiLogisticalSorter.png b/resources/assets/mekanism/gui/GuiLogisticalSorter.png
index 73e9ac2586bcbf90cf156ed08c2f064586f0cd71..f01c733c082c9f1c3ccd6c94012405f1b04c5fb6 100644
GIT binary patch
delta 2135
zcmc(gdrVVj7{*TzEgnGD5~hHHt-1^&1FB4AMM`CgiWJ<m=@e+oj6%G%%yCg^PwO=U
zv@^{Z3sSdLB*L(rQ_FzD!HP{qAf{2NoYETN1&~u*LE2J!*6flcX19OTFL{$UPo8}5
zFYosx-;K!fD9sik9Jp}f+BI8C31b%B?%d%y{<Z^0Foa8ijy)%Z`zz9K)WvWTv<t1Q
zdGntwWsB<4zbYaHHu&!_?}PGE!#A8*cs{-1O8E<8LE3^7u~EiN(|5H>znho)`nHd5
zJIA}$)NyyjFkp7oNR~B|^KFJLNzUy2Y?Rkt_H&o2ulIrhwwKvgB^Qd)hfXch@YMDC
zmIXVNjgL#GFbjulM)8OGlRb7dPuKEds2&*ag=6E$=^=?sCNKHmFXuT>n|Qjo3V%Li
zpjzM%f9lMmx|G$2CJG$&6){pO#z;(bKHMjyY<N3y_3E5447-$>nfc%tl4b2wKj`jC
za&qMG^b(-W!S8w`0lOj8JO^1mbTM6uoJDGL2)9?*m>{t#R7BF8)!ib_4f8e5!1q~#
z4+vbK+uWETDD*WIYL?&sGhsY|`?|7`sm4F!4luo{EK<7%P91!gB{(R{?^EuZ<j94C
zZRUny{@%#~vQJ(j+mlOZlgzjWgLPW1mcd}Ol!)c`#@SQ!WP9h)S*pStJqMbA>J|y^
z73Vk(1lKB+`#}L?!~X7oXLh@_fNXM<744oG^n`vp_z4O85d>+)E9NcU98UvAPH||I
z7#a+G%2h1`CqeL^9Iw^@|3>j@XZ+g;_^(yG5eWFD_juh9@ZW{vHA28|D0hEm0)CU>
z_d&ohwEx<+CUn3YU9eXu6khG<zyo;3O_cC0f~P<tgR!06fmVf9r}oEk1*1TzbNpdb
z{XzG{@JLrhm{w9d+9vfYjjC%gWN-zk&An6C)NMsT2C2TpHh?NqU`akf1lKT=zeb*d
z-cZp*aE%<PlmgYAg<-NgBqH*3{z|GWf<T}j9f|{0L6G#$s=Z7w0R#p9hFoG=7zI!X
z`^$*Ch(u)e=~k#Rjs~PzH7@8j1W6+zOG3hPSwLlbo+G3>gaRZaVvFc4QXpKcf4rE!
zm<H?;q3Z;n!@ld?CwkTk(gdUSS#)u{ba>Qdfhf&5n9V0-SdIBQp4EMSraplnn~v8M
z0VsZk&5|O=k*nSSx|pvsnM@T=&>E|lYpdj#KfJj>a;aj{#aGr^S58GmMtaa4o+#N8
znO?7Fr$k3bo9w2D;@0n^Fo;rmO;9CF^FjB29|578S-|ho%Su&9vy+VMY>;z{+;p4k
z$>a}xr{!|4$dIl10=gZL<E7j(V;F|+u&k%0At!;9o~3cKkcn~}KPJs`Jm4K?)gf7Z
z`*$|w@ej|Ogv;=4EdA-~q<((8duSx?C#z?rwzD&-#slMz6!+F#c5Sr<Tpz<oUf1Ng
zRfKW1(0gdAi<86lT7=9%g)XRB(Hcbgxc?i;d)3r4SI}j)4&Ue0c(+#-?>&r-Z<-qf
zdB!aF8~Ng1nBZm`jd+i}szLcti9^388q&6gIbUSKDP$>M?VYi}SbKAMqp@SU2PY`<
zf@2k%gPDI6m0Wy*8uWPmJFz9Ro$>kV<%-VW-3rQE^L-T%VPk-}-<Nwva;O*01%U5t
MT$j1_QmWv{ucv8E>;M1&

delta 2033
zcmeB@JtDIqn5CZcwx^3@NCo5DyJxdvQ$^Sw2%nVw!o}jar?ElA{a~D<Tb1-nUW;6J
zza@)%jI!1#Oqw`l+1xG<R~Au0cdH_)&HcW!r)~P|9R6)~zAd}g<#&@eU#q${efnLs
z+_2Tx`zK#E|C>-CeeS^PVCx^z>fseO6(1gOowu``IdA{ZOZipD>kn%7ns*&IcI;S5
zgt^<y=Zh@o+0|BE48C@KzJ2|^e?K1{Zl7NFPlUnlhyKy0o|;VU?d_|pzrWkc)u`@2
z@64zBd#k_qzD`g4a4dh`@1xhQUHcWDUe2&y@9o>Sd#i3svk0+%`~E%r_U+rN7cX9H
zrug9-`w!P@%ij$9UsUF^H1PlHuHO-(zM<zp?_EY6<9VxCIL>h1IU#!>hIyT!!iG5w
z)(ubJgsN@W0c0EvU%<$8nsWzp#JRXsrfzN^qlQ(AI7J1YnJ(ME+4<u2uk+=lSD)|y
zxb(pD_!GBTICS*u3;zH6tNnNN@#FpS@he~QulthYujY`T(dd1b(WdIli)*}lH*el-
zWnr<Sw6_1+htlr`d+*P+E_Zv}G5dKCqe1E4H#ax$c=lY%%FZs1{XoeCn`y!~?%v&d
zO>Wuu&+CI<e}C4`@b#FMK!>OR!^YJYB^s+383XdyFf~RnG79XL>J_YCAufPl1#K17
zgIz&eJMdXij|hqZaYQ{@e9+qw_1F>x9UW1RGiB1p5%mL^_<;$tzE=>pM;p)HICsxE
z+1lEA_1(L7zkl$GYdSE4$(jAY!Gj00em&ec=YYr|xt$<^BkvgWs(&oAHc;I2hVR*`
z-_{M5ve!9y^b{D_;x~K*mTDY01nLPZp^b`ymH&kce%051?d$K)mu>woYLT4!ZNkR(
z^3sikzh<j1@Bg}W@7}%Tw#VNKb_m_Le?R_vaY>2EUz@p!{n=bUln<Cb+#}s6$ii}f
zBie+yF`J8{A^T9JIg>I6M}y$D3^u0gA_5H8TR!KV=9u%B^?}jV<EyP|r3xN@DJ-g}
z*wJKtugTXX!SBJJjO77-+qQ3iKJT?uqXgr8rW*Uz7V-?2wg3HRWqkj9>t3!#ug2}?
z^HSF)##cX{eLt>F^uh+^XMEotm)~D!_w&u?J8bOlb3Xn5b-H?ObIRYP2ZURWpXL7Z
z^HF;#!=JCG{mtWJj$VCo|L?=ilNot-PL}844`@95@^;ftG0)So%>Pc`T)ihMH?Q{N
z`;~{=b;JaI{CwGc)qVb__=dXJqEGdIt_EE-ezk7D<qMXFg`b)B*Z+T=$xyTB*YE!N
zynQ>mR-fGe`|$nA+`K2*%$DbKKZ~Axi+6^E5z~Lh$+q{t?|L;ygaHUVUHx3vIVCg!
E0LrmE-2eap

diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang
index 52dc30598..ceb0e1b95 100644
--- a/resources/assets/mekanism/lang/en_US.lang
+++ b/resources/assets/mekanism/lang/en_US.lang
@@ -67,6 +67,7 @@ tile.Transmitter.PressurizedTube.name=Pressurized Tube
 tile.Transmitter.UniversalCable.name=Universal Cable
 tile.Transmitter.MechanicalPipe.name=Mechanical Pipe
 tile.Transmitter.LogisticalTransporter.name=Logistical Transporter
+tile.Transmitter.RestrictiveTransporter.name=Restrictive Transporter
 
 //Energy Cubes
 tile.EnergyCube.Basic.name=Basic Energy Cube
diff --git a/resources/assets/mekanism/render/RestrictiveTransporter.png b/resources/assets/mekanism/render/RestrictiveTransporter.png
new file mode 100644
index 0000000000000000000000000000000000000000..d69fe127dac8a1864e2f8d13e4a370bb92fe9c46
GIT binary patch
literal 9783
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

literal 0
HcmV?d00001