From 3a9a51818855cbe1b380dbe4dbff7fb2066a4f1e Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Sat, 26 Oct 2013 13:25:51 -0400
Subject: [PATCH] Major GUI work!

---
 common/mekanism/client/ClientProxy.java       |   6 +
 .../client/gui/GuiItemStackFilter.java        | 182 +++++++++++++++-
 .../client/gui/GuiLogisticalSorter.java       |  11 +-
 .../mekanism/client/gui/GuiOreDictFilter.java | 205 +++++++++++++++++-
 .../client/render/MekanismRenderer.java       |  19 ++
 .../tileentity/RenderConfigurableMachine.java |  31 +--
 common/mekanism/common/HashList.java          |  56 +++++
 common/mekanism/common/Mekanism.java          |   2 +
 .../common/network/PacketFilterUpdate.java    |  66 ++++++
 .../network/PacketLogisticalSorterGui.java    |  16 +-
 .../tileentity/TileEntityBasicBlock.java      |   4 +-
 .../TileEntityLogisticalSorter.java           |  16 +-
 .../common/transporter/OreDictFilter.java     |  35 ++-
 .../mekanism/common/util/MekanismUtils.java   |  36 ++-
 .../common/util/TransporterUtils.java         |  10 +
 .../mekanism/gui/GuiItemStackFilter.png       | Bin 4941 -> 3942 bytes
 .../assets/mekanism/gui/GuiOreDictFilter.png  | Bin 4941 -> 4295 bytes
 .../assets/mekanism/gui/GuiRobitRepair.png    | Bin 9571 -> 9443 bytes
 18 files changed, 636 insertions(+), 59 deletions(-)
 create mode 100644 common/mekanism/common/HashList.java
 create mode 100644 common/mekanism/common/network/PacketFilterUpdate.java

diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java
index 7ae76e5fb..c98191d08 100644
--- a/common/mekanism/client/ClientProxy.java
+++ b/common/mekanism/client/ClientProxy.java
@@ -17,8 +17,10 @@ import mekanism.client.gui.GuiEnergyCube;
 import mekanism.client.gui.GuiEnrichmentChamber;
 import mekanism.client.gui.GuiFactory;
 import mekanism.client.gui.GuiGasTank;
+import mekanism.client.gui.GuiItemStackFilter;
 import mekanism.client.gui.GuiLogisticalSorter;
 import mekanism.client.gui.GuiMetallurgicInfuser;
+import mekanism.client.gui.GuiOreDictFilter;
 import mekanism.client.gui.GuiOsmiumCompressor;
 import mekanism.client.gui.GuiPasswordEnter;
 import mekanism.client.gui.GuiPasswordModify;
@@ -352,6 +354,10 @@ public class ClientProxy extends CommonProxy
 				return new GuiRobitRepair(player.inventory, world, x);
 			case 26:
 				return new GuiLogisticalSorter(player, (TileEntityLogisticalSorter)tileEntity);
+			case 27:
+				return new GuiItemStackFilter(player, (TileEntityLogisticalSorter)tileEntity);
+			case 28:
+				return new GuiOreDictFilter(player, (TileEntityLogisticalSorter)tileEntity);
 		}
 		
 		return null;
diff --git a/common/mekanism/client/gui/GuiItemStackFilter.java b/common/mekanism/client/gui/GuiItemStackFilter.java
index e5607d6fd..31b1310fd 100644
--- a/common/mekanism/client/gui/GuiItemStackFilter.java
+++ b/common/mekanism/client/gui/GuiItemStackFilter.java
@@ -1,5 +1,185 @@
 package mekanism.client.gui;
 
