diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index ef8ade38..9a377c03 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -108,6 +108,7 @@ tile.blockPowerMonitor.name=Power Monitor tile.blockVat.name=The Vat tile.blockCombustionGenerator.name=Combustion Generator tile.blockFarmStation.name=Farming Station [NOT IMPLEMENTED] +enderio.machine.tooltip.configured=(Configured) //Travel tile.blockTravelAnchor.name=Travel Anchor @@ -136,13 +137,19 @@ item.darkSteel_boots.name=Dark Boots item.darkSteel_sword.name=The Ender item.darkSteel_pickaxe.name=Dark Pick - enderio.item.tooltip.power=Power: enderio.item.tooltip.showDetails= enderio.item.darkSteel.tooltip.power=Power: enderio.item.darkSteel.tooltip.durability=Durability: enderio.item.darkSteel.tooltip.line1=Half durability damage absorbed by power. +enderio.item.darkSteel_pickaxe.tooltip.effPowered=Efficiency when powered +enderio.item.darkSteel_pickaxe.tooltip.effObs=Efficiency breaking obsidian + +enderio.item.darkSteel_sword.tooltip.line1=Increased skull and ender pearl drops. +enderio.item.darkSteel_sword.tooltip.line2=Enderman can't teleport once hit. +enderio.item.darkSteel_sword.tooltip.line3=+1 Damage when Powered + //------GUI diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java index bb53f14e..2ec79c26 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java @@ -158,10 +158,9 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - //TODO: Localize list.add(Lang.localize("item.darkSteel.tooltip.line1")); - list.add(EnumChatFormatting.BLUE + "+" + Config.darkSteelPickEffeciencyBoostWhenPowered + " Effeciency when powered"); - list.add(EnumChatFormatting.BLUE + "+" + Config.darkSteelPickEffeciencyObsidian + " Effeciency breaking obsidian "); + list.add(EnumChatFormatting.BLUE + "+" + Config.darkSteelPickEffeciencyBoostWhenPowered + " " + Lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); + list.add(EnumChatFormatting.BLUE + "+" + Config.darkSteelPickEffeciencyObsidian + " " + Lang.localize("item.darkSteel_pickaxe.tooltip.effObs") + " "); list.add(EnumChatFormatting.BLUE + " (cost " + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian / 10) + " " + PowerDisplayUtil.abrevation() + ")"); diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java index 5bb6f9ca..de2e27cb 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java @@ -222,19 +222,16 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - //TODO: Localize - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { list.add(Lang.localize("item.darkSteel.tooltip.line1")); - list.add("Increased skull and ender pearl drops."); - list.add("Enderman can't teleport once hit."); - list.add(EnumChatFormatting.BLUE + "+1 Damage when Powered"); + list.add(Lang.localize("item.darkSteel_sword.tooltip.line1")); + list.add(Lang.localize("item.darkSteel_sword.tooltip.line2")); + list.add(EnumChatFormatting.BLUE + Lang.localize("item.darkSteel_sword.tooltip.line3")); } else { list.add(ItemUtil.getDurabilityString(itemstack)); list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); list.add(EnumChatFormatting.WHITE + "" + EnumChatFormatting.ITALIC + Lang.localize("item.tooltip.showDetails")); } - } public ItemStack createItemStack() { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 108411c1..83a588f9 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -27,6 +27,7 @@ import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; import crazypants.util.InventoryWrapper; import crazypants.util.ItemUtil; +import crazypants.util.Lang; import crazypants.vecmath.VecmathUtil; public abstract class AbstractMachineEntity extends TileEntityEio implements ISidedInventory, IInternalPowerReceptor, IMachine, IRedstoneModeControlable, IIoConfigurable { @@ -563,14 +564,13 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi root.setBoolean("eio.abstractMachine", true); writeCommon(root); - //setStackDisplayName String name; if(stack.hasDisplayName()) { name = stack.getDisplayName(); } else { name = getBlockType().getLocalizedName(); } - name += " (Configured)"; + name += " " + Lang.localize("machine.tooltip.configured"); stack.setStackDisplayName(name); }