From 18c0360ab32fedb218f6b325e7ecd549908a327a Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:00:31 +0200 Subject: [PATCH 01/11] Update RecipeHandlerToolMaterials.java --- .../plugins/nei/RecipeHandlerToolMaterials.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java index 39166a32..6029083f 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java @@ -6,6 +6,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; @@ -101,19 +102,19 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase if (crecipe.material != null) { GuiDraw.drawString(EnumChatFormatting.BOLD + crecipe.material.localizedName(), 35, 10, 0x404040, false); - GuiDraw.drawString("Base Durability: " + crecipe.material.durability, 35, 20, 0x404040, false); - GuiDraw.drawString("Handle Modifier: " + crecipe.material.handleModifier + "x", 35, 30, 0x404040, false); - GuiDraw.drawString("Full Durability: " + Math.round(crecipe.material.durability * crecipe.material.handleModifier), 35, 40, 0x404040, false); - GuiDraw.drawString("Mining Speed: " + crecipe.material.miningspeed / 100F, 35, 50, 0x404040, false); - GuiDraw.drawString("Mining Level: " + HarvestLevels.getHarvestLevelName(crecipe.material.harvestLevel), 35, 60, 0x404040, false); - String heart = crecipe.material.attack == 2 ? " Heart" : " Hearts"; + GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter4") + crecipe.material.durability, 35, 20, 0x404040, false); + GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter5") + crecipe.material.handleModifier + "x", 35, 30, 0x404040, false); + GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter11") + Math.round(crecipe.material.durability * crecipe.material.handleModifier), 35, 40, 0x404040, false); + GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter6") + crecipe.material.miningspeed / 100F, 35, 50, 0x404040, false); + GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter7") + HarvestLevels.getHarvestLevelName(crecipe.material.harvestLevel), 35, 60, 0x404040, false); + String heart = crecipe.material.attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (crecipe.material.attack() % 2 == 0) { - GuiDraw.drawString("Attack: " + crecipe.material.attack / 2 + heart, 35, 70, 0x404040, false); + GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter10") + crecipe.material.attack / 2 + heart, 35, 70, 0x404040, false); } else { - GuiDraw.drawString("Attack: " + crecipe.material.attack / 2F + heart, 35, 70, 0x404040, false); + GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter11") + crecipe.material.attack / 2F + heart, 35, 70, 0x404040, false); } int abilityY = 85; if (crecipe.material.reinforced > 0) From af09542f717f9ca1d4a890e655dcadaa146e451e Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:02:08 +0200 Subject: [PATCH 02/11] Update en_US.lang --- resources/assets/tinker/lang/en_US.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index dcf93242..16ddb8b9 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -726,6 +726,7 @@ gui.partcrafter7=Mining Level: gui.partcrafter8= Heart gui.partcrafter9= Hearts gui.partcrafter10=Attack: +gui.partcrafter11=Full Durability: gui.stenciltable1=Next Pattern gui.stenciltable2=Previous Pattern gui.toolforge1=Repair and Modification From 96572d1282ec85e6db27b5246e9f75d773b9da9e Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:02:11 +0200 Subject: [PATCH 03/11] Update it_IT.lang --- resources/assets/tinker/lang/it_IT.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index 07030125..23da8be0 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -745,6 +745,7 @@ gui.partcrafter7=Livello dell'attrezzo: gui.partcrafter8= Cuore gui.partcrafter9= Cuori gui.partcrafter10=Attacco: +gui.partcrafter11=Resistenza totale: gui.stenciltable1=Modello seguente gui.stenciltable2=Modello precedente gui.toolforge1=Riparare e modificare From b47464b0b0afde9748a3cc4146fe1e1de0ca6827 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:34:45 +0200 Subject: [PATCH 04/11] Update RecipeHandlerToolMaterials.java --- .../java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java index 6029083f..1e3ee128 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java @@ -60,7 +60,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase @Override public String getRecipeName () { - return "Tool Materials"; + return StatCollector.translateToLocal("tconstruct.nei.toolmaterials"); } @Override From a6760150b371afbc8aae01da93e06eca3be2f19b Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:37:12 +0200 Subject: [PATCH 05/11] Update RecipeHandlerAlloying.java --- .../java/tconstruct/plugins/nei/RecipeHandlerAlloying.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java index 2ea55b82..98de1b3f 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java @@ -5,6 +5,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import net.minecraft.util.StatCollector; + import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -86,7 +88,7 @@ public class RecipeHandlerAlloying extends RecipeHandlerBase @Override public String getRecipeName () { - return "Smeltery Alloying"; + return StatCollector.translateToLocal("tconstruct.nei.alloying"); } @Override From a924cbf98307b83a4aacdc21689d855af8155339 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:38:32 +0200 Subject: [PATCH 06/11] Update RecipeHandlerCastingBasin.java --- .../tconstruct/plugins/nei/RecipeHandlerCastingBasin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java index d9f2e50a..f87353fe 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java @@ -5,6 +5,8 @@ import java.util.List; import org.lwjgl.opengl.GL11; +import net.minecraft.util.StatCollector; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.LiquidCasting; @@ -16,7 +18,7 @@ public class RecipeHandlerCastingBasin extends RecipeHandlerCastingBase @Override public String getRecipeName () { - return "Casting Basin"; + return StatCollector.translateToLocal("tconstruct.nei.castingbasin"); } @Override From 71275e72359437151b89dd488460697e4436db4b Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:39:38 +0200 Subject: [PATCH 07/11] Update RecipeHandlerCastingTable.java --- .../tconstruct/plugins/nei/RecipeHandlerCastingTable.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java index d29c5a65..ed4cedbf 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java @@ -5,6 +5,8 @@ import java.util.List; import org.lwjgl.opengl.GL11; +import net.minecraft.util.StatCollector; + import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.LiquidCasting; @@ -16,7 +18,7 @@ public class RecipeHandlerCastingTable extends RecipeHandlerCastingBase @Override public String getRecipeName () { - return "Casting Table"; + return StatCollector.translateToLocal("tconstruct.nei.castingtable"); } @Override From 422158e879b7f2a562db8bfa4cfd30a2d075956b Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:40:58 +0200 Subject: [PATCH 08/11] Update RecipeHandlerDryingRack.java --- .../java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java index e4083cfb..e00313ea 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java @@ -6,6 +6,8 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import net.minecraft.util.StatCollector; + import tconstruct.library.crafting.DryingRackRecipes; import tconstruct.library.crafting.DryingRackRecipes.DryingRecipe; import codechicken.lib.gui.GuiDraw; @@ -46,7 +48,7 @@ public class RecipeHandlerDryingRack extends RecipeHandlerBase @Override public String getRecipeName () { - return "Drying Rack"; + return StatCollector.translateToLocal("tconstruct.nei.dryingrack"); } @Override From b9280a3b89d4d79950c8f5a4de5f50dab6f9da08 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:42:01 +0200 Subject: [PATCH 09/11] Update RecipeHandlerMelting.java --- .../java/tconstruct/plugins/nei/RecipeHandlerMelting.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java index a39636ba..15d70272 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java @@ -11,6 +11,8 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; +import net.minecraft.util.StatCollector; + import tconstruct.library.crafting.Smeltery; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; @@ -59,7 +61,7 @@ public class RecipeHandlerMelting extends RecipeHandlerBase @Override public String getRecipeName () { - return "Smeltery Melting"; + return StatCollector.translateToLocal("tconstruct.nei.melting"); } @Override From 19859f685ab7a8689df377d03590371606d05bb2 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:43:15 +0200 Subject: [PATCH 10/11] Update en_US.lang --- resources/assets/tinker/lang/en_US.lang | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 4b54435c..f763ad60 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -708,6 +708,13 @@ tconstruct.waila.contains=Contains: tconstruct.waila.subtanks=Subtanks: tconstruct.waila.invalidstructure=Invalid structure +tconstruct.nei.toolmaterials=Tool Materials +tconstruct.nei.alloying=Smeltery Alloying +tconstruct.nei.castingbasin=Casting Basin +tconstruct.nei.castingtable=Casting Table +tconstruct.nei.dryingrack=Drying Rack +tconstruct.nei.melting=Smeltery Melting + gui.smeltery.fuel=Fuel gui.smeltery.emerald=Emeralds: gui.smeltery.glass.block=Blocks: @@ -860,4 +867,4 @@ tool.kingslimeprefix=King Slime gui.toolstation.repair.title=Repair and Modification gui.toolstation.repair.desc=The main way to repair or change your tools. Place a tool and a material on the left to get started. -gui.toolstation.pickaxe.desc=The Pickaxe is a precise mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle \ No newline at end of file +gui.toolstation.pickaxe.desc=The Pickaxe is a precise mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle From b532036f5d21eef83c3c71b31674541620b529b9 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:46:30 +0200 Subject: [PATCH 11/11] Update it_IT.lang --- resources/assets/tinker/lang/it_IT.lang | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index 23da8be0..a1ec3194 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -727,6 +727,13 @@ tconstruct.waila.contains=Contiene: tconstruct.waila.subtanks=Sottocisterne: tconstruct.waila.invalidstructure=Struttura invalida +tconstruct.nei.toolmaterials=Materiali attrezzi +tconstruct.nei.alloying=Leghe della fonderia +tconstruct.nei.castingbasin=Vasca della fonderia +tconstruct.nei.castingtable=Tavolo della fonderia +tconstruct.nei.dryingrack=Stendino +tconstruct.nei.melting=Fusione della fonderia + gui.smeltery.fuel=Carburante gui.smeltery.emerald=Smeraldi: gui.smeltery.glass.block=Blocchi: