From ea6ed8899e4d814aa2f582b4c55023bc6ea9465b Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Tue, 21 Oct 2014 16:26:19 +0200 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 9e0b8030ca7bce78d7b17fb4729eb9e4c43e4f9c Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Wed, 22 Oct 2014 21:04:54 +0200 Subject: [PATCH 5/8] 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 6/8] 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 7/8] 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 8/8] 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