From 4334690f78a6e8f7e9d2183d8997bae1e3fe0abd Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 9 Jun 2014 15:29:00 +0200 Subject: [PATCH] Improved localization --- .../mekanism/client/gui/GuiRobitMain.java | 8 ++++---- .../common/item/ItemBlockMachine.java | 19 ++++++++++--------- .../mekanism/common/item/ItemElectricBow.java | 3 ++- .../mekanism/common/item/ItemEnergized.java | 2 +- .../common/item/ItemBlockGenerator.java | 6 +++--- .../resources/assets/mekanism/lang/en_US.lang | 16 ++++++++++++++++ 6 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 797ff7a39..8b103bc76 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -108,10 +108,10 @@ public class GuiRobitMain extends GuiMekanism { CharSequence owner = robit.getOwnerName().length() > 14 ? robit.getOwnerName().subSequence(0, 14) : robit.getOwnerName(); fontRendererObj.drawString(MekanismUtils.localize("gui.robit.greeting") + " " + robit.getTranslatedEntityName() + "!", 29, 18, 0x00CD00); - fontRendererObj.drawString("Energy: " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00); - fontRendererObj.drawString("Following: " + robit.getFollowing(), 29, 45-4, 0x00CD00); - fontRendererObj.drawString("Drop pickup: " + robit.getDropPickup(), 29, 54-4, 0x00CD00); - fontRendererObj.drawString("Owner: " + owner, 29, 63-4, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.localize("gui.robit.following") + ": " + robit.getFollowing(), 29, 45-4, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.localize("gui.robit.dropPickup") + ": " + robit.getDropPickup(), 29, 54-4, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.localize("gui.robit.owner") + ": " + owner, 29, 63-4, 0x00CD00); } int xAxis = (mouseX - (width - xSize) / 2); diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 09d0234ad..fc4ad2570 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -11,6 +11,7 @@ import mekanism.api.EnumColor; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.api.gas.GasStack; +import mekanism.client.MekanismKeyHandler; import mekanism.common.IElectricChest; import mekanism.common.IFactory; import mekanism.common.IInvConfiguration; @@ -127,25 +128,25 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - list.add("Hold " + EnumColor.AQUA + EnumColor.INDIGO + "shift" + EnumColor.GREY + " for more details."); - list.add("Hold " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + "M" + EnumColor.GREY + " for a description."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + Keyboard.getKeyName(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); } else if(!Keyboard.isKeyDown(Keyboard.KEY_M)) { if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { - list.add(EnumColor.INDIGO + "Recipe Type: " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getName()); + list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getName()); } if(type == MachineType.ELECTRIC_CHEST) { - list.add(EnumColor.INDIGO + "Authenticated: " + EnumColor.GREY + getAuthenticated(itemstack)); - list.add(EnumColor.INDIGO + "Locked: " + EnumColor.GREY + getLocked(itemstack)); + list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.auth") + ": " + EnumColor.GREY + getAuthenticated(itemstack)); + list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.locked") + ": " + EnumColor.GREY + getLocked(itemstack)); } if(type != MachineType.LOGISTICAL_SORTER) { - list.add(EnumColor.BRIGHT_GREEN + "Stored Energy: " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergyStored(itemstack))); + list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergyStored(itemstack))); } if(hasTank(itemstack)) @@ -158,13 +159,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(supportsUpgrades(itemstack)) { - list.add(EnumColor.PURPLE + "Energy: " + EnumColor.GREY + "x" + (getEnergyMultiplier(itemstack)+1)); - list.add(EnumColor.PURPLE + "Speed: " + EnumColor.GREY + "x" + (getSpeedMultiplier(itemstack)+1)); + list.add(EnumColor.PURPLE + MekanismUtils.localize("tooltip.upgrade.energy") + ": " + EnumColor.GREY + "x" + (getEnergyMultiplier(itemstack)+1)); + list.add(EnumColor.PURPLE + MekanismUtils.localize("tooltip.upgrade.speed") + ": " + EnumColor.GREY + "x" + (getSpeedMultiplier(itemstack)+1)); } if(type != MachineType.CHARGEPAD && type != MachineType.LOGISTICAL_SORTER) { - list.add(EnumColor.AQUA + "Inventory: " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } } else { diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 1c3851c4b..f3200a490 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; +import mekanism.common.util.MekanismUtils; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; @@ -24,7 +25,7 @@ public class ItemElectricBow extends ItemEnergized public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { super.addInformation(itemstack, entityplayer, list, flag); - list.add(EnumColor.PINK + "Fire Mode: " + EnumColor.GREY + (getFireState(itemstack) ? "ON" : "OFF")); + list.add(EnumColor.PINK + MekanismUtils.localize("tooltip.fireMode") + ": " + EnumColor.GREY + (getFireState(itemstack) ? "ON" : "OFF")); } @Override diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 0708e9797..991fa05db 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -35,7 +35,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumColor.AQUA + "Stored Energy: " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } public ItemStack getUnchargedItem() diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 024f3589b..10a8a8d39 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -84,10 +84,10 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - list.add("Hold " + EnumColor.AQUA + "shift" + EnumColor.GREY + " for details."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); } else { - list.add(EnumColor.BRIGHT_GREEN + "Stored Energy: " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); if(hasTank(itemstack)) { @@ -97,7 +97,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } } - list.add(EnumColor.AQUA + "Inventory: " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index c927373a4..f4b8566a6 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -360,6 +360,9 @@ gui.robit.toggleFollow=Toggle 'follow' mode gui.robit.rename=Rename this Robit gui.robit.teleport=Teleport back home gui.robit.togglePickup=Toggle 'drop pickup' mode +gui.robit.following=Following +gui.robit.dropPickup=Drop pickup +gui.robit.owner=Owner gui.password.setPassword=Set password gui.password.enterPassword=Enter password @@ -401,6 +404,19 @@ tooltip.configurator.noLink=No link tooltip.configurator.linkMsg=Bound to tooltip.configurator.dim=dimension +tooltip.upgrade.speed=Speed +tooltip.upgrade.energy=Energy + +tooltip.inventory=Inventory +tooltip.storedEnergy=Stored energy +tooltip.auth=Authenticated +tooltip.locked=Locked +tooltip.recipeType=Recipe type +tooltip.hold=Hold +tooltip.forDesc=for a description +tooltip.forDetails=for details +tooltip.fireMode=Fire Mode + tooltip.filterCard.got=Retrieved filter data from %s tooltip.filterCard.set=Injected filter data of type %s tooltip.filterCard.unequal=Unequal filter data formats