-public class GuiItemStackFilter {
+import mekanism.api.EnumColor;
+import mekanism.api.Object3D;
+import mekanism.client.render.MekanismRenderer;
+import mekanism.common.Mekanism;
+import mekanism.common.PacketHandler;
+import mekanism.common.PacketHandler.Transmission;
+import mekanism.common.inventory.container.ContainerFilter;
+import mekanism.common.network.PacketLogisticalSorterGui;
+import mekanism.common.network.PacketRobit;
+import mekanism.common.network.PacketRobit.RobitPacketType;
+import mekanism.common.tileentity.TileEntityLogisticalSorter;
+import mekanism.common.transporter.ItemStackFilter;
+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 net.minecraft.item.ItemStack;
 
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+public class GuiItemStackFilter extends GuiMekanism
+{
+	public TileEntityLogisticalSorter tileEntity;
+	
+	public ItemStackFilter filter = new ItemStackFilter();
+	
+	public String status = EnumColor.DARK_GREEN + "All OK";
+	
+	public GuiItemStackFilter(EntityPlayer player, TileEntityLogisticalSorter tentity)
+	{
+		super(new ContainerFilter(player.inventory));
+		tileEntity = tentity;
+		
+		filter.color = TransporterUtils.colors.get(0);
+	}
+	
+	@Override
+	public boolean doesGuiPauseGame()
+	{
+		return false;
+	}
+	
+	@Override
+	public void initGui()
+	{
+		super.initGui();
+		
+        int guiWidth = (width - xSize) / 2;
+        int guiHeight = (height - ySize) / 2;
+		
+		buttonList.clear();
+		buttonList.add(new GuiButton(0, guiWidth + 58, guiHeight + 63, 60, 18, "Save"));
+	}
+	
+	@Override
+	protected void actionPerformed(GuiButton guibutton)
+	{
+		super.actionPerformed(guibutton);
+		
+		if(guibutton.id == 0)
+		{
+			//PacketFilterUpdate TODO
+		}
+	}
+	
+	@Override
+	protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+    {	
+		int xAxis = (mouseX - (width - xSize) / 2);
+		int yAxis = (mouseY - (height - ySize) / 2);
+		
+		fontRenderer.drawString("Edit ItemStack Filter", 43, 6, 0x404040);
+		fontRenderer.drawString("Status: " + status, 35, 20, 0x00CD00);
+		fontRenderer.drawString("ItemStack Details:", 35, 32, 0x00CD00);
+		
+		if(filter.itemType != null)
+		{
+			fontRenderer.drawString("ID: " + filter.itemType.itemID + ", meta: " + filter.itemType.getItemDamage(), 35, 41, 0x00CD00);
+		}
+		
+		if(filter.itemType != null)
+		{
+			GL11.glPushMatrix();
+			GL11.glEnable(GL11.GL_LIGHTING);
+			itemRenderer.renderItemIntoGUI(fontRenderer, mc.getTextureManager(), filter.itemType, 12, 19);
+			GL11.glDisable(GL11.GL_LIGHTING);
+			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, 45, MekanismRenderer.getColorIcon(filter.color), 16, 16);
+		
+		GL11.glDisable(GL11.GL_LIGHTING);
+		GL11.glPopMatrix();
+		
+		if(xAxis >= 12 && xAxis <= 28 && yAxis >= 45 && yAxis <= 61)
+		{
+			drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis);
+		}
+		
+		super.drawGuiContainerForegroundLayer(mouseX, mouseY);
+    }
+
+	@Override
+    protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY)
+    {
+		super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY);
+		
+		mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiItemStackFilter.png"));
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        int guiWidth = (width - xSize) / 2;
+        int guiHeight = (height - ySize) / 2;
+        drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
+        
+		int xAxis = (mouseX - (width - xSize) / 2);
+		int yAxis = (mouseY - (height - ySize) / 2);
+		
+		if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16)
+		{
+			drawTexturedModalRect(guiWidth + 5, guiHeight + 5, 176, 0, 11, 11);
+		}
+		else {
+			drawTexturedModalRect(guiWidth + 5, guiHeight + 5, 176, 11, 11, 11);
+		}
+        
+		if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35)
+		{
+			GL11.glPushMatrix();
+	        GL11.glDisable(GL11.GL_LIGHTING);
+	        GL11.glDisable(GL11.GL_DEPTH_TEST);
+	        
+	        int x = guiWidth + 12;
+	        int y = guiHeight + 19;
+	        drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433);
+	        
+	        GL11.glEnable(GL11.GL_LIGHTING);
+	        GL11.glEnable(GL11.GL_DEPTH_TEST);
+	        GL11.glPopMatrix();
+		}
+    }
+	
+    @Override
+    protected void mouseClicked(int mouseX, int mouseY, int button)
+    {
+        super.mouseClicked(mouseX, mouseY, button);
+        
+    	if(button == 0)
+		{
+			int xAxis = (mouseX - (width - xSize) / 2);
+			int yAxis = (mouseY - (height - ySize) / 2);
+			
+			if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16)
+			{
+				mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
+				PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(Object3D.get(tileEntity), 0));
+				mc.thePlayer.openGui(Mekanism.instance, 26, mc.theWorld, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
+			}
+			
+			if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35)
+			{
+				ItemStack stack = mc.thePlayer.inventory.getItemStack();
+				
+				if(stack != null)
+				{
+					filter.itemType = stack.copy();
+					filter.itemType.stackSize = 1;
+				}
+			}
+			
+			if(xAxis >= 12 && xAxis <= 28 && yAxis >= 45 && yAxis <= 61)
+			{
+				filter.color = TransporterUtils.increment(filter.color);
+			}
+		}
+    }
 }
