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

A bit of work on teleporter localization. There's something weird going on, though.

Browse source
This commit is contained in:
Aidan C. Brady 2014-07-14 12:57:57 -04:00
parent 1094475344
commit a24bd2e7ad
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/mekanism/common/tile/TileEntityTeleporter.java
View file

@ -17,6 +17,7 @@ import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.network.PacketPortalFX.PortalFXMessage;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.player.EntityPlayerMP;
@ -57,7 +58,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IPe
public boolean prevShouldRender;
/** This teleporter's current status. */
public String status = (EnumColor.DARK_RED + "Not ready.");
public String status = (EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.notReady"));
public TileEntityTeleporter()
{
@ -99,22 +100,22 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IPe
switch(canTeleport())
{
case 1:
status = EnumColor.DARK_GREEN + "Ready.";
status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.teleporter.ready");
break;
case 2:
status = EnumColor.DARK_RED + "No frame.";
status = EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.noFrame");
break;
case 3:
status = EnumColor.DARK_RED + "No link found.";
status = EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.noLink");
break;
case 4:
status = EnumColor.DARK_RED + "Links > 2.";
status = EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.exceeds");
break;
case 5:
status = EnumColor.DARK_RED + "Needs energy.";
status = EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.needsEnergy");
break;
case 6:
status = EnumColor.DARK_GREEN + "Idle.";
status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.teleporter.idle");
break;
}

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

@ -423,6 +423,14 @@ gui.logisticalSorter.roundRobin=Round-robin
gui.electricChest.editPassword=Edit Password
gui.teleporter.notReady=Not ready
gui.teleporter.ready=Ready
gui.teleporter.noFrame=No frame
gui.teleporter.noLink=No link
gui.teleporter.exceeds=Links > 2
gui.teleporter.needsEnergy=Needs energy
gui.teleporter.idle=Idle
gui.digitalMinerConfig=Digital Miner Config
gui.digitalMiner.autoPull=Auto-pull