Merge branch 'master' of https://github.com/SlimeKnights/TinkersConst…

…ruct
SlimeKnights · Oct 22, 2014 · f1d0481 · f1d0481
2 parents d2681d1 + 80808e6
commit f1d0481
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 18 deletions.
diff --git 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: 

diff --git 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: 
@@ -815,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

diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java
@@ -3,6 +3,7 @@
 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 List<String> getWailaBody (ItemStack itemStack, List<String> currenttip,
             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"));
                 }
             }
         }

diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java
@@ -48,7 +48,7 @@ public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip,
 
             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;

diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java
@@ -3,6 +3,7 @@
 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 List<String> getWailaBody (ItemStack itemStack, List<String> currenttip,
             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;

diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java
@@ -3,6 +3,7 @@
 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 List<String> getWailaBody (ItemStack itemStack, List<String> currenttip,
                 List<FluidStack> 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 List<String> getWailaBody (ItemStack itemStack, List<String> currenttip,
             }
             else
             {
-                currenttip.add(SpecialChars.ITALIC + "Invalid structure");
+                currenttip.add(SpecialChars.ITALIC + StatCollector.translateToLocal("tconstruct.waila.invalidstructure"));
             }
         }
 

diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java
@@ -3,6 +3,7 @@
 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 List<String> getWailaBody (ItemStack itemStack, List<String> currenttip,
             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;