diff --git a/common/mekanism/client/gui/GuiLogisticalSorter.java b/common/mekanism/client/gui/GuiLogisticalSorter.java
index 467285568..02c0aa490 100644
--- a/common/mekanism/client/gui/GuiLogisticalSorter.java
+++ b/common/mekanism/client/gui/GuiLogisticalSorter.java
@@ -1,6 +1,11 @@
 package mekanism.client.gui;
 
+import mekanism.api.Object3D;
+import mekanism.common.Mekanism;
+import mekanism.common.PacketHandler;
+import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerNull;
+import mekanism.common.network.PacketLogisticalSorterGui;
 import mekanism.common.tileentity.TileEntityLogisticalSorter;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
@@ -50,11 +55,13 @@ public class GuiLogisticalSorter extends GuiMekanism
 		
 		if(guibutton.id == 0)
 		{
-			
+			PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(Object3D.get(tileEntity), 1));
+			mc.thePlayer.openGui(Mekanism.instance, 27, mc.theWorld, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
 		}
 		else if(guibutton.id == 1)
 		{
-			
+			PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(Object3D.get(tileEntity), 2));
+			mc.thePlayer.openGui(Mekanism.instance, 28, mc.theWorld, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
 		}
 	}
 	
diff --git a/common/mekanism/client/gui/GuiOreDictFilter.java b/common/mekanism/client/gui/GuiOreDictFilter.java
index f1e887039..9e44242e8 100644
--- a/common/mekanism/client/gui/GuiOreDictFilter.java
+++ b/common/mekanism/client/gui/GuiOreDictFilter.java
@@ -1,9 +1,206 @@
 package mekanism.client.gui;
 
-import mekanism.common.tileentity.TileEntityLogisticalTransporter;
-import net.minecraft.client.gui.GuiScreen;
+import java.util.List;
 
-public class GuiOreDictFilter extends GuiScreen
+import mekanism.api.EnumColor;
+import mekanism.api.Object3D;
+import mekanism.client.render.MekanismRenderer;
+import mekanism.common.Mekanism;
+import mekanism.common.PacketHandler;
+import mekanism.common.PacketHandler.Transmission;
+import mekanism.common.inventory.container.ContainerFilter;
+import mekanism.common.network.PacketLogisticalSorterGui;
+import mekanism.common.tileentity.TileEntityLogisticalSorter;
+import mekanism.common.transporter.OreDictFilter;
+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.client.gui.GuiTextField;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+public class GuiOreDictFilter extends GuiMekanism
 {
-	public TileEntityLogisticalTransporter tileEntity;
+	public TileEntityLogisticalSorter tileEntity;
+	
+	public OreDictFilter filter = new OreDictFilter();
+	
+	private GuiTextField oreDictText;
+	
+	public int stackSwitch = 0;
+	
+	public int stackIndex = 0;
+	
+	public List<ItemStack> iterStacks;
+	
+	public String status = EnumColor.DARK_GREEN + "All OK";
+	
+	public GuiOreDictFilter(EntityPlayer player, TileEntityLogisticalSorter tentity)
+	{
+		super(new ContainerFilter(player.inventory));
+		tileEntity = tentity;
+		
+		filter.color = TransporterUtils.colors.get(0);
+	}
+	
+	@Override
+	public boolean doesGuiPauseGame()
+	{
+		return false;
+	}
+	
+	@Override
+	public void initGui()
+	{
+		super.initGui();
+		
+        int guiWidth = (width - xSize) / 2;
+        int guiHeight = (height - ySize) / 2;
+		
+		buttonList.clear();
+		buttonList.add(new GuiButton(0, guiWidth + 58, guiHeight + 63, 60, 18, "Save"));
+		
+		oreDictText = new GuiTextField(fontRenderer, guiWidth + 35, guiHeight + 48, 95, 12);
+		oreDictText.setMaxStringLength(12);
+		oreDictText.setFocused(true);
+	}
+	
+	@Override
+	public void keyTyped(char c, int i)
+	{
+		if(i == mc.gameSettings.keyBindInventory.keyCode)
+		{
+			return;
+		}
+		
+		super.keyTyped(c, i);
+		
+		if(Character.isLetter(c) || Character.isDigit(c) || c == '*')
+		{
+			oreDictText.textboxKeyTyped(c, i);
+		}
+	}
+	
+	@Override
+	protected void actionPerformed(GuiButton guibutton)
+	{
+		super.actionPerformed(guibutton);
+		
+		if(guibutton.id == 0)
+		{
+			//PacketFilterUpdate TODO
+		}
+	}
+	
+	@Override
+	protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+    {	
+		int xAxis = (mouseX - (width - xSize) / 2);
+		int yAxis = (mouseY - (height - ySize) / 2);
+		
+		fontRenderer.drawString("Edit OreDict Filter", 43, 6, 0x404040);
+		fontRenderer.drawString("Status: " + status, 35, 20, 0x00CD00);
+		fontRenderer.drawString("Key: " + filter.oreDictName, 35, 32, 0x00CD00);
+		
+		/*if(filter.itemType != null)
+		{
+			GL11.glPushMatrix();
+			GL11.glEnable(GL11.GL_LIGHTING);
+			itemRenderer.renderItemIntoGUI(fontRenderer, mc.getTextureManager(), filter.itemType, 12, 19);
+			GL11.glDisable(GL11.GL_LIGHTING);
+			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, 45, MekanismRenderer.getColorIcon(filter.color), 16, 16);
+		
+		GL11.glDisable(GL11.GL_LIGHTING);
+		GL11.glPopMatrix();
+		
+		if(xAxis >= 12 && xAxis <= 28 && yAxis >= 45 && yAxis <= 61)
+		{
+			drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis);
+		}
+		
+		super.drawGuiContainerForegroundLayer(mouseX, mouseY);
+    }
+
+	@Override
+    protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY)
+    {
+		super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY);
+		
+		mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiOreDictFilter.png"));
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        int guiWidth = (width - xSize) / 2;
+        int guiHeight = (height - ySize) / 2;
+        drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
+        
+		int xAxis = (mouseX - (width - xSize) / 2);
+		int yAxis = (mouseY - (height - ySize) / 2);
+		
+		if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16)
+		{
+			drawTexturedModalRect(guiWidth + 5, guiHeight + 5, 176, 0, 11, 11);
+		}
+		else {
+			drawTexturedModalRect(guiWidth + 5, guiHeight + 5, 176, 11, 11, 11);
+		}
+		
+		if(xAxis >= 131 && xAxis <= 143 && yAxis >= 48 && yAxis <= 60)
+		{
+			drawTexturedModalRect(guiWidth + 131, guiHeight + 48, 176 + 11, 0, 12, 12);
+		}
+		else {
+			drawTexturedModalRect(guiWidth + 131, guiHeight + 48, 176 + 11, 12, 12, 12);
+		}
+		
+        oreDictText.drawTextBox();
+    }
+	
+	@Override
+	public void updateScreen()
+	{
+		super.updateScreen();
+		
+		
+	}
+	
+    @Override
+    protected void mouseClicked(int mouseX, int mouseY, int button)
+    {
+        super.mouseClicked(mouseX, mouseY, button);
+        
+    	if(button == 0)
+		{
+			int xAxis = (mouseX - (width - xSize) / 2);
+			int yAxis = (mouseY - (height - ySize) / 2);
+			
+			if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16)
+			{
+				mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
+				PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(Object3D.get(tileEntity), 0));
+				mc.thePlayer.openGui(Mekanism.instance, 26, mc.theWorld, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
+			}
+			
+			if(xAxis >= 12 && xAxis <= 28 && yAxis >= 45 && yAxis <= 61)
+			{
+				filter.color = TransporterUtils.increment(filter.color);
+			}
+		}
+    }
+    
+    private void setOreDictKey()
+    {
+    	
+    }
 }
diff --git a/common/mekanism/client/render/MekanismRenderer.java b/common/mekanism/client/render/MekanismRenderer.java
index c37e932a9..0aa291ae8 100644
--- a/common/mekanism/client/render/MekanismRenderer.java
+++ b/common/mekanism/client/render/MekanismRenderer.java
@@ -3,9 +3,11 @@ package mekanism.client.render;
 import java.util.Arrays;
 import java.util.List;
 
+import mekanism.api.EnumColor;
 import mekanism.common.ISpecialBounds;
 import mekanism.common.ObfuscatedNames;
 import mekanism.common.util.MekanismUtils;
+import mekanism.common.util.MekanismUtils.ResourceType;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GLAllocation;
@@ -34,6 +36,8 @@ public class MekanismRenderer
 {
 	private static RenderBlocks renderBlocks = new RenderBlocks();
 	
+	public static Icon[] colors = new Icon[256];
+	
 	private static float lightmapLastX;
     private static float lightmapLastY;
 	private static boolean optifineBreak = false;
@@ -148,6 +152,21 @@ public class MekanismRenderer
 		}
 	}
 	
+	public static ResourceLocation getColorResource(EnumColor color)
+	{
+		return MekanismUtils.getResource(ResourceType.TEXTURE_BLOCKS, "Overlay" + color.friendlyName.replace(" ", "") + ".png");
+	}
+	
+	public static Icon getColorIcon(EnumColor color)
+	{
+		if(colors[color.ordinal()] == null)
+		{
+			colors[color.ordinal()] = getTextureMap(0).registerIcon("mekanism:Overlay" + color.getName());
+		}
+		
+		return colors[color.ordinal()];
+	}
+	
     public static void glowOn() 
     {
         GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
diff --git a/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java
index 86cad1609..d6a1d3bc9 100644
--- a/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java
+++ b/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java
@@ -34,39 +34,10 @@ import cpw.mods.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class RenderConfigurableMachine extends TileEntitySpecialRenderer
 {
-	private static Icon[] coloredOverlays;
-	
 	private Minecraft mc = FMLClientHandler.instance().getClient();
 	
 	private HashMap<ForgeDirection, HashMap<EnumColor, DisplayInteger>> cachedOverlays = new HashMap<ForgeDirection, HashMap<EnumColor, DisplayInteger>>();
 	
-	public RenderConfigurableMachine()
-	{
-		if(coloredOverlays == null)
-		{
-			coloredOverlays = new Icon[16];
-			
-			TextureMap registrar = MekanismRenderer.getTextureMap(0);
-			
-			coloredOverlays[0] = registrar.registerIcon("mekanism:OverlayBlack");
-			coloredOverlays[1] = registrar.registerIcon("mekanism:OverlayDarkBlue");
-			coloredOverlays[2] = registrar.registerIcon("mekanism:OverlayDarkGreen");
-			coloredOverlays[3] = registrar.registerIcon("mekanism:OverlayDarkAqua");
-			coloredOverlays[4] = registrar.registerIcon("mekanism:OverlayDarkRed");
-			coloredOverlays[5] = registrar.registerIcon("mekanism:OverlayPurple");
-			coloredOverlays[6] = registrar.registerIcon("mekanism:OverlayOrange");
-			coloredOverlays[7] = registrar.registerIcon("mekanism:OverlayGrey");
-			coloredOverlays[8] = registrar.registerIcon("mekanism:OverlayDarkGrey");
-			coloredOverlays[9] = registrar.registerIcon("mekanism:OverlayIndigo");
-			coloredOverlays[10] = registrar.registerIcon("mekanism:OverlayBrightGreen");
-			coloredOverlays[11] = registrar.registerIcon("mekanism:OverlayAqua");
-			coloredOverlays[12] = registrar.registerIcon("mekanism:OverlayRed");
-			coloredOverlays[13] = registrar.registerIcon("mekanism:OverlayPink");
-			coloredOverlays[14] = registrar.registerIcon("mekanism:OverlayYellow");
-			coloredOverlays[15] = registrar.registerIcon("mekanism:OverlayWhite");
-		}
-	}
-	
 	@Override
 	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick)
 	{
@@ -133,7 +104,7 @@ public class RenderConfigurableMachine extends TileEntitySpecialRenderer
 		
 		Model3D toReturn = new Model3D();
 		toReturn.baseBlock = Block.stone;
-		toReturn.setTexture(coloredOverlays[color.ordinal()]);
+		toReturn.setTexture(MekanismRenderer.getColorIcon(color));
 		
 		DisplayInteger display = new DisplayInteger();
 		
diff --git a/common/mekanism/common/HashList.java b/common/mekanism/common/HashList.java
new file mode 100644
index 000000000..dbb4e3e65
--- /dev/null
+++ b/common/mekanism/common/HashList.java
@@ -0,0 +1,56 @@
+package mekanism.common;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public class HashList<T> implements Iterable<T>
+{
+	private ArrayList<T> list = new ArrayList<T>();
+	
+	public boolean contains(T obj)
+	{
+		return list.contains(obj);
+	}
+	
+	public void clear()
+	{
+		list.clear();
+	}
+	
+	public T get(int index)
+	{
+		return list.get(index);
+	}
+	
+	public void add(T obj)
+	{
+		if(!list.contains(obj))
+		{
+			list.add(obj);
+		}
+	}
+	
+	public void add(int index, T obj)
+	{
+		if(!list.contains(obj))
+		{
+			list.add(index, obj);
+		}
+	}
+	
+	public int indexOf(T obj)
+	{
+		return list.indexOf(obj);
+	}
+	
+	public int size()
+	{
+		return list.size();
+	}
+	
+	@Override
+	public Iterator iterator() 
+	{
+		return list.iterator();
+	}
+}
diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java
index 272a0c3e7..8773e0a47 100644
--- a/common/mekanism/common/Mekanism.java
+++ b/common/mekanism/common/Mekanism.java
@@ -59,6 +59,7 @@ import mekanism.common.network.PacketDataRequest;
 import mekanism.common.network.PacketDigitUpdate;
 import mekanism.common.network.PacketElectricBowState;
 import mekanism.common.network.PacketElectricChest;
+import mekanism.common.network.PacketFilterUpdate;
 import mekanism.common.network.PacketLogisticalSorterGui;
 import mekanism.common.network.PacketPortableTeleport;
 import mekanism.common.network.PacketPortalFX;
@@ -1138,6 +1139,7 @@ public class Mekanism
 		PacketHandler.registerPacket(PacketRedstoneControl.class);
 		PacketHandler.registerPacket(PacketWalkieTalkieState.class);
 		PacketHandler.registerPacket(PacketLogisticalSorterGui.class);
+		PacketHandler.registerPacket(PacketFilterUpdate.class);
 		
 		//Donators
 		donators.add("mrgreaper"); 
diff --git a/common/mekanism/common/network/PacketFilterUpdate.java b/common/mekanism/common/network/PacketFilterUpdate.java
new file mode 100644
index 000000000..8f42dfee4
--- /dev/null
+++ b/common/mekanism/common/network/PacketFilterUpdate.java
@@ -0,0 +1,66 @@
+package mekanism.common.network;
+
+import java.io.DataOutputStream;
+
+import mekanism.api.Object3D;
+import mekanism.common.Mekanism;
+import mekanism.common.tileentity.TileEntityLogisticalSorter;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+import com.google.common.io.ByteArrayDataInput;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+
+public class PacketFilterUpdate implements IMekanismPacket
+{
+	public Object3D object3D;
+	
+	public int type;
+	
+	@Override
+	public String getName()
+	{
+		return "FilterUpdate";
+	}
+	
+	@Override
+	public IMekanismPacket setParams(Object... data)
+	{
+		object3D = (Object3D)data[0];
+		type = (Integer)data[1];
+		
+		return this;
+	}
+
+	@Override
+	public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception 
+	{
+		int x = dataStream.readInt();
+		int y = dataStream.readInt();
+		int z = dataStream.readInt();
+		
+		int id = dataStream.readInt();
+		
+		int type = dataStream.readInt();
+		
+		World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(id);
+		
+		if(worldServer != null && worldServer.getBlockTileEntity(x, y, z) instanceof TileEntityLogisticalSorter)
+		{
+			player.openGui(Mekanism.instance, 26+type, worldServer, x, y, z);
+		}
+	}
+
+	@Override
+	public void write(DataOutputStream dataStream) throws Exception
+	{
+		dataStream.writeInt(object3D.xCoord);
+		dataStream.writeInt(object3D.yCoord);
+		dataStream.writeInt(object3D.zCoord);
+		
+		dataStream.writeInt(object3D.dimensionId);
+		
+		dataStream.writeInt(type);
+	}
+}
diff --git a/common/mekanism/common/network/PacketLogisticalSorterGui.java b/common/mekanism/common/network/PacketLogisticalSorterGui.java
index 304117adc..2e5ae7eb8 100644
--- a/common/mekanism/common/network/PacketLogisticalSorterGui.java
+++ b/common/mekanism/common/network/PacketLogisticalSorterGui.java
@@ -3,10 +3,9 @@ package mekanism.common.network;
 import java.io.DataOutputStream;
 
 import mekanism.api.Object3D;
-import mekanism.common.ITileNetwork;
 import mekanism.common.Mekanism;
+import mekanism.common.tileentity.TileEntityLogisticalSorter;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 import com.google.common.io.ByteArrayDataInput;
@@ -47,18 +46,9 @@ public class PacketLogisticalSorterGui implements IMekanismPacket
 		
 		World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(id);
 		
-		if(worldServer != null && worldServer.getBlockTileEntity(x, y, z) instanceof ITileNetwork)
+		if(worldServer != null && worldServer.getBlockTileEntity(x, y, z) instanceof TileEntityLogisticalSorter)
 		{
-			TileEntity tileEntity = worldServer.getBlockTileEntity(x, y, z);
-			
-			if(type == 0)
-			{
-				player.openGui(Mekanism.instance, 27, worldServer, x, y, z);
-			}
-			else if(type == 1)
-			{
-				player.openGui(Mekanism.instance, 28, worldServer, x, y, z);
-			}
+			player.openGui(Mekanism.instance, 26+type, worldServer, x, y, z);
 		}
 	}
 
diff --git a/common/mekanism/common/tileentity/TileEntityBasicBlock.java b/common/mekanism/common/tileentity/TileEntityBasicBlock.java
index 0d40b6252..3be9cbb63 100644
--- a/common/mekanism/common/tileentity/TileEntityBasicBlock.java
+++ b/common/mekanism/common/tileentity/TileEntityBasicBlock.java
@@ -31,6 +31,8 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
 	/** A timer used to send packets to clients. */
 	public int packetTick;
 	
+	public boolean doAutoSync = true;
+	
 	public Set<ITileComponent> components = new HashSet<ITileComponent>();
 	
 	@Override
@@ -45,7 +47,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
 		
 		if(!worldObj.isRemote)
 		{
-			if(playersUsing.size() > 0)
+			if(doAutoSync && playersUsing.size() > 0)
 			{
 				PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList())), Object3D.get(this), 50D);
 			}
diff --git a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java b/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java
index 77bbb37ab..922e8d3c9 100644
--- a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java
+++ b/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java
@@ -1,11 +1,10 @@
 package mekanism.common.tileentity;
 
 import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
 
 import mekanism.api.EnumColor;
 import mekanism.api.Object3D;
+import mekanism.common.HashList;
 import mekanism.common.IActiveState;
 import mekanism.common.IRedstoneControl;
 import mekanism.common.PacketHandler;
@@ -27,7 +26,7 @@ import com.google.common.io.ByteArrayDataInput;
 
 public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState
 {
-	public Set<TransporterFilter> filters = new HashSet<TransporterFilter>();
+	public HashList<TransporterFilter> filters = new HashList<TransporterFilter>();
 	
 	public RedstoneControl controlType = RedstoneControl.DISABLED;
 	
@@ -43,6 +42,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 	{
 		super("LogisticalSorter", MachineType.LOGISTICAL_SORTER.baseEnergy);
 		inventory = new ItemStack[1];
+		doAutoSync = false;
 	}
 	
 	@Override
@@ -201,7 +201,15 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
 		return new int[] {0};
 	}
 
-
+	@Override
+	public void openChest()
+	{
+		if(!worldObj.isRemote)
+		{
+			PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList())), Object3D.get(this), 50D);
+		}
+	}
+	
 	@Override
 	public RedstoneControl getControlType() 
 	{
diff --git a/common/mekanism/common/transporter/OreDictFilter.java b/common/mekanism/common/transporter/OreDictFilter.java
index 4b4058a22..8c56be936 100644
--- a/common/mekanism/common/transporter/OreDictFilter.java
+++ b/common/mekanism/common/transporter/OreDictFilter.java
@@ -16,7 +16,40 @@ public class OreDictFilter extends TransporterFilter
 	@Override
 	public boolean canFilter(ItemStack itemStack)
 	{
-		return MekanismUtils.oreDictCheck(itemStack, oreDictName);
+		String oreKey = MekanismUtils.getOreDictName(itemStack);
+		
+		if(oreKey == null)
+		{
+			return false;
+		}
+		
+		if(oreDictName.equals(oreKey))
+		{
+			return true;
+		}
+		else if(oreDictName.endsWith("*") && !oreDictName.startsWith("*"))
+		{
+			if(oreKey.startsWith(oreDictName.substring(0, oreDictName.length()-1)))
+			{
+				return true;
+			}
+		}
+		else if(oreDictName.startsWith("*") && !oreDictName.endsWith("*"))
+		{
+			if(oreKey.endsWith(oreDictName.substring(1)))
+			{
+				return true;
+			}
+		}
+		else if(oreDictName.startsWith("*") && oreDictName.endsWith("*"))
+		{
+			if(oreKey.contains(oreDictName.substring(1, oreDictName.length()-1)))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 	
 	@Override
diff --git a/common/mekanism/common/util/MekanismUtils.java b/common/mekanism/common/util/MekanismUtils.java
index 6299ab878..24c579be5 100644
--- a/common/mekanism/common/util/MekanismUtils.java
+++ b/common/mekanism/common/util/MekanismUtils.java
@@ -1,7 +1,5 @@
 package mekanism.common.util;
 
-import ic2.api.Direction;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -10,7 +8,9 @@ import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 import mekanism.api.EnumColor;
 import mekanism.api.IConfigurable;
@@ -36,7 +36,6 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
 import mekanism.common.tileentity.TileEntityBoundingBlock;
 import mekanism.common.tileentity.TileEntityDynamicTank;
 import mekanism.common.tileentity.TileEntityElectricChest;
-import mekanism.common.tileentity.TileEntityLogisticalTransporter;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -453,6 +452,37 @@ public final class MekanismUtils
     	return hasResource;
     }
     
+    public static String getOreDictName(ItemStack check)
+    {
+        HashMap<Integer, ArrayList<ItemStack>> oreStacks = (HashMap<Integer, ArrayList<ItemStack>>)MekanismUtils.getPrivateValue(null, OreDictionary.class, new String[] {"oreStacks"});
+        
+        int idFound = -1;
+        
+        for(Map.Entry<Integer, ArrayList<ItemStack>> entry : oreStacks.entrySet())
+        {
+        	for(ItemStack stack : entry.getValue())
+        	{
+        		if(stack.isItemEqual(check))
+        		{
+        			idFound = entry.getKey();
+        			break;
+        		}
+        	}
+        	
+        	if(idFound != -1)
+        	{
+        		break;
+        	}
+        }
+        
+        if(idFound == -1)
+        {
+        	return null;
+        }
+        
+        return OreDictionary.getOreName(idFound);
+    }
+    
     /**
      * Returns an integer facing that converts a world-based orientation to a machine-based oriention.
      * @param side - world based
diff --git a/common/mekanism/common/util/TransporterUtils.java b/common/mekanism/common/util/TransporterUtils.java
index 1bf4c9844..7a59e9429 100644
--- a/common/mekanism/common/util/TransporterUtils.java
+++ b/common/mekanism/common/util/TransporterUtils.java
@@ -353,6 +353,16 @@ public final class TransporterUtils
 		return null;
 	}
 	
+	public static EnumColor increment(EnumColor color)
+	{
+		if(colors.indexOf(color) == colors.size()-1)
+		{
+			return colors.get(0);
+		}
+		
+		return colors.get(colors.indexOf(color)+1);
+	}
+	
     public static void incrementColor(TileEntityLogisticalTransporter tileEntity)
     {
     	if(tileEntity.color == null)
diff --git a/resources/assets/mekanism/gui/GuiItemStackFilter.png b/resources/assets/mekanism/gui/GuiItemStackFilter.png
index 82347eff98e068761320f8fee032c3f8f9f42248..e7a715d26ccaf179c8eafb90a081a27f7290a4a2 100644
GIT binary patch
delta 2865
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

delta 3872
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
Wc4zI>^PB|G=cL)$69vcJBmW72;)y8$

diff --git a/resources/assets/mekanism/gui/GuiOreDictFilter.png b/resources/assets/mekanism/gui/GuiOreDictFilter.png
index 82347eff98e068761320f8fee032c3f8f9f42248..ff64b4b62bf212cf870ecd333ccd4344e3d53072 100644
GIT binary patch
delta 3221
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

delta 3872
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
WyR&!dc}@c8bJFbWiNfRVk^cnQL5U3j

diff --git a/resources/assets/mekanism/gui/GuiRobitRepair.png b/resources/assets/mekanism/gui/GuiRobitRepair.png
index e71a612ff18c51a07567d483832ad337b3e3c879..0f756159b0863b906eb4fb0b25f18f6e5f2259af 100644
GIT binary patch
delta 8408
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

delta 8537
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
ba};!mZgzo=cNJON0P`|7Fvl0`IY;~lU<sH)