From 6e9dea9bd80c88fb012c168b74c2f20a4306d747 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Mon, 1 Sep 2014 22:19:43 +0200 Subject: [PATCH] Localization cleanup/fixes --- resources/assets/tinker/lang/cs_CZ.lang | 12 ++-- resources/assets/tinker/lang/de_DE.lang | 52 +++++++++--------- resources/assets/tinker/lang/en_PT.lang | 52 +++++++++--------- resources/assets/tinker/lang/en_US.lang | 55 ++++++++++--------- resources/assets/tinker/lang/it_IT.lang | 52 +++++++++--------- resources/assets/tinker/lang/ko_KR.lang | 52 +++++++++--------- resources/assets/tinker/lang/ru_RU.lang | 52 +++++++++--------- resources/assets/tinker/lang/zh_CN.lang | 52 +++++++++--------- .../library/util/HarvestLevels.java | 2 +- .../java/tconstruct/tools/TinkerTools.java | 3 +- .../tools/gui/CraftingStationGui.java | 26 +-------- 11 files changed, 195 insertions(+), 215 deletions(-) diff --git a/resources/assets/tinker/lang/cs_CZ.lang b/resources/assets/tinker/lang/cs_CZ.lang index 17156dad0b0..4d3641e03f4 100644 --- a/resources/assets/tinker/lang/cs_CZ.lang +++ b/resources/assets/tinker/lang/cs_CZ.lang @@ -692,12 +692,12 @@ gui.partcrafter7=Level těžení: gui.partcrafter8= Srdce gui.partcrafter9= Srdce gui.partcrafter10=Útok: -gui.partcrafter.mining1=kámen -gui.partcrafter.mining2=železo -gui.partcrafter.mining3=rudit -gui.partcrafter.mining4=obsidián -gui.partcrafter.mining5=kobalt -gui.partcrafter.mining6=manyullyn +gui.mining1=kámen +gui.mining2=železo +gui.mining3=rudit +gui.mining4=obsidián +gui.mining5=kobalt +gui.mining6=manyullyn gui.stenciltable1=Další šablona gui.stenciltable2=Předchozí šablona gui.toolforge1=Opravování a modifikace diff --git a/resources/assets/tinker/lang/de_DE.lang b/resources/assets/tinker/lang/de_DE.lang index cee7ccae440..9f81c951874 100644 --- a/resources/assets/tinker/lang/de_DE.lang +++ b/resources/assets/tinker/lang/de_DE.lang @@ -716,12 +716,12 @@ gui.partcrafter7=Abbaulevel: gui.partcrafter8= Herz gui.partcrafter9= Herzen gui.partcrafter10=Angriff: -gui.partcrafter.mining1=Stein -gui.partcrafter.mining2=Eisen -gui.partcrafter.mining3=Redstone -gui.partcrafter.mining4=Obsidian -gui.partcrafter.mining5=Cobalt -gui.partcrafter.mining6=Manyullyn +gui.mining1=Stein +gui.mining2=Eisen +gui.mining3=Redstone +gui.mining4=Obsidian +gui.mining5=Cobalt +gui.mining6=Manyullyn gui.stenciltable1=Zurück gui.stenciltable2=Weiter gui.toolforge1=Reparieren und Modifizieren @@ -745,26 +745,26 @@ gui.toolstation16=Nutzungsgeschw.: gui.toolstation17=Modifikatoren gui.toolstation18=Modifikatoren übrig: -gui.partbuilder.material.wood=Holz -gui.partbuilder.material.stone=Stein -gui.partbuilder.material.iron=Eisen -gui.partbuilder.material.flint=Feuerstein -gui.partbuilder.material.cactus=Kaktus -gui.partbuilder.material.bone=Knochen -gui.partbuilder.material.obsidian=Obsidian -gui.partbuilder.material.netherrack=Netherstein -gui.partbuilder.material.slime=Schleim -gui.partbuilder.material.paper=Papier -gui.partbuilder.material.blueslime=Blauschleim -gui.partbuilder.material.cobalt=Cobalt -gui.partbuilder.material.ardite=Ardit -gui.partbuilder.material.manyullyn=Manyullyn -gui.partbuilder.material.copper=Kupfer -gui.partbuilder.material.bronze=Bronze -gui.partbuilder.material.alumite=Alumit -gui.partbuilder.material.steel=Stahl -gui.partbuilder.material.pigiron=Schweineisen -gui.partbuilder.material.thaumium=Thaumium +material.wood=Holz +material.stone=Stein +material.iron=Eisen +material.flint=Feuerstein +material.cactus=Kaktus +material.bone=Knochen +material.obsidian=Obsidian +material.netherrack=Netherstein +material.slime=Schleim +material.paper=Papier +material.blueslime=Blauschleim +material.cobalt=Cobalt +material.ardite=Ardit +material.manyullyn=Manyullyn +material.copper=Kupfer +material.bronze=Bronze +material.alumite=Alumit +material.steel=Stahl +material.pigiron=Schweineisen +material.thaumium=Thaumium gui.modifier.blaze=Lohe gui.modifier.silk=Behutsamkeit diff --git a/resources/assets/tinker/lang/en_PT.lang b/resources/assets/tinker/lang/en_PT.lang index c6640096623..783f6ed2cbf 100644 --- a/resources/assets/tinker/lang/en_PT.lang +++ b/resources/assets/tinker/lang/en_PT.lang @@ -732,12 +732,12 @@ gui.partcrafter7=Mining Level: gui.partcrafter8= Heart gui.partcrafter9= Hearts gui.partcrafter10=Attack: -gui.partcrafter.mining1=Stone -gui.partcrafter.mining2=Iron -gui.partcrafter.mining3=Redstone -gui.partcrafter.mining4=Obsidian -gui.partcrafter.mining5=Cobalt -gui.partcrafter.mining6=Manyullyn +gui.mining1=Stone +gui.mining2=Iron +gui.mining3=Redstone +gui.mining4=Obsidian +gui.mining5=Cobalt +gui.mining6=Manyullyn gui.stenciltable1=Next Pattern gui.stenciltable2=Previous Pattern gui.toolforge1=Repair and Modification @@ -761,26 +761,26 @@ gui.toolstation16=Usage Speed: gui.toolstation17=Modifiers gui.toolstation18=Modifiers remaining: -gui.partbuilder.material.wood=Wood -gui.partbuilder.material.stone=Stone -gui.partbuilder.material.iron=Iron -gui.partbuilder.material.flint=Flint -gui.partbuilder.material.cactus=Cactus -gui.partbuilder.material.bone=Bone -gui.partbuilder.material.obsidian=Obsidian -gui.partbuilder.material.netherrack=Netherrack -gui.partbuilder.material.slime=Slime -gui.partbuilder.material.paper=Paper -gui.partbuilder.material.blueslime=BlueSlime -gui.partbuilder.material.cobalt=Cobalt -gui.partbuilder.material.ardite=ARRdite -gui.partbuilder.material.manyullyn=Manyullyn -gui.partbuilder.material.copper=Copper -gui.partbuilder.material.bronze=Bronze -gui.partbuilder.material.alumite=Alumite -gui.partbuilder.material.steel=Steel -gui.partbuilder.material.pigiron=Pigiron -gui.partbuilder.material.thaumium=Thaumium +material.wood=Wood +material.stone=Stone +material.iron=Iron +material.flint=Flint +material.cactus=Cactus +material.bone=Bone +material.obsidian=Obsidian +material.netherrack=Netherrack +material.slime=Slime +material.paper=Paper +material.blueslime=BlueSlime +material.cobalt=Cobalt +material.ardite=ARRdite +material.manyullyn=Manyullyn +material.copper=Copper +material.bronze=Bronze +material.alumite=Alumite +material.steel=Steel +material.pigiron=Pigiron +material.thaumium=Thaumium gui.modifier.blaze=Blaze gui.modifier.silk=Silk Touch diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 3041c157b04..41aa1e5d1ed 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -554,7 +554,7 @@ parttype.obsidian=Obsidian parttype.slime=Slime parttype.paper=Paper parttype.netherrack=Netherrack -parttype.Cobalt=Cobalt +parttype.cobalt=Cobalt parttype.ardite=Ardite parttype.manyullyn=Manyullyn parttype.copper=Copper @@ -733,12 +733,6 @@ gui.partcrafter7=Mining Level: gui.partcrafter8= Heart gui.partcrafter9= Hearts gui.partcrafter10=Attack: -gui.partcrafter.mining1=Stone -gui.partcrafter.mining2=Iron -gui.partcrafter.mining3=Redstone -gui.partcrafter.mining4=Obsidian -gui.partcrafter.mining5=Cobalt -gui.partcrafter.mining6=Manyullyn gui.stenciltable1=Next Pattern gui.stenciltable2=Previous Pattern gui.toolforge1=Repair and Modification @@ -762,26 +756,33 @@ gui.toolstation16=Usage Speed: gui.toolstation17=Modifiers gui.toolstation18=Modifiers remaining: -gui.partbuilder.material.wood=Wood -gui.partbuilder.material.stone=Stone -gui.partbuilder.material.iron=Iron -gui.partbuilder.material.flint=Flint -gui.partbuilder.material.cactus=Cactus -gui.partbuilder.material.bone=Bone -gui.partbuilder.material.obsidian=Obsidian -gui.partbuilder.material.netherrack=Netherrack -gui.partbuilder.material.slime=Slime -gui.partbuilder.material.paper=Paper -gui.partbuilder.material.blueslime=BlueSlime -gui.partbuilder.material.Cobalt=Cobalt -gui.partbuilder.material.ardite=Ardite -gui.partbuilder.material.manyullyn=Manyullyn -gui.partbuilder.material.copper=Copper -gui.partbuilder.material.bronze=Bronze -gui.partbuilder.material.alumite=Alumite -gui.partbuilder.material.steel=Steel -gui.partbuilder.material.pigiron=Pigiron -gui.partbuilder.material.thaumium=Thaumium +gui.mining1=Stone +gui.mining2=Iron +gui.mining3=Redstone +gui.mining4=Obsidian +gui.mining5=Cobalt +gui.mining6=Manyullyn + +material.wood=Wood +material.stone=Stone +material.iron=Iron +material.flint=Flint +material.cactus=Cactus +material.bone=Bone +material.obsidian=Obsidian +material.netherrack=Netherrack +material.slime=Slime +material.paper=Paper +material.blueslime=BlueSlime +material.cobalt=Cobalt +material.ardite=Ardite +material.manyullyn=Manyullyn +material.copper=Copper +material.bronze=Bronze +material.alumite=Alumite +material.steel=Steel +material.pigiron=Pigiron +material.thaumium=Thaumium gui.modifier.blaze=Blaze gui.modifier.silk=Silk Touch diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index 9648f153a58..7f3ccbc4b36 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -732,12 +732,12 @@ gui.partcrafter7=Livello dell'attrezzo: gui.partcrafter8= Cuore gui.partcrafter9= Cuori gui.partcrafter10=Attacco: -gui.partcrafter.mining1=Pietra -gui.partcrafter.mining2=Ferro -gui.partcrafter.mining3=Pietrarossa -gui.partcrafter.mining4=Ossidiana -gui.partcrafter.mining5=Cobalto -gui.partcrafter.mining6=Manyullyn +gui.mining1=Pietra +gui.mining2=Ferro +gui.mining3=Pietrarossa +gui.mining4=Ossidiana +gui.mining5=Cobalto +gui.mining6=Manyullyn gui.stenciltable1=Modello seguente gui.stenciltable2=Modello precedente gui.toolforge1=Riparare e modificare @@ -761,26 +761,26 @@ gui.toolstation16=Velocità dell'uso: gui.toolstation17=Modificatori gui.toolstation18=Modificatori rimanenti: -gui.partbuilder.material.wood=Legno -gui.partbuilder.material.stone=Pietra -gui.partbuilder.material.iron=Ferro -gui.partbuilder.material.flint=Selce -gui.partbuilder.material.cactus=Cactus -gui.partbuilder.material.bone=Osso -gui.partbuilder.material.obsidian=Ossidiana -gui.partbuilder.material.netherrack=Inferrena -gui.partbuilder.material.slime=Gelatina -gui.partbuilder.material.paper=Carta -gui.partbuilder.material.blueslime=Gelatina blu -gui.partbuilder.material.cobalt=Cobalto -gui.partbuilder.material.ardite=Ardite -gui.partbuilder.material.manyullyn=Manyullyn -gui.partbuilder.material.copper=Rame -gui.partbuilder.material.bronze=Bronzo -gui.partbuilder.material.alumite=Alumite -gui.partbuilder.material.steel=Acciaio -gui.partbuilder.material.pigiron=Ferro suino -gui.partbuilder.material.thaumium=Taumio +material.wood=Legno +material.stone=Pietra +material.iron=Ferro +material.flint=Selce +material.cactus=Cactus +material.bone=Osso +material.obsidian=Ossidiana +material.netherrack=Inferrena +material.slime=Gelatina +material.paper=Carta +material.blueslime=Gelatina blu +material.cobalt=Cobalto +material.ardite=Ardite +material.manyullyn=Manyullyn +material.copper=Rame +material.bronze=Bronzo +material.alumite=Alumite +material.steel=Acciaio +material.pigiron=Ferro suino +material.thaumium=Taumio gui.modifier.blaze=Vampo gui.modifier.silk=Tocco di velluto diff --git a/resources/assets/tinker/lang/ko_KR.lang b/resources/assets/tinker/lang/ko_KR.lang index 367951cca98..3ed61620238 100644 --- a/resources/assets/tinker/lang/ko_KR.lang +++ b/resources/assets/tinker/lang/ko_KR.lang @@ -731,12 +731,12 @@ gui.partcrafter7=채광 수준: gui.partcrafter8= 하트 gui.partcrafter9= 하트 gui.partcrafter10=공격력: -gui.partcrafter.mining1=돌, 석탄 -gui.partcrafter.mining2=철, 청금석 -gui.partcrafter.mining3=레드스톤, 금, 다이아몬드 -gui.partcrafter.mining4=흑요석 -gui.partcrafter.mining5=코발트, 아르다이트 -gui.partcrafter.mining6=마뉼린 +gui.mining1=돌, 석탄 +gui.mining2=철, 청금석 +gui.mining3=레드스톤, 금, 다이아몬드 +gui.mining4=흑요석 +gui.mining5=코발트, 아르다이트 +gui.mining6=마뉼린 gui.stenciltable1=다음 문양 gui.stenciltable2=이전 문양 gui.toolforge1=수리와 업그레이드 @@ -760,26 +760,26 @@ gui.toolstation16=사용 속도: gui.toolstation17=업그레이드 gui.toolstation18=남은 업그레이드 횟수: -gui.partbuilder.material.wood=나무 -gui.partbuilder.material.stone=돌 -gui.partbuilder.material.iron=철 -gui.partbuilder.material.flint=부싯돌 -gui.partbuilder.material.cactus=선인장 -gui.partbuilder.material.bone=뼈 -gui.partbuilder.material.obsidian=흑요석 -gui.partbuilder.material.netherrack=네더랙 -gui.partbuilder.material.slime=슬라임 -gui.partbuilder.material.paper=종이: -gui.partbuilder.material.blueslime=푸른 슬라임 -gui.partbuilder.material.cobalt=코발트 -gui.partbuilder.material.ardite=아르다이트 -gui.partbuilder.material.manyullyn=마뉼린 -gui.partbuilder.material.copper=구리 -gui.partbuilder.material.bronze=청동 -gui.partbuilder.material.alumite=알루마이트 -gui.partbuilder.material.steel=강철 -gui.partbuilder.material.pigiron=돼지 선철 -gui.partbuilder.material.thaumium=사우뮴 +material.wood=나무 +material.stone=돌 +material.iron=철 +material.flint=부싯돌 +material.cactus=선인장 +material.bone=뼈 +material.obsidian=흑요석 +material.netherrack=네더랙 +material.slime=슬라임 +material.paper=종이: +material.blueslime=푸른 슬라임 +material.cobalt=코발트 +material.ardite=아르다이트 +material.manyullyn=마뉼린 +material.copper=구리 +material.bronze=청동 +material.alumite=알루마이트 +material.steel=강철 +material.pigiron=돼지 선철 +material.thaumium=사우뮴 gui.modifier.blaze=화염 gui.modifier.silk=섬세한 손길 diff --git a/resources/assets/tinker/lang/ru_RU.lang b/resources/assets/tinker/lang/ru_RU.lang index 4c92a6b0dcd..473943e0f25 100644 --- a/resources/assets/tinker/lang/ru_RU.lang +++ b/resources/assets/tinker/lang/ru_RU.lang @@ -731,12 +731,12 @@ gui.partcrafter7=Уровень добычи: gui.partcrafter8= Сердце gui.partcrafter9= Сердца gui.partcrafter10=Урон: -gui.partcrafter.mining1=Камень -gui.partcrafter.mining2=Железо -gui.partcrafter.mining3=Красный камень -gui.partcrafter.mining4=Обсидиан -gui.partcrafter.mining5=Кобальт -gui.partcrafter.mining6=Мануллин +gui.mining1=Камень +gui.mining2=Железо +gui.mining3=Красный камень +gui.mining4=Обсидиан +gui.mining5=Кобальт +gui.mining6=Мануллин gui.stenciltable1=След. схема gui.stenciltable2=Пред. схема gui.toolforge1=Ремонт и модификация @@ -760,26 +760,26 @@ gui.toolstation16=Скорость использования: gui.toolstation17=Модификаторы gui.toolstation18=Модификаторов осталось: -gui.partbuilder.material.wood=Дерево -gui.partbuilder.material.stone=Камень -gui.partbuilder.material.iron=Железо -gui.partbuilder.material.flint=Кремень -gui.partbuilder.material.cactus=Кактус -gui.partbuilder.material.bone=Кость -gui.partbuilder.material.obsidian=Обсидиан -gui.partbuilder.material.netherrack=Камень Нижнего мира -gui.partbuilder.material.slime=Слизь -gui.partbuilder.material.paper=Бумага -gui.partbuilder.material.blueslime=Синяя слизь -gui.partbuilder.material.cobalt=Кобальт -gui.partbuilder.material.ardite=Ардит -gui.partbuilder.material.manyullyn=Мануллин -gui.partbuilder.material.copper=Медь -gui.partbuilder.material.bronze=Бронза -gui.partbuilder.material.alumite=Алюмит -gui.partbuilder.material.steel=Сталь -gui.partbuilder.material.pigiron=Свиное железо -gui.partbuilder.material.thaumium=Таум-металл +material.wood=Дерево +material.stone=Камень +material.iron=Железо +material.flint=Кремень +material.cactus=Кактус +material.bone=Кость +material.obsidian=Обсидиан +material.netherrack=Камень Нижнего мира +material.slime=Слизь +material.paper=Бумага +material.blueslime=Синяя слизь +material.cobalt=Кобальт +material.ardite=Ардит +material.manyullyn=Мануллин +material.copper=Медь +material.bronze=Бронза +material.alumite=Алюмит +material.steel=Сталь +material.pigiron=Свиное железо +material.thaumium=Таум-металл gui.modifier.blaze=Огонь gui.modifier.silk=Шёлковое касание diff --git a/resources/assets/tinker/lang/zh_CN.lang b/resources/assets/tinker/lang/zh_CN.lang index 8828f55b3a9..ef81ad5e361 100644 --- a/resources/assets/tinker/lang/zh_CN.lang +++ b/resources/assets/tinker/lang/zh_CN.lang @@ -731,12 +731,12 @@ gui.partcrafter7=采掘等级: gui.partcrafter8= 心 gui.partcrafter9= 心 gui.partcrafter10=攻击力: -gui.partcrafter.mining1=石头 -gui.partcrafter.mining2=铁 -gui.partcrafter.mining3=红石 -gui.partcrafter.mining4=黑曜石 -gui.partcrafter.mining5=钴 -gui.partcrafter.mining6=玛玉灵 +gui.mining1=石头 +gui.mining2=铁 +gui.mining3=红石 +gui.mining4=黑曜石 +gui.mining5=钴 +gui.mining6=玛玉灵 gui.stenciltable1=下一种模具 gui.stenciltable2=上一种模具 gui.toolforge1=修复&强化 @@ -760,26 +760,26 @@ gui.toolstation16=使用速度: gui.toolstation17=强化次数 gui.toolstation18=剩余强化次数: -gui.partbuilder.material.wood=木 -gui.partbuilder.material.stone=石 -gui.partbuilder.material.iron=铁 -gui.partbuilder.material.flint=燧石 -gui.partbuilder.material.cactus=仙人掌 -gui.partbuilder.material.bone=骨头 -gui.partbuilder.material.obsidian=黑曜石 -gui.partbuilder.material.netherrack=地狱岩 -gui.partbuilder.material.slime=史莱姆 -gui.partbuilder.material.paper=纸 -gui.partbuilder.material.blueslime=蓝史莱姆 -gui.partbuilder.material.cobalt=钴 -gui.partbuilder.material.ardite=阿迪特 -gui.partbuilder.material.manyullyn=玛玉灵 -gui.partbuilder.material.copper=铜 -gui.partbuilder.material.bronze=青铜 -gui.partbuilder.material.alumite=耐酸铝 -gui.partbuilder.material.steel=钢 -gui.partbuilder.material.pigiron=生铁 -gui.partbuilder.material.thaumium=神秘 +material.wood=木 +material.stone=石 +material.iron=铁 +material.flint=燧石 +material.cactus=仙人掌 +material.bone=骨头 +material.obsidian=黑曜石 +material.netherrack=地狱岩 +material.slime=史莱姆 +material.paper=纸 +material.blueslime=蓝史莱姆 +material.cobalt=钴 +material.ardite=阿迪特 +material.manyullyn=玛玉灵 +material.copper=铜 +material.bronze=青铜 +material.alumite=耐酸铝 +material.steel=钢 +material.pigiron=生铁 +material.thaumium=神秘 gui.modifier.blaze=烈焰 gui.modifier.silk=精准采集 diff --git a/src/main/java/tconstruct/library/util/HarvestLevels.java b/src/main/java/tconstruct/library/util/HarvestLevels.java index 2e43b213674..b7383a4911f 100644 --- a/src/main/java/tconstruct/library/util/HarvestLevels.java +++ b/src/main/java/tconstruct/library/util/HarvestLevels.java @@ -19,7 +19,7 @@ public static String getHarvestLevelName (int num) { // 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))); diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 14cfc408ab5..5b5299e25d9 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -783,8 +783,7 @@ private void modIntegration() 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) diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index ce2fefcd624..ae94b462419 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -20,6 +20,7 @@ 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 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) 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 @@ else if (categories.contains("harvest")) 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 @@ else if (categories.contains("utility")) } } - 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;