diff --git a/common/mekanism/client/gui/GuiOreDictFilter.java b/common/mekanism/client/gui/GuiOreDictFilter.java index b0a9cd9e8..6620fbeaa 100644 --- a/common/mekanism/client/gui/GuiOreDictFilter.java +++ b/common/mekanism/client/gui/GuiOreDictFilter.java @@ -267,6 +267,12 @@ public class GuiOreDictFilter extends GuiMekanism { filter.color = TransporterUtils.increment(filter.color); } + + if(xAxis >= 131 && xAxis <= 143 && yAxis >= 48 && yAxis <= 60) + { + mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); + setOreDictKey(); + } } } diff --git a/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java b/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java index 7398cb148..19cbe41ad 100644 --- a/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java +++ b/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java @@ -93,7 +93,7 @@ public class RenderLogisticalTransporter extends TileEntitySpecialRenderer MekanismRenderer.glowOn(); GL11.glDisable(GL11.GL_CULL_FACE); GL11.glColor4f(stack.color.getColor(0), stack.color.getColor(1), stack.color.getColor(2), 1.0F); - GL11.glTranslatef((float)(x + 0.5 + offset.xCoord*progress), (float)(y + 0.5 + offset.yCoord*progress - entityItem.yOffset - itemFix), (float)(z + 0.5 + offset.zCoord*progress)); + GL11.glTranslatef((float)(x + 0.5 + offset.xCoord*progress), (float)(y + 0.5 + offset.yCoord*progress - entityItem.yOffset - 0.1F), (float)(z + 0.5 + offset.zCoord*progress)); modelBox.render(0.0625F); MekanismRenderer.glowOff(); GL11.glPopMatrix(); diff --git a/common/mekanism/common/network/PacketNewFilter.java b/common/mekanism/common/network/PacketNewFilter.java index bd6b69efd..e5e806fdd 100644 --- a/common/mekanism/common/network/PacketNewFilter.java +++ b/common/mekanism/common/network/PacketNewFilter.java @@ -19,8 +19,6 @@ public class PacketNewFilter implements IMekanismPacket { public Object3D object3D; - public int type; - public TransporterFilter filter; @Override @@ -47,8 +45,6 @@ public class PacketNewFilter implements IMekanismPacket 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) diff --git a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java b/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java index ead1687c5..b1b6fd9e5 100644 --- a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java +++ b/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java @@ -71,19 +71,19 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen SlotInfo inInventory = TransporterUtils.takeItem(inventory, facing); - EnumColor color = null; - - for(TransporterFilter filter : filters) - { - if(filter.canFilter(inInventory.itemStack)) - { - color = filter.color; - break; - } - } - if(inInventory != null && inInventory.itemStack != null) { + EnumColor color = null; + + for(TransporterFilter filter : filters) + { + if(filter.canFilter(inInventory.itemStack)) + { + color = filter.color; + break; + } + } + if(TransporterUtils.insert(this, transporter, inInventory.itemStack, color)) { inventory.setInventorySlotContents(inInventory.slotID, null);