From ea6ed8899e4d814aa2f582b4c55023bc6ea9465b Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Tue, 21 Oct 2014 16:26:19 +0200 Subject: [PATCH 01/24] Update BasinDataProvider.java --- .../java/tconstruct/plugins/waila/BasinDataProvider.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java index 82c2ea19..0986dc78 100644 --- a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java @@ -3,6 +3,7 @@ package tconstruct.plugins.waila; import java.util.List; import mcp.mobius.waila.api.*; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.CastingBasinLogic; @@ -34,18 +35,18 @@ public class BasinDataProvider implements IWailaDataProvider if (te.getFluidAmount() != 0) { FluidStack fs = te.getFluid(); - currenttip.add("Liquid: " + WailaRegistrar.fluidNameHelper(fs)); - currenttip.add("Amount: " + fs.amount + "/" + te.getCapacity()); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(fs)); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + te.getCapacity()); } else { if (te.getStackInSlot(0) != null) { - currenttip.add("Contains: " + te.getStackInSlot(0).getDisplayName()); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.contains") + te.getStackInSlot(0).getDisplayName()); } else { - currenttip.add(SpecialChars.ITALIC + "Empty"); + currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); } } } From 8c5f27144a2939152ef844be7392eb6b212659a7 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Tue, 21 Oct 2014 16:29:54 +0200 Subject: [PATCH 02/24] Update SearedTankDataProvider.java --- .../tconstruct/plugins/waila/SearedTankDataProvider.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java index e552f5e1..6c23b50d 100644 --- a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java @@ -3,6 +3,7 @@ package tconstruct.plugins.waila; import java.util.List; import mcp.mobius.waila.api.*; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.LavaTankLogic; @@ -30,12 +31,12 @@ public class SearedTankDataProvider implements IWailaDataProvider if (te.containsFluid()) { FluidStack fs = te.tank.getFluid(); - currenttip.add("Liquid: " + WailaRegistrar.fluidNameHelper(fs)); - currenttip.add("Amount: " + fs.amount + "/" + te.tank.getCapacity()); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(fs)); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + te.tank.getCapacity()); } else { - currenttip.add(SpecialChars.ITALIC + "Empty"); + currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); } } return currenttip; From 742f5346bb079f07bd5110def289134629ec5c74 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Tue, 21 Oct 2014 16:31:21 +0200 Subject: [PATCH 03/24] Update SmelteryDataProvider.java --- .../java/tconstruct/plugins/waila/SmelteryDataProvider.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java index e2db11dd..fb10ebce 100644 --- a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java @@ -3,6 +3,7 @@ package tconstruct.plugins.waila; import java.util.List; import mcp.mobius.waila.api.*; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.SmelteryLogic; @@ -32,7 +33,7 @@ public class SmelteryDataProvider implements IWailaDataProvider List fls = te.moltenMetal; if (fls.size() <= 0) { - currenttip.add(SpecialChars.ITALIC + "Empty"); + currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty")); } else { @@ -45,7 +46,7 @@ public class SmelteryDataProvider implements IWailaDataProvider } else { - currenttip.add(SpecialChars.ITALIC + "Invalid structure"); + currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.invalidstructure")); } } From f0ffabd3ebef837f6736f123482b136db356bc31 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Tue, 21 Oct 2014 16:32:15 +0200 Subject: [PATCH 04/24] Update TableDataProvider.java --- .../java/tconstruct/plugins/waila/TableDataProvider.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java index e50c05c5..d56f07f5 100644 --- a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java @@ -3,6 +3,7 @@ package tconstruct.plugins.waila; import java.util.List; import mcp.mobius.waila.api.*; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import tconstruct.smeltery.logic.CastingTableLogic; public class TableDataProvider implements IWailaDataProvider @@ -33,12 +34,12 @@ public class TableDataProvider implements IWailaDataProvider CastingTableLogic te = (CastingTableLogic) accessor.getTileEntity(); if (te.getStackInSlot(1) != null) { - currenttip.add("Contains: " + te.getStackInSlot(1).getDisplayName()); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.contains") + te.getStackInSlot(1).getDisplayName()); } if (te.getFluid() != null) { - currenttip.add("Fluid: " + WailaRegistrar.fluidNameHelper(te.getFluid())); - currenttip.add("Amount: " + te.getFluidAmount() + "/" + te.getCapacity()); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(te.getFluid())); + currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + te.getFluidAmount() + "/" + te.getCapacity()); } } return currenttip; From 2a2cf766859d898adf80c7ce96f2dfc0d9aa2b37 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 22 Oct 2014 19:56:25 +0200 Subject: [PATCH 05/24] Remove tool crafting code that doesn't work and shouldn't exist from tinker table. Also fixes crashes with ITT repair in tinker tables. --- .../inventory/CraftingStationContainer.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java index 965d9eb9..4c60e9b4 100644 --- a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java @@ -233,25 +233,6 @@ public class CraftingStationContainer extends Container return itemstack; } - protected void craftTool (ItemStack stack) - { - if (stack.getItem() instanceof IModifyable) - { - NBTTagCompound tags = stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); - Boolean full = (logic.getStackInSlot(2) != null || logic.getStackInSlot(3) != null); - /*for (int i = 1; i <= 4; i++) - logic.decrStackSize(i, 1); - for (int i = 6; i <= 9; i++) - logic.decrStackSize(i, 1);*/ - ItemStack compare = logic.getStackInSlot(5); - int amount = compare.getItem() instanceof IModifyable ? compare.stackSize : 1; - logic.decrStackSize(5, amount); - if (!player.worldObj.isRemote && full) - worldObj.playSoundEffect(logic.xCoord, logic.yCoord, logic.zCoord, "tinker:little_saw", 1.0F, (AbilityHelper.random.nextFloat() - AbilityHelper.random.nextFloat()) * 0.2F + 1.0F); - MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.logic, player, stack)); - } - } - protected boolean mergeCraftedStack (ItemStack stack, int slotsStart, int slotsTotal, boolean playerInventory, EntityPlayer player) { boolean failedToMerge = false; @@ -283,7 +264,6 @@ public class CraftingStationContainer extends Container if (copyStack == null) { - craftTool(stack); otherInventorySlot.putStack(stack.copy()); otherInventorySlot.onSlotChanged(); stack.stackSize = 0; From 9e0b8030ca7bce78d7b17fb4729eb9e4c43e4f9c Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 21:04:54 +0200 Subject: [PATCH 06/24] Update en_US.lang --- resources/assets/tinker/lang/en_US.lang | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 5e6d70e0..dcf93242 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -701,6 +701,13 @@ smeltery.brick.tooltip2=(Safe for decoration) #Dear translators, only translate this line if the joke is applicable in your language. grout.tooltip=I am Grout! +tconstruct.waila.empty=Empty +tconstruct.waila.liquidtag=Liquid: +tconstruct.waila.amounttag=Amount: +tconstruct.waila.contains=Contains: +tconstruct.waila.subtanks=Subtanks: +tconstruct.waila.invalidstructure=Invalid structure + gui.smeltery.fuel=Fuel gui.smeltery.emerald=Emeralds: gui.smeltery.glass.block=Blocks: From 5369d314d651e8888a0c836139f8ae2e037f5e3a Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 21:07:02 +0200 Subject: [PATCH 07/24] 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 ce7d9d72..6969a73d 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -720,6 +720,13 @@ smeltery.brick.tooltip2=(Usabile anche come decorazione) #Dear translators, only translate this line if the joke is applicable in your language. grout.tooltip=I am Grout! +tconstruct.waila.empty=Vuoto +tconstruct.waila.liquidtag=Liquido: +tconstruct.waila.amounttag=Quantità: +tconstruct.waila.contains=Contiene: +tconstruct.waila.subtanks=Sottocisterne: +tconstruct.waila.invalidstructure=Struttura invalida + gui.smeltery.fuel=Carburante gui.smeltery.emerald=Smeraldi: gui.smeltery.glass.block=Blocchi: From f6d0d80c0731f93e4259510f728bc53fa20d26d2 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 21:19:55 +0200 Subject: [PATCH 08/24] Update CastingChannelDataProvider.java --- .../tconstruct/plugins/waila/CastingChannelDataProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java index e444c761..b112a12f 100644 --- a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java @@ -48,7 +48,7 @@ public class CastingChannelDataProvider implements IWailaDataProvider currenttip.add(StatCollector.translateToLocal("tconstruct.waila.subtanks")); String s1, s2, s3, s4; - s1 = s2 = s3 = s4 = SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.empty"); + s1 = s2 = s3 = s4 = StatCollector.translateToLocal("tconstruct.waila.empty"); if (northTank.fluid != null) s1 = northTank.fluid.amount + " / " + northTank.capacity; From 4ede7e959667392a03a3bc7ed01cc1f990f4d184 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 21:22:16 +0200 Subject: [PATCH 09/24] Update it_IT.lang --- resources/assets/tinker/lang/it_IT.lang | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index 6969a73d..07030125 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -822,11 +822,6 @@ gui.modifier.necro=Necrotico gui.modifier.spider=Anti ragno gui.modifier.quartz=Quarzo -tconstruct.waila.empty=Vuoto -tconstruct.waila.liquidtag=Liquido: -tconstruct.waila.amounttag=Quantità: -tconstruct.waila.invalidstructure=Struttura invalida - modifier.armour.jump.double=Salto doppio modifier.armour.jump.triple=Salto triplo modifier.armour.jump.quad=Salto quadruplo From d2681d11c7d372b0469e6824f7d29da7aee3ea63 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 22 Oct 2014 21:55:04 +0200 Subject: [PATCH 10/24] Add localization for king slime tools --- resources/assets/tinker/lang/en_US.lang | 4 ++++ src/main/java/tconstruct/world/entity/BlueSlime.java | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 5e6d70e0..36fce980 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -844,3 +844,7 @@ tool.arrow=Arrow # Customization of default tool names based on tool and material #tool.shovel.wood=Wooden Shovel + +tool.kingslimeprefix=King Slime +# Specific localization like materials +#tool.shovel.kingslime=Regret diff --git a/src/main/java/tconstruct/world/entity/BlueSlime.java b/src/main/java/tconstruct/world/entity/BlueSlime.java index a60f6f91..f3d8246d 100644 --- a/src/main/java/tconstruct/world/entity/BlueSlime.java +++ b/src/main/java/tconstruct/world/entity/BlueSlime.java @@ -462,7 +462,15 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData final ItemStack handleStack = new ItemStack(tool.getHandleItem(), 1, 17); final ItemStack accessoryStack = tool.getAccessoryItem() != null ? new ItemStack(tool.getAccessoryItem(), 1, 17) : null; final ItemStack extraStack = tool.getExtraItem() != null ? new ItemStack(tool.getExtraItem(), 1, 17) : null; - ItemStack toolStack = ToolBuilder.instance.buildTool(headStack, handleStack, accessoryStack, extraStack, "King Slime " + tool.getLocalizedToolName()); + + String loc = "tool." + tool.getToolName().toLowerCase() + ".kingslime"; // special localization the same way as materials + String name; + if(StatCollector.canTranslate(loc)) + name = StatCollector.translateToLocal(loc); + else + name = StatCollector.translateToLocal("tool.kingslimeprefix") + " " + tool.getLocalizedToolName(); + + ItemStack toolStack = ToolBuilder.instance.buildTool(headStack, handleStack, accessoryStack, extraStack, name); if (toolStack != null) { From 18c0360ab32fedb218f6b325e7ecd549908a327a Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:00:31 +0200 Subject: [PATCH 11/24] 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 12/24] 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 13/24] 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 ffcd7f26b4bcec1ff286d40165c5ca9f6590b903 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 22 Oct 2014 22:22:00 +0200 Subject: [PATCH 14/24] Step 1: Give @TheVikingWarrior an example of how to translate toolstation tool descriptions --- resources/assets/tinker/lang/en_US.lang | 5 +++++ .../java/tconstruct/tools/ToolProxyClient.java | 14 ++++++++------ .../java/tconstruct/tools/gui/ToolStationGui.java | 10 +++++++++- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index c514c616..19761a2b 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -855,3 +855,8 @@ tool.arrow=Arrow tool.kingslimeprefix=King Slime # Specific localization like materials #tool.shovel.kingslime=Regret + + +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 diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java index c51cdff7..06cab492 100644 --- a/src/main/java/tconstruct/tools/ToolProxyClient.java +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.*; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.event.sound.SoundLoadEvent; @@ -396,12 +397,7 @@ public class ToolProxyClient extends ToolProxyCommon new int[] { 7, 0, 13, 13 }, new int[] { 3, 3, 13, 13 } // Chisel }; - static String[] toolNames = { "Repair and Modification", "Pickaxe", "Shovel", "Hatchet", - // "Lumber Axe", - // "Ice Axe", - "Mattock", "Broadsword", "Longsword", "Rapier", "Dagger", "Frying Pan", "Battlesign", "Chisel" }; - - static String[] toolDescriptions = { "The main way to repair or change your tools. Place a tool and a material on the left to get started.", "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", "The Shovel is a precise digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle", "The Hatchet is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle", + static String[] toolDescriptions = { "gui.toolstation.repair.desc", "gui.toolstation.pickaxe.desc", "The Shovel is a precise digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle", "The Hatchet is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle", // "The Lumber Axe is a broad chopping tool. It harvests wood in a wide range and can fell entire trees.\n\nRequired parts:\n- Broad Axe Head\n- Handle", // "The Ice Axe is a tool for harvesting ice, mining, and attacking foes.\n\nSpecial Ability:\n- Wall Climb\nNatural Ability:\n- Ice Harvest\nDamage: Moderate\n\nRequired parts:\n- Pickaxe Head\n- Spike\n- Handle", "The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle", "The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle", "The Longsword is an offensive weapon. It is often used for charging into battle at full speed.\n\nNatural Ability:\n- Charge Boost\nSpecial Ability: Lunge\n\nDamage: Moderate\nDurability: Moderate", "The Rapier is a special weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nSpecial Ability:\n- Backpedal\n\nDamage: Low\nDurability: Low", "The Dagger is a short blade that can be thrown.\n\nSpecial Ability:\n- Throw Item\n\nDamage: Low\nDurability: Moderate\n\nRequired parts:\n- Knife Blade\n- Crossbar\n- Handle", "The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Heavy\nShift+rClick: Place Frying Pan\nDamage: Low\nDurability: High\n\nRequired parts:\n- Pan\n- Handle", @@ -410,6 +406,12 @@ public class ToolProxyClient extends ToolProxyCommon void addToolButtons () { + // has to be in here so TinkerTools.tool is already initialized + final String[] toolNames = {StatCollector.translateToLocal("gui.toolstation.repair.title"), TinkerTools.pickaxe.getLocalizedToolName(), "Shovel", "Hatchet", + // "Lumber Axe", + // "Ice Axe", + "Mattock", "Broadsword", "Longsword", "Rapier", "Dagger", "Frying Pan", "Battlesign", "Chisel" }; + for (int i = 0; i < toolNames.length; i++) { addToolButton(itemIcons[i][0], itemIcons[i][1], itemIcons[i][2], iconCoords[i * 2], iconCoords[i * 2 + 1], toolNames[i], toolDescriptions[i]); diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index f7770bd2..72726167 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -120,7 +120,15 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler iconX = element.iconsX; iconY = element.iconsY; title = "\u00A7n" + element.title; - body = element.body; + body = StatCollector.translateToLocal(element.body); + if(body != null) { + int i; + // for some really weird reason replaceAll doesn't find "\\n", but indexOf does. We have to replace manually. + while((i = body.indexOf("\\n")) >= 0) + { + body = body.substring(0, i) + '\n' + body.substring(i+2); + } + } } void setSlotType (int type) From b47464b0b0afde9748a3cc4146fe1e1de0ca6827 Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 22:34:45 +0200 Subject: [PATCH 15/24] 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 16/24] 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 17/24] 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 18/24] 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 19/24] 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 20/24] 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 21/24] 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 22/24] 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: From e37b32234fbd278614c5bd0e6925a21972035d85 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 22 Oct 2014 22:51:08 +0200 Subject: [PATCH 23/24] Fix armorcontrols having two separate instances. Fixes doublejump issue #1108 --- src/main/java/tconstruct/armor/ArmorAbilitiesClient.java | 4 ++-- src/main/java/tconstruct/armor/ArmorProxyClient.java | 8 +++++++- src/main/java/tconstruct/armor/ArmorProxyCommon.java | 2 ++ src/main/java/tconstruct/armor/TinkerArmor.java | 8 ++------ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java index 2d2b8d82..874314ca 100644 --- a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java +++ b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java @@ -13,8 +13,8 @@ import tconstruct.library.modifier.IModifyable; public class ArmorAbilitiesClient { - Minecraft mc; - ArmorControls controlInstance; + private final Minecraft mc; + private final ArmorControls controlInstance; ItemStack prevFeet; double prevMotionY; diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index c9288d71..8e8ac926 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -47,6 +47,13 @@ public class ArmorProxyClient extends ArmorProxyCommon public static KnapsackInventory knapsack = new KnapsackInventory(); public static ArmorExtended armorExtended = new ArmorExtended(); + @Override + public void preInit() { + controlInstance = new ArmorControls(); + FMLCommonHandler.instance().bus().register(controlInstance); + MinecraftForge.EVENT_BUS.register(new TabRegistry()); + } + @Override public void initialize () { @@ -148,7 +155,6 @@ public class ArmorProxyClient extends ArmorProxyCommon @Override public void registerKeys () { - controlInstance = new ArmorControls(); uploadKeyBindingsToGame(Minecraft.getMinecraft().gameSettings, controlInstance); TabRegistry.registerTab(new InventoryTabVanilla()); diff --git a/src/main/java/tconstruct/armor/ArmorProxyCommon.java b/src/main/java/tconstruct/armor/ArmorProxyCommon.java index 502ae839..d7df1d28 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyCommon.java +++ b/src/main/java/tconstruct/armor/ArmorProxyCommon.java @@ -13,6 +13,8 @@ public class ArmorProxyCommon implements IGuiHandler public static final int armorGuiID = 101; public static final int knapsackGuiID = 102; + public void preInit() {} + public void initialize () { registerGuiHandler(); diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java index 747ef6a5..4ecb52c0 100644 --- a/src/main/java/tconstruct/armor/TinkerArmor.java +++ b/src/main/java/tconstruct/armor/TinkerArmor.java @@ -76,15 +76,11 @@ public class TinkerArmor @Handler public void preInit (FMLPreInitializationEvent event) { + proxy.preInit(); + MinecraftForge.EVENT_BUS.register(new TinkerArmorEvents()); FMLCommonHandler.instance().bus().register(new ArmorAbilities()); - if (event.getSide() == Side.CLIENT) - { - FMLCommonHandler.instance().bus().register(new ArmorControls()); - MinecraftForge.EVENT_BUS.register(new TabRegistry()); - } - TinkerArmor.dryingRack = new DryingRack().setBlockName("Armor.DryingRack"); GameRegistry.registerBlock(TinkerArmor.dryingRack, "Armor.DryingRack"); GameRegistry.registerTileEntity(DryingRackLogic.class, "Armor.DryingRack"); From 8b154ea1b92935b14ac552fe2ca4c54ce9f796f8 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 22 Oct 2014 23:00:38 +0200 Subject: [PATCH 24/24] Register belt/goggle packets. You can actually deactivate goggles now, wooooo --- src/main/java/tconstruct/armor/player/TPlayerStats.java | 2 +- src/main/java/tconstruct/client/ArmorControls.java | 1 + src/main/java/tconstruct/util/network/PacketPipeline.java | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/armor/player/TPlayerStats.java b/src/main/java/tconstruct/armor/player/TPlayerStats.java index 444e282b..d5bd3d77 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerStats.java +++ b/src/main/java/tconstruct/armor/player/TPlayerStats.java @@ -22,7 +22,7 @@ public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedI public int previousDimension; public boolean climbWalls; - public boolean activeGoggles = true; + public boolean activeGoggles = false; public boolean beginnerManual; public boolean materialManual; diff --git a/src/main/java/tconstruct/client/ArmorControls.java b/src/main/java/tconstruct/client/ArmorControls.java index 378f5ac2..22424d98 100644 --- a/src/main/java/tconstruct/client/ArmorControls.java +++ b/src/main/java/tconstruct/client/ArmorControls.java @@ -107,6 +107,7 @@ public class ArmorControls extends TKeyHandler if (goggles != null && goggles.getItem() instanceof TravelGear) //TODO: Genericize this { activeGoggles = !activeGoggles; + PlayerAbilityHelper.toggleGoggles(mc.thePlayer, activeGoggles); toggleGoggles(); } } diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index 36805af3..b64ab5e5 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -129,6 +129,9 @@ public class PacketPipeline extends MessageToMessageCodec