diff --git a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java index ca76b8fa..d690baa0 100644 --- a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java @@ -10,6 +10,7 @@ import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.*; +import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.*; @@ -287,7 +288,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui ArrayList list = new ArrayList(); if (liquid.fluidID == -37) { - list.add("\u00A7fFuel"); + list.add("\u00A7f"+(StatCollector.translateToLocal("gui.smeltery1")); list.add("mB: " + liquid.amount); } else diff --git a/src/main/java/tconstruct/client/gui/GuiLandmine.java b/src/main/java/tconstruct/client/gui/GuiLandmine.java index cd0c70f5..f8a2f1ca 100644 --- a/src/main/java/tconstruct/client/gui/GuiLandmine.java +++ b/src/main/java/tconstruct/client/gui/GuiLandmine.java @@ -68,7 +68,7 @@ public class GuiLandmine extends GuiContainer } else { - fontRenderer.drawString("Landmine", 8, 5, 4210752); + fontRenderer.drawString((StatCollector.translateToLocal("gui.landmine"), 8, 5, 4210752); } fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 3, 4210752); } diff --git a/src/main/java/tconstruct/client/gui/PartCrafterGui.java b/src/main/java/tconstruct/client/gui/PartCrafterGui.java index d9c41d8d..cb470b8d 100644 --- a/src/main/java/tconstruct/client/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/client/gui/PartCrafterGui.java @@ -34,7 +34,7 @@ public class PartCrafterGui extends NewContainerGui logic = partlogic; drawChestPart = container instanceof PartCrafterChestContainer; - title = "\u00A7nTool Part Crafting"; + title = "\u00A7n"+(StatCollector.translateToLocal("gui.partcrafter1")); } protected void drawGuiContainerForegroundLayer (int par1, int par2) @@ -49,9 +49,9 @@ public class PartCrafterGui extends NewContainerGui void drawDefaultInformation () { - title = "\u00A7nTool Part Building"; + title = "\u00A7n"+ (StatCollector.translateToLocal("gui.partcrafter2"); this.drawCenteredString(fontRenderer, title, xSize + 63, 8, 16777215); - fontRenderer.drawSplitString("Place a pattern and a material on the left to get started.", xSize + 8, 24, 115, 16777215); + fontRenderer.drawSplitString(StatCollector.translateToLocal("gui.partcrafter3"), xSize + 8, 24, 115, 16777215); } void drawMaterialInformation () @@ -94,33 +94,33 @@ public class PartCrafterGui extends NewContainerGui if (hasTop) { this.drawCenteredString(fontRenderer, title, xSize + 63, offset, 16777215); - this.fontRenderer.drawString("Base Durability: " + topEnum.durability(), xSize + 8, offset + 16, 16777215); - this.fontRenderer.drawString("Handle Modifier: " + topEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); - this.fontRenderer.drawString("Mining Speed: " + topEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); - this.fontRenderer.drawString("Mining Level: " + getHarvestLevelName(topEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter4") + topEnum.durability(), xSize + 8, offset + 16, 16777215); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter5") + topEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter6") + topEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(topEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); int attack = topEnum.attack(); - String heart = attack == 2 ? " Heart" : " Hearts"; + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.fontRenderer.drawString("Attack: " + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); else - this.fontRenderer.drawString("Attack: " + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); } offset = 90; if (hasBottom) { this.drawCenteredString(fontRenderer, otherTitle, xSize + 63, offset, 16777215); - this.fontRenderer.drawString("Base Durability: " + bottomEnum.durability(), xSize + 8, offset + 16, 16777215); - this.fontRenderer.drawString("Handle Modifier: " + bottomEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); - this.fontRenderer.drawString("Mining Speed: " + bottomEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); - this.fontRenderer.drawString("Mining Level: " + getHarvestLevelName(bottomEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter4") + bottomEnum.durability(), xSize + 8, offset + 16, 16777215); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter5") + bottomEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter6") + bottomEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(bottomEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); int attack = bottomEnum.attack(); - String heart = attack == 2 ? " Heart" : " Hearts"; + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.fontRenderer.drawString("Attack: " + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); else - this.fontRenderer.drawString("Attack: " + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); } if (!hasTop && !hasBottom) @@ -132,17 +132,17 @@ public class PartCrafterGui extends NewContainerGui switch (num) { case 0: - return "Stone"; + return (StatCollector.translateToLocal("gui.partcrafter.mining1")); case 1: - return "Iron"; + return (StatCollector.translateToLocal("gui.partcrafter.mining2")); case 2: - return "Redstone"; + return (StatCollector.translateToLocal("gui.partcrafter.mining3")); case 3: - return "Obsidian"; + return (StatCollector.translateToLocal("gui.partcrafter.mining4")); case 4: - return "Cobalt"; + return (StatCollector.translateToLocal("gui.partcrafter.mining5")); case 5: - return "Manyullyn"; + return (StatCollector.translateToLocal("gui.partcrafter.mining6")); default: return String.valueOf(num); } diff --git a/src/main/java/tconstruct/client/gui/SmelteryGui.java b/src/main/java/tconstruct/client/gui/SmelteryGui.java index 9b491384..d4fd840b 100644 --- a/src/main/java/tconstruct/client/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/SmelteryGui.java @@ -13,6 +13,7 @@ import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.*; +import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.*; @@ -272,7 +273,7 @@ public class SmelteryGui extends NewContainerGui ArrayList list = new ArrayList(); if (liquid.fluidID == -37) { - list.add("\u00A7fFuel"); + list.add("\u00A7f"+(StatCollector.translateToLocal("gui.smeltery1")); list.add("mB: " + liquid.amount); } else diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java index 63bc1dd6..453b7c8a 100644 --- a/src/main/java/tconstruct/client/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/client/gui/StencilTableGui.java @@ -70,8 +70,8 @@ public class StencilTableGui extends GuiContainer GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.texture); // Repair repairButton.enabled = false; this.buttonList.add(repairButton);*/ - this.buttonList.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, "Next Pattern")); - this.buttonList.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, "Previous Pattern")); + this.buttonList.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, (StatCollector.translateToLocal("gui.stenciltable1"))); + this.buttonList.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, (StatCollector.translateToLocal("gui.stenciltable1"))); //for (int iter = 0; iter < TConstructContent.patternOutputs.length; iter++) //{ diff --git a/src/main/java/tconstruct/client/gui/ToolForgeGui.java b/src/main/java/tconstruct/client/gui/ToolForgeGui.java index c14e8578..cf5fc74e 100644 --- a/src/main/java/tconstruct/client/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/client/gui/ToolForgeGui.java @@ -6,6 +6,7 @@ import tconstruct.library.client.ToolGuiElement; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; +import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -84,8 +85,8 @@ public class ToolForgeGui extends ToolStationGui setSlotType(0); iconX = new int[] { 0, 1, 2, 13 }; iconY = new int[] { 13, 13, 13, 13 }; - title = "\u00A7nRepair and Modification"; - body = "The main way to repair or change your tools. Place a tool and a material on the left to get started."; + title = "\u00A7n"+(StatCollector.translateToLocal("gui.toolforge1")); + body = (StatCollector.translateToLocal("gui.toolforge2")); } void setSlotType (int type) diff --git a/src/main/java/tconstruct/client/gui/ToolStationGui.java b/src/main/java/tconstruct/client/gui/ToolStationGui.java index 5290754a..c74d924a 100644 --- a/src/main/java/tconstruct/client/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/client/gui/ToolStationGui.java @@ -197,14 +197,14 @@ public class ToolStationGui extends NewContainerGui { if (maxDur >= 10000) { - fontRenderer.drawString("Durability:", xSize + 8, base + offset * 11, 0xffffff); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff); offset++; fontRenderer.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); offset++; } else { - fontRenderer.drawString("Durability: " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); offset++; } } @@ -220,17 +220,17 @@ public class ToolStationGui extends NewContainerGui if (attack < 1) attack = 1; - String heart = attack == 2 ? " Heart" : " Hearts"; + String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : (tatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) - this.fontRenderer.drawString("Attack: " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); else - this.fontRenderer.drawString("Attack: " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundDamage != 0) { - heart = stoneboundDamage == 2 ? " Heart" : " Hearts"; - String bloss = stoneboundDamage > 0 ? "Bonus: " : "Loss: "; + heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); + String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); this.fontRenderer.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; } @@ -244,9 +244,9 @@ public class ToolStationGui extends NewContainerGui int drawSpeed = tags.getInteger("DrawSpeed"); float flightSpeed = tags.getFloat("FlightSpeed"); float trueDraw = drawSpeed / 20f * flightSpeed; - this.fontRenderer.drawString("Draw Speed: " + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); offset++; - this.fontRenderer.drawString("Arrow Speed: " + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -260,9 +260,9 @@ public class ToolStationGui extends NewContainerGui float shatter = tags.getFloat("BreakChance"); float accuracy = tags.getFloat("Accuracy"); - this.fontRenderer.drawString("Base Attack:", xSize + 8, base + offset * 10, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff); offset++; - String heart = attack == 2 ? " Heart" : " Hearts"; + String heart = attack == 2 ? (StatCollector.translateToLocal("gui.partcrafter9") : (StatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) this.fontRenderer.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); else @@ -270,16 +270,16 @@ public class ToolStationGui extends NewContainerGui offset++; int minAttack = attack; int maxAttack = attack * 2; - heart = " Hearts"; - this.fontRenderer.drawString("Shortbow Attack:", xSize + 8, base + offset * 10, 0xffffff); + heart = StatCollector.translateToLocal("gui.partcrafter10"); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation11"), xSize + 8, base + offset * 10, 0xffffff); offset++; this.fontRenderer.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; - this.fontRenderer.drawString("Weight: " + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); offset++; - this.fontRenderer.drawString("Accuracy: " + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff); + this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff); offset++; /*this.fontRenderer.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); offset++;*/ @@ -297,18 +297,18 @@ public class ToolStationGui extends NewContainerGui float trueSpeed = mineSpeed + stoneboundSpeed; float trueSpeed2 = mineSpeed + stoneboundSpeed; - fontRenderer.drawString("Mining Speeds: ", xSize + 8, base + offset * 10, 0xffffff); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff); offset++; fontRenderer.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { - String bloss = stoneboundSpeed > 0 ? "Bonus: " : "Loss: "; + String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); fontRenderer.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; } offset++; - fontRenderer.drawString("Harvest Levels:", xSize + 8, base + offset * 10, 0xffffff); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff); offset++; fontRenderer .drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff); @@ -346,15 +346,15 @@ public class ToolStationGui extends NewContainerGui trueSpeed += stoneboundSpeed; if (trueSpeed < 0) trueSpeed = 0; - fontRenderer.drawString("Mining Speed: " + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation14")rs") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { - String bloss = stoneboundSpeed > 0 ? "Bonus: " : "Loss: "; + String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); fontRenderer.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; } - fontRenderer.drawString("Mining Level: " + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -362,7 +362,7 @@ public class ToolStationGui extends NewContainerGui { float mineSpeed = tags.getInteger("MiningSpeed"); float trueSpeed = mineSpeed / (100f); - fontRenderer.drawString("Usage Speed: " + trueSpeed, xSize + 8, base + offset * 10, 0xffffff); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -370,12 +370,12 @@ public class ToolStationGui extends NewContainerGui int modifiers = tags.getInteger("Modifiers"); if (modifiers > 0) { - fontRenderer.drawString("Modifiers remaining: " + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); offset++; } if (tags.hasKey("Tooltip1")) { - fontRenderer.drawString("Modifiers:", xSize + 8, base + offset * 10, 0xffffff); + fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff); } boolean displayToolTips = true; @@ -405,17 +405,17 @@ public class ToolStationGui extends NewContainerGui switch (num) { case 0: - return "Stone"; + return (StatCollector.translateToLocal("gui.partcrafter.mining1")); case 1: - return "Iron"; + return (StatCollector.translateToLocal("gui.partcrafter.mining2")); case 2: - return "Redstone"; + return (StatCollector.translateToLocal("gui.partcrafter.mining3")); case 3: - return "Obsidian"; //Mithril + return (StatCollector.translateToLocal("gui.partcrafter.mining4")); //Mithril case 4: - return "Cobalt"; + return (StatCollector.translateToLocal("gui.partcrafter.mining5")); case 5: - return "Manyullyn"; + return (StatCollector.translateToLocal("gui.partcrafter.mining6")); default: return String.valueOf(num); }