Localization cleanup/fixes

This commit is contained in:
Bernhard Bonigl committed 2014-09-01 22:19:43 +02:00
1 parent e632373f62
commit 6e9dea9bd8
11 files changed
+195 -215

No files matched your search

@@ -19,7 +19,7 @@ public final class HarvestLevels {
// initialization
static{
String base = "gui.partcrafter.mining";
String base = "gui.mining";
int i = 0;
while(StatCollector.canTranslate(String.format("%s%d", base, i+1))) {
harvestLevelNames.put(i, StatCollector.translateToLocal(String.format("%s%d", base, i + 1)));
@@ -783,8 +783,7 @@ public class TinkerTools
TinkerTools.thaumcraftAvailable = true;
TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true);
TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", "materialtraits.thaumic");
PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, StatCollector.translateToLocal("gui.partbuilder.material.thaumium"), new ItemStack(TinkerTools.toolShard,
1, 31), new ItemStack(TinkerTools.toolRod, 1, 31), 31);
PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(TinkerTools.toolShard, 1, 31), new ItemStack(TinkerTools.toolRod, 1, 31), 31);
for (int meta = 0; meta < TinkerTools.patternOutputs.length; meta++)
{
if (TinkerTools.patternOutputs[meta] != null)
@@ -20,6 +20,7 @@ import tconstruct.library.armor.ArmorCore;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.HarvestTool;
import tconstruct.library.tools.ToolCore;
import tconstruct.library.util.HarvestLevels;
import tconstruct.tools.logic.CraftingStationLogic;
public class CraftingStationGui extends GuiContainer
@@ -309,7 +310,7 @@ public class CraftingStationGui extends GuiContainer
offset++;
fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), offsetX + 8, base + offset * 10, 0xffffff);
offset++;
fontRendererObj.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), offsetX + 8, base + offset * 10,
fontRendererObj.drawString("- " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel2")), offsetX + 8, base + offset * 10,
0xffffff);
offset++;
offset++;
@@ -332,7 +333,7 @@ public class CraftingStationGui extends GuiContainer
fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff);
offset++;
}
fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), offsetX + 8, base + offset * 10, 0xffffff);
fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation15") + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")), offsetX + 8, base + offset * 10, 0xffffff);
offset++;
offset++;
}
@@ -372,27 +373,6 @@ public class CraftingStationGui extends GuiContainer
}
}
protected String getHarvestLevelName (int num)
{
switch (num)
{
case 0:
return StatCollector.translateToLocal("gui.partcrafter.mining1");
case 1:
return StatCollector.translateToLocal("gui.partcrafter.mining2");
case 2:
return StatCollector.translateToLocal("gui.partcrafter.mining3");
case 3:
return StatCollector.translateToLocal("gui.partcrafter.mining4");
case 4:
return StatCollector.translateToLocal("gui.partcrafter.mining5");
case 5:
return StatCollector.translateToLocal("gui.partcrafter.mining6");
default:
return String.valueOf(num);
}
}
void drawToolInformation ()
{
int offsetX = 239;