diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index e34df10aa..d75085c29 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -138,7 +138,7 @@ public class GuiMModIDFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } else { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.noKey"); + status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.noID"); ticker = 20; } } diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index b7cc5f617..423aa8b20 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -29,7 +29,7 @@ public class CommonPlayerTickHandler public void tickEnd(EntityPlayer player) { - if(player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemPortableTeleporter) + if(!player.worldObj.isRemote && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemPortableTeleporter) { ItemPortableTeleporter item = (ItemPortableTeleporter)player.getCurrentEquippedItem().getItem(); ItemStack itemstack = player.getCurrentEquippedItem(); @@ -57,7 +57,6 @@ public class CommonPlayerTickHandler Mekanism.packetHandler.sendTo(new StatusUpdateMessage(1), (EntityPlayerMP)player); } } - return; } else if(Mekanism.teleporters.get(teleCode).size() > 2) { @@ -66,7 +65,6 @@ public class CommonPlayerTickHandler item.setStatus(itemstack, 3); Mekanism.packetHandler.sendTo(new StatusUpdateMessage(3), (EntityPlayerMP)player); } - return; } else { if(item.getStatus(itemstack) != 4) @@ -74,7 +72,6 @@ public class CommonPlayerTickHandler item.setStatus(itemstack, 4); Mekanism.packetHandler.sendTo(new StatusUpdateMessage(4), (EntityPlayerMP)player); } - return; } } else { @@ -83,7 +80,6 @@ public class CommonPlayerTickHandler item.setStatus(itemstack, 4); Mekanism.packetHandler.sendTo(new StatusUpdateMessage(4), (EntityPlayerMP)player); } - return; } } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 8fcb939c9..aa67b96c0 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -344,7 +344,6 @@ gui.energy=Energy gui.gas=Gas gui.dumping=Dumping gui.modID=Mod ID -gui.modIDFilter.noKey=No mod ID gui.key=Key gui.id=ID gui.finished=Finished @@ -377,11 +376,11 @@ gui.seismicReader.reading=Reading gui.filterSelect.title=Create New Filter gui.oredictFilter=OreDict Filter -gui.oredictFilter.noKey=No key entered +gui.oredictFilter.noKey=No key gui.oredictFilter.sameKey=Same key gui.modIDFilter=Mod ID Filter -gui.modIDFilter.noID=No ID entered +gui.modIDFilter.noID=No ID gui.modIDFilter.sameID=Same ID gui.itemFilter=Item Filter