From f05e01cac130b8ea730f0365ed3c80bc9b98eca9 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Wed, 12 Mar 2014 17:46:23 +0800 Subject: [PATCH] Resolved #429 - Missing localization --- .../archaic/crate/RenderCrate.java | 7 ++++- .../electrical/multimeter/GuiMultimeter.java | 2 +- .../multimeter/MultimeterNetwork.java | 30 +++++++++++-------- .../multimeter/RenderMultimeter.java | 3 +- .../core/render/RenderItemOverlayTile.java | 20 +++++++++++-- .../core/resource/ItemOreResource.java | 8 ----- .../assets/resonantinduction/languages | 2 +- 7 files changed, 44 insertions(+), 28 deletions(-) diff --git a/archaic/src/main/java/resonantinduction/archaic/crate/RenderCrate.java b/archaic/src/main/java/resonantinduction/archaic/crate/RenderCrate.java index 311339c99..1c14db5a5 100644 --- a/archaic/src/main/java/resonantinduction/archaic/crate/RenderCrate.java +++ b/archaic/src/main/java/resonantinduction/archaic/crate/RenderCrate.java @@ -1,5 +1,8 @@ package resonantinduction.archaic.crate; +import org.lwjgl.opengl.GL11; + +import calclavia.lib.utility.LanguageUtility; import net.minecraft.tileentity.TileEntity; import resonantinduction.core.render.RenderItemOverlayTile; import cpw.mods.fml.relauncher.Side; @@ -13,8 +16,10 @@ public class RenderCrate extends RenderItemOverlayTile { if (tileEntity instanceof TileCrate) { + GL11.glPushMatrix(); TileCrate tile = (TileCrate) tileEntity; - renderItemOnSides(tileEntity, tile.getSampleStack(), x, y, z, "Empty"); + renderItemOnSides(tileEntity, tile.getSampleStack(), x, y, z, LanguageUtility.getLocal("tooltip.empty")); + GL11.glPopMatrix(); } } } diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java index 95e8e6673..398a0f37a 100644 --- a/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java +++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java @@ -92,7 +92,7 @@ public class GuiMultimeter extends GuiContainerBase this.fontRenderer.drawString(EnumColor.INDIGO + "Detection Type", 9, 20, 4210752); this.fontRenderer.drawString(multimeter.getNetwork().getDisplay(multimeter.detectType), 9, 60, 4210752); this.fontRenderer.drawString("Logic: " + EnumColor.RED + LanguageUtility.getLocal("gui.resonantinduction.multimeter." + this.multimeter.getMode().display), 9, 75, 4210752); - this.fontRenderer.drawString(multimeter.getNetwork().graphs.get(multimeter.graphType).name, 95, 115, 4210752); + this.fontRenderer.drawString(multimeter.getNetwork().getLocalized(multimeter.getNetwork().graphs.get(multimeter.graphType)), 95, 115, 4210752); this.textFieldLimit.drawTextBox(); } diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java index 98e8aa36b..c7ddff259 100644 --- a/electrical/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java +++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import calclavia.lib.utility.LanguageUtility; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import universalelectricity.api.energy.UnitDisplay; @@ -25,18 +26,16 @@ public class MultimeterNetwork extends Network graphs = new ArrayList(); - /** - * Energy Related - */ - public final GraphL energyGraph = new GraphL("Energy", maxData); - public final GraphL powerGraph = new GraphL("Power", maxData); - public final GraphL energyCapacityGraph = new GraphL("Capacity", 1); - public final GraphL voltageGraph = new GraphL("Voltage", maxData); - public final GraphD torqueGraph = new GraphD("Torque", maxData); - public final GraphD angularVelocityGraph = new GraphD("Speed", maxData); - public final GraphI fluidGraph = new GraphI("Fluid", maxData); - public final GraphF thermalGraph = new GraphF("Temperature", maxData); - public final GraphI pressureGraph = new GraphI("Pressure", maxData); + + public final GraphL energyGraph = new GraphL("energy", maxData); + public final GraphL powerGraph = new GraphL("power", maxData); + public final GraphL energyCapacityGraph = new GraphL("capacity", 1); + public final GraphL voltageGraph = new GraphL("voltage", maxData); + public final GraphD torqueGraph = new GraphD("torque", maxData); + public final GraphD angularVelocityGraph = new GraphD("speed", maxData); + public final GraphI fluidGraph = new GraphI("fluid", maxData); + public final GraphF thermalGraph = new GraphF("temperature", maxData); + public final GraphI pressureGraph = new GraphI("pressure", maxData); /** * The absolute center of the multimeter screens. @@ -111,10 +110,15 @@ public class MultimeterNetwork extends Network