From c8fb800c1a3a5b22d6a3fcc850e6b7bd776871c6 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 13 Jun 2014 00:16:02 +0200 Subject: [PATCH] Updated localization yet again, fixed a small bug --- src/main/java/mekanism/client/MekKeyHandler.java | 1 - .../java/mekanism/client/MekanismKeyHandler.java | 5 +++-- .../java/mekanism/client/gui/GuiGasTank.java | 4 ++-- .../client/render/item/ItemRenderingHandler.java | 2 ++ .../mekanism/common/item/ItemConfigurator.java | 2 +- .../java/mekanism/common/util/MekanismUtils.java | 10 +++++----- .../mekanism/tools/item/ItemMekanismArmor.java | 3 ++- .../mekanism/tools/item/ItemMekanismHoe.java | 3 ++- .../mekanism/tools/item/ItemMekanismSword.java | 3 ++- .../mekanism/tools/item/ItemMekanismTool.java | 3 ++- .../resources/assets/mekanism/lang/en_US.lang | 16 ++++++++++++++++ 11 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/main/java/mekanism/client/MekKeyHandler.java b/src/main/java/mekanism/client/MekKeyHandler.java index ba56a73b6..94bce99ec 100644 --- a/src/main/java/mekanism/client/MekKeyHandler.java +++ b/src/main/java/mekanism/client/MekKeyHandler.java @@ -104,5 +104,4 @@ public abstract class MekKeyHandler * was it an end or start tick which fired the key */ public abstract void keyUp(Type types, KeyBinding kb, boolean tickEnd); - } \ No newline at end of file diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 836028ea1..7373cd6e2 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -1,5 +1,6 @@ package mekanism.client; +import mekanism.common.util.MekanismUtils; import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; @@ -16,8 +17,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class MekanismKeyHandler extends MekKeyHandler { public static final String keybindCategory = "key.mekanism.category"; - public static KeyBinding modeSwitchKey = new KeyBinding("Mekanism Mode Switch", Keyboard.KEY_M, keybindCategory); - public static KeyBinding voiceKey = new KeyBinding("Mekanism Voice", Keyboard.KEY_U, keybindCategory); + public static KeyBinding modeSwitchKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.mode"), Keyboard.KEY_M, keybindCategory); + public static KeyBinding voiceKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.voice"), Keyboard.KEY_U, keybindCategory); public MekanismKeyHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 50f0e8b01..30f368837 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -39,10 +39,10 @@ public class GuiGasTank extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); fontRendererObj.drawString(capacityInfo, 45, 40, 0x404040); - fontRendererObj.drawString("Gas: " + (tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() : "None"), 45, 49, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.gas") + ": " + (tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() : MekanismUtils.localize("gui.none")), 45, 49, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); - String name = tileEntity.dumping ? "Dumping..." : MekanismUtils.localize("gui.idle"); + String name = tileEntity.dumping ? MekanismUtils.localize("gui.dumping") + "..." : MekanismUtils.localize("gui.idle"); fontRendererObj.drawString(name, 156-fontRendererObj.getStringWidth(name), 73, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 52a02dd7a..f7cb3d956 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -385,6 +385,7 @@ public class ItemRenderingHandler implements IItemRenderer } else if(item.getItem() instanceof ItemAtomicDisassembler) { + GL11.glPushMatrix(); GL11.glScalef(1.4F, 1.4F, 1.4F); GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); @@ -409,6 +410,7 @@ public class ItemRenderingHandler implements IItemRenderer Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AtomicDisassembler.png")); atomicDisassembler.render(0.0625F); + GL11.glPopMatrix(); } else if(item.getItem() instanceof ItemPartTransmitter) { diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 5bcf96a73..431c4a896 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -195,7 +195,7 @@ public class ItemConfigurator extends ItemEnergized implements IToolWrench if(!world.isRemote && player.isSneaking()) { Coord4D obj = new Coord4D(x, y, z, world.provider.dimensionId); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Set link to block " + EnumColor.INDIGO + MekanismUtils.getCoordDisplay(obj) + EnumColor.GREY + ", dimension " + EnumColor.INDIGO + obj.dimensionId)); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.setLink") + " " + EnumColor.INDIGO + MekanismUtils.getCoordDisplay(obj) + EnumColor.GREY + ", " + MekanismUtils.localize("tooltip.configurator.dim") + " " + EnumColor.INDIGO + obj.dimensionId)); setLink(stack, obj); return true; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 7df4fca7e..e5c39da63 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -102,7 +102,7 @@ public final class MekanismUtils if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1 || !list.isEmpty()) { entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " Using outdated version on one or more modules.")); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + MekanismUtils.localize("update.outdated") + ".")); if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1) { @@ -114,15 +114,15 @@ public final class MekanismUtils entityplayer.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " Mekanism" + module.getName() + ": " + EnumColor.DARK_RED + module.getVersion())); } - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " Consider updating to version " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber)); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " New features: " + EnumColor.INDIGO + Mekanism.recentNews)); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " Visit " + EnumColor.DARK_GREY + "aidancbrady.com/mekanism" + EnumColor.GREY + " to download.")); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + MekanismUtils.localize("update.consider") + " " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber)); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + MekanismUtils.localize("update.newFeatures") + ": " + EnumColor.INDIGO + Mekanism.recentNews)); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + MekanismUtils.localize("update.visit") + " " + EnumColor.DARK_GREY + "aidancbrady.com/mekanism" + EnumColor.GREY + " " + MekanismUtils.localize("update.toDownload") + ".")); entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); return true; } else if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == -1) { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Using developer build " + EnumColor.DARK_GREY + Mekanism.versionNumber)); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("update.devBuild") + " " + EnumColor.DARK_GREY + Mekanism.versionNumber)); return true; } } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 87e7e1755..5aeb8fb15 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.client.render.ModelCustomArmor; import mekanism.common.Mekanism; +import mekanism.common.util.MekanismUtils; import mekanism.common.util.StackUtils; import mekanism.tools.common.MekanismTools; import net.minecraft.client.model.ModelBiped; @@ -28,7 +29,7 @@ public class ItemMekanismArmor extends ItemArmor @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add("HP: " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + list.add(MekanismUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } @Override diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index 94c91c14b..bfb8ef3bd 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -3,6 +3,7 @@ package mekanism.tools.item; import java.util.List; import mekanism.common.item.ItemMekanism; +import mekanism.common.util.MekanismUtils; import mekanism.common.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -83,7 +84,7 @@ public class ItemMekanismHoe extends ItemMekanism @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add("HP: " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + list.add(MekanismUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } @Override diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java index 845f8bb88..ed6157252 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java @@ -3,6 +3,7 @@ package mekanism.tools.item; import java.util.List; import mekanism.common.Mekanism; +import mekanism.common.util.MekanismUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,7 +20,7 @@ public class ItemMekanismSword extends ItemSword @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add("HP: " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + list.add(MekanismUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } @Override diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index ed3eb1a46..6843704e7 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.List; import mekanism.common.Mekanism; +import mekanism.common.util.MekanismUtils; import mekanism.common.util.StackUtils; import mekanism.tools.common.MekanismTools; import net.minecraft.block.Block; @@ -25,7 +26,7 @@ public class ItemMekanismTool extends ItemTool @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add("HP: " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + list.add(MekanismUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } @Override diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index c0edf532b..a411d716d 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -263,6 +263,18 @@ oregas.silver=Silver Ore oregas.obsidian=Obsidian Ore oregas.lead=Lead Ore +//Update handler text +update.consider=Consider updating to version +update.newFeatures=New features +update.visit=Visit +update.toDownload=to download +update.devBuild=Using developer build +update.outdated=Using outdated version on one or more modules + +//Key description text +key.mode=Mode Switch +key.voice=Voice + //Gui text gui.removeSpeedUpgrade=Remove speed upgrade gui.removeEnergyUpgrade=Remove energy upgrade @@ -302,6 +314,8 @@ gui.idle=Idle gui.data=Data gui.newFilter=New Filter gui.energy=Energy +gui.gas=Gas +gui.dumping=Dumping gui.chemicalInfuser.short=C. Infuser gui.chemicalDissolutionChamber.short=C. Dissolution Chamber @@ -405,6 +419,7 @@ tooltip.configurator.unauth=This chest is locked tooltip.configurator.noLink=No link tooltip.configurator.linkMsg=Bound to tooltip.configurator.dim=dimension +tooltip.configurator.setLink=Set link to block tooltip.upgrade.speed=Speed tooltip.upgrade.energy=Energy @@ -444,6 +459,7 @@ tooltip.meta=Metadata tooltip.tile=Tile tooltip.keysFound=Key(s) found tooltip.noKey=No key +tooltip.hp=HP tooltip.disassembler.normal=normal tooltip.disassembler.slow=slow