tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'development' into 1.8

Browse source
This commit is contained in:
Aidan C. Brady 2014-07-13 23:52:29 -04:00
commit 23b6ce5105
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/client/gui/GuiMModIDFilter.java
View file

@ -138,7 +138,7 @@ public class GuiMModIDFilter extends GuiMekanism
Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0));
} }
else { else {
status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.noKey"); status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.noID");
ticker = 20; ticker = 20;
} }
} }

6
src/main/java/mekanism/common/CommonPlayerTickHandler.java
View file

@ -29,7 +29,7 @@ public class CommonPlayerTickHandler
public void tickEnd(EntityPlayer player) 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(); ItemPortableTeleporter item = (ItemPortableTeleporter)player.getCurrentEquippedItem().getItem();
ItemStack itemstack = player.getCurrentEquippedItem(); ItemStack itemstack = player.getCurrentEquippedItem();
@ -57,7 +57,6 @@ public class CommonPlayerTickHandler
Mekanism.packetHandler.sendTo(new StatusUpdateMessage(1), (EntityPlayerMP)player); Mekanism.packetHandler.sendTo(new StatusUpdateMessage(1), (EntityPlayerMP)player);
} }
} }
return;
} }
else if(Mekanism.teleporters.get(teleCode).size() > 2) else if(Mekanism.teleporters.get(teleCode).size() > 2)
{ {
@ -66,7 +65,6 @@ public class CommonPlayerTickHandler
item.setStatus(itemstack, 3); item.setStatus(itemstack, 3);
Mekanism.packetHandler.sendTo(new StatusUpdateMessage(3), (EntityPlayerMP)player); Mekanism.packetHandler.sendTo(new StatusUpdateMessage(3), (EntityPlayerMP)player);
} }
return;
} }
else { else {
if(item.getStatus(itemstack) != 4) if(item.getStatus(itemstack) != 4)
@ -74,7 +72,6 @@ public class CommonPlayerTickHandler
item.setStatus(itemstack, 4); item.setStatus(itemstack, 4);
Mekanism.packetHandler.sendTo(new StatusUpdateMessage(4), (EntityPlayerMP)player); Mekanism.packetHandler.sendTo(new StatusUpdateMessage(4), (EntityPlayerMP)player);
} }
return;
} }
} }
else { else {
@ -83,7 +80,6 @@ public class CommonPlayerTickHandler
item.setStatus(itemstack, 4); item.setStatus(itemstack, 4);
Mekanism.packetHandler.sendTo(new StatusUpdateMessage(4), (EntityPlayerMP)player); Mekanism.packetHandler.sendTo(new StatusUpdateMessage(4), (EntityPlayerMP)player);
} }
return;
} }
} }

5
src/main/resources/assets/mekanism/lang/en_US.lang
View file

@ -344,7 +344,6 @@ gui.energy=Energy
gui.gas=Gas gui.gas=Gas
gui.dumping=Dumping gui.dumping=Dumping
gui.modID=Mod ID gui.modID=Mod ID
gui.modIDFilter.noKey=No mod ID
gui.key=Key gui.key=Key
gui.id=ID gui.id=ID
gui.finished=Finished gui.finished=Finished
@ -377,11 +376,11 @@ gui.seismicReader.reading=Reading
gui.filterSelect.title=Create New Filter gui.filterSelect.title=Create New Filter
gui.oredictFilter=OreDict Filter gui.oredictFilter=OreDict Filter
gui.oredictFilter.noKey=No key entered gui.oredictFilter.noKey=No key
gui.oredictFilter.sameKey=Same key gui.oredictFilter.sameKey=Same key
gui.modIDFilter=Mod ID Filter gui.modIDFilter=Mod ID Filter
gui.modIDFilter.noID=No ID entered gui.modIDFilter.noID=No ID
gui.modIDFilter.sameID=Same ID gui.modIDFilter.sameID=Same ID
gui.itemFilter=Item Filter gui.itemFilter=Item Filter