Skip to content

Commit

Permalink
Merge pull request #421 from TheVikingWarrior/patch-2
Browse files Browse the repository at this point in the history 
More gui localization finally (and hopefully) done
  • Loading branch information
@progwml6
progwml6 committed Jan 15, 2014
2 parents 9cc2dba + 48407a1 commit 35bd1f3
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 60 deletions.
3 changes: 2 additions & 1 deletion src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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.*;
Expand Down Expand Up @@ -287,7 +288,7 @@ public List getLiquidTooltip (FluidStack liquid, boolean par2)
ArrayList list = new ArrayList();
if (liquid.fluidID == -37)
{
list.add("\u00A7fFuel");
list.add("\u00A7f"+(StatCollector.translateToLocal("gui.smeltery1"));
list.add("mB: " + liquid.amount);
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/client/gui/GuiLandmine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ protected void drawGuiContainerForegroundLayer (int i, int j)
}
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);
}
Expand Down
46 changes: 23 additions & 23 deletions src/main/java/tconstruct/client/gui/PartCrafterGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public PartCrafterGui(InventoryPlayer inventoryplayer, PartBuilderLogic partlogi
logic = partlogic;
drawChestPart = container instanceof PartCrafterChestContainer;

title = "\u00A7nTool Part Crafting";
title = "\u00A7n"+(StatCollector.translateToLocal("gui.partcrafter1"));
}

protected void drawGuiContainerForegroundLayer (int par1, int par2)
Expand All @@ -49,9 +49,9 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2)

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 ()
Expand Down Expand Up @@ -94,33 +94,33 @@ void drawMaterialInformation ()
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)
Expand All @@ -132,17 +132,17 @@ public static String getHarvestLevelName (int num)
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);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/tconstruct/client/gui/SmelteryGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
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.*;
Expand Down Expand Up @@ -272,7 +273,7 @@ public List getLiquidTooltip (FluidStack liquid, boolean par2)
ArrayList list = new ArrayList();
if (liquid.fluidID == -37)
{
list.add("\u00A7fFuel");
list.add("\u00A7f"+(StatCollector.translateToLocal("gui.smeltery1"));
list.add("mB: " + liquid.amount);
}
else
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/client/gui/StencilTableGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public void initGui ()
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++)
//{
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/tconstruct/client/gui/ToolForgeGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
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;

Expand Down Expand Up @@ -84,8 +85,8 @@ void resetGui ()
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)
Expand Down

0 comments on commit 35bd1f3

Please sign in to comment.