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

Updated localization yet again, fixed a small bug

Browse source
This commit is contained in:
Aidan C. Brady 2014-06-13 00:16:02 +02:00
parent ef7f6e91eb
commit c8fb800c1a
11 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/mekanism/client/MekKeyHandler.java
View file

@ -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);
}

5
src/main/java/mekanism/client/MekanismKeyHandler.java
View file

@ -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()
{

4
src/main/java/mekanism/client/gui/GuiGasTank.java
View file

@ -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);

2
src/main/java/mekanism/client/render/item/ItemRenderingHandler.java
View file

@ -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)
{

2
src/main/java/mekanism/common/item/ItemConfigurator.java
View file

@ -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;

10
src/main/java/mekanism/common/util/MekanismUtils.java
View file

@ -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;
}
}

3
src/main/java/mekanism/tools/item/ItemMekanismArmor.java
View file

@ -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

3
src/main/java/mekanism/tools/item/ItemMekanismHoe.java
View file

@ -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

3
src/main/java/mekanism/tools/item/ItemMekanismSword.java
View file

@ -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

3
src/main/java/mekanism/tools/item/ItemMekanismTool.java
View file

@ -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

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

@ -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