Improved options for localization for all Block tooltips

14 files changed, 64 insertions, 38 deletions

diff --git a/src/main/java/common/itemBlocks/IB_ItemProxyCable.java b/src/main/java/common/itemBlocks/IB_ItemProxyCable.java
index c78872327d..e4ae431c55 100644
--- a/src/main/java/common/itemBlocks/IB_ItemProxyCable.java
+++ b/src/main/java/common/itemBlocks/IB_ItemProxyCable.java
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_ItemProxyCable extends ItemBlock {
 
@@ -13,10 +14,9 @@ public class IB_ItemProxyCable extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("Connects Item Distribution Nodes");
-		lines.add("Wired networks do not require a controller");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_itemproxycable_block.0.desc"));
 	}
 }
diff --git a/src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java b/src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java
index 49fb7d7430..b0a1a558a9 100644
--- a/src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java
+++ b/src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_ItemProxyEndpoint extends ItemBlock {
 	
@@ -13,10 +14,10 @@ public class IB_ItemProxyEndpoint extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("Point the marked side to where you want to provide an inventory proxy to.");
-		lines.add("Insert an Integrated Circuit to set the network channel.");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_itemproxyendpoint_block.0.desc"));
+		lines.add(StatCollector.translateToLocal("tile.kekztech_itemproxyendpoint_block.1.desc"));
 	}
 }
diff --git a/src/main/java/common/itemBlocks/IB_ItemProxySource.java b/src/main/java/common/itemBlocks/IB_ItemProxySource.java
index 1dc70efd6e..68ab1b00ff 100644
--- a/src/main/java/common/itemBlocks/IB_ItemProxySource.java
+++ b/src/main/java/common/itemBlocks/IB_ItemProxySource.java
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_ItemProxySource extends ItemBlock {
 	
@@ -13,11 +14,11 @@ public class IB_ItemProxySource extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("Point to an inventory to act as source for the item proxy network.");
-		lines.add("Insert an Integrated Circuit to set the network channel.");
-		lines.add("Only one source can use one channel on the same network.");
+		lines.add(StatCollector.translateToLocal("tile:kekztech_itemproxysource_block.0.desc"));
+		lines.add(StatCollector.translateToLocal("tile:kekztech_itemproxysource_block.1.desc"));
+		lines.add(StatCollector.translateToLocal("tile:kekztech_itemproxysource_block.2.desc"));
 	}
 }
diff --git a/src/main/java/common/itemBlocks/IB_ItemServerDrive.java b/src/main/java/common/itemBlocks/IB_ItemServerDrive.java
index 54e431388f..a937230da5 100644
--- a/src/main/java/common/itemBlocks/IB_ItemServerDrive.java
+++ b/src/main/java/common/itemBlocks/IB_ItemServerDrive.java
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_ItemServerDrive extends ItemBlock {
 	
@@ -13,9 +14,9 @@ public class IB_ItemServerDrive extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("Item Server Storage Drive");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_itemserverdrive_block.0.desc"));
 	}
 }
diff --git a/src/main/java/common/itemBlocks/IB_ItemServerIOPort.java b/src/main/java/common/itemBlocks/IB_ItemServerIOPort.java
index 6560805cda..10803af14c 100644
--- a/src/main/java/common/itemBlocks/IB_ItemServerIOPort.java
+++ b/src/main/java/common/itemBlocks/IB_ItemServerIOPort.java
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_ItemServerIOPort extends ItemBlock {
 	
@@ -13,10 +14,9 @@ public class IB_ItemServerIOPort extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("[W.I.P - Probably doesn't work]");
-		lines.add("I/O Port for interfacing with an Item Server.");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_itemserverioport_block.0.desc"));
 	}
 }
diff --git a/src/main/java/common/itemBlocks/IB_ItemServerRackCasing.java b/src/main/java/common/itemBlocks/IB_ItemServerRackCasing.java
index 39e64dbe29..f1da1fcb5e 100644
--- a/src/main/java/common/itemBlocks/IB_ItemServerRackCasing.java
+++ b/src/main/java/common/itemBlocks/IB_ItemServerRackCasing.java
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_ItemServerRackCasing extends ItemBlock {
 	
@@ -13,9 +14,9 @@ public class IB_ItemServerRackCasing extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("Shiny new server rack");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_itemserverrackcasing_block.0.desc="));
 	}
 }
diff --git a/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java b/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
index 4a4ce6a93b..7a7927cfd1 100644
--- a/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
+++ b/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_LapotronicEnergyUnit extends ItemBlock {
 	
@@ -26,7 +27,7 @@ public class IB_LapotronicEnergyUnit extends ItemBlock {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("Part of the Lapotronic Super Capacitor");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_lapotronicenergyunit_block.desc"));
 		switch(stack.getItemDamage()) {
 		case 1: lines.add("Capacity: 100,000,000 EU"); break;
 		case 2: lines.add("Capacity: 1,000,000,000 EU"); break;
diff --git a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java b/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java
index ea056ccd11..38b8997f0f 100644
--- a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java
+++ b/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_TFFTMultiHatch extends ItemBlock {
 	
@@ -13,12 +14,12 @@ public class IB_TFFTMultiHatch extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("Special hatch for the T.F.F.T");
-		lines.add("Allows for automated interaction with all stored fluids in a single place");
-		lines.add("Right-click with screwdriver to activate auto-output");
-		lines.add("Auto-output will try to output fluids into adjacent tanks at a rate of 1000L/s per fluid");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.0.desc"));
+		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.1.desc"));
+		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.2.desc"));
+		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.3.desc"));
 	}
 }
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java
index cd6d06343f..13e6e06f50 100644
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java
@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_TFFTStorageFieldBlockT1 extends ItemBlock {
 
@@ -14,12 +15,12 @@ public class IB_TFFTStorageFieldBlockT1 extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("This is not a fluid tank");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
 		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT1.getCapacity() + "L");
-		lines.add("Power Draw: 0.5EU/t");
+		lines.add("Power Draw: +0.5EU/t");
 	}
 	
 }
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java
index 278f0eafc7..e6a680f1f6 100644
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java
@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_TFFTStorageFieldBlockT2 extends ItemBlock {
 
@@ -14,12 +15,12 @@ public class IB_TFFTStorageFieldBlockT2 extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("This is not a fluid tank");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
 		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT2.getCapacity() + "L");
-		lines.add("Power Draw: 1EU/t");
+		lines.add("Power Draw: +1EU/t");
 	}
 	
 }
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java
index 6ca99c8714..847e43f8ab 100644
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java
@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_TFFTStorageFieldBlockT3 extends ItemBlock {
 
@@ -14,12 +15,12 @@ public class IB_TFFTStorageFieldBlockT3 extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("This is not a fluid tank");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
 		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT3.getCapacity() + "L");
-		lines.add("Power Draw: 2EU/t");
+		lines.add("Power Draw: +2EU/t");
 	}
 	
 }
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java
index cc4c260a7a..ce35f9c4d4 100644
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java
@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_TFFTStorageFieldBlockT4 extends ItemBlock {
 
@@ -14,12 +15,12 @@ public class IB_TFFTStorageFieldBlockT4 extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("This is not a fluid tank");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
 		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT4.getCapacity() + "L");
-		lines.add("Power Draw: 4EU/t");
+		lines.add("Power Draw: +4EU/t");
 	}
 	
 }
diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java
index 6e147e20e3..b7c8e8190c 100644
--- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java
+++ b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java
@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 public class IB_TFFTStorageFieldBlockT5 extends ItemBlock {
 
@@ -14,12 +15,12 @@ public class IB_TFFTStorageFieldBlockT5 extends ItemBlock {
 		super(block);
 	}
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) {
-		lines.add("This is not a fluid tank");
+		lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc"));
 		lines.add("Capacity: " + Block_TFFTStorageFieldBlockT5.getCapacity() + "L");
-		lines.add("Power Draw: 8EU/t");
+		lines.add("Power Draw: +8EU/t");
 	}
 	
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index 9ad7406180..51a3c26805 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -94,24 +94,38 @@ item.kekztech_crafting_item.15.name=GDC Ceramic Plate
 # -------- TFFT: Structure Blocks

 tile.kekztech_tfftcasingblock_block.name=T.F.F.T Casing

 tile.kekztech_tfftstoragefieldblock1_block.name=T.F.F.T Storage Field Block (Tier I)

+tile.kekztech_tfftstoragefieldblock1_block.0.desc=This is not a fluid tank

 tile.kekztech_tfftstoragefieldblock2_block.name=T.F.F.T Storage Field Block (Tier II)

 tile.kekztech_tfftstoragefieldblock3_block.name=T.F.F.T Storage Field Block (Tier III)

 tile.kekztech_tfftstoragefieldblock4_block.name=T.F.F.T Storage Field Block (Tier IV)

 tile.kekztech_tfftstoragefieldblock5_block.name=T.F.F.T Storage Field Block (Tier V)

 tile.kekztech_tfftmultihatch_block.name=T.F.F.T Multi-Fluid I/O Hatch

+tile.kekztech_tfftmultihatch_block.0.desc=Special hatch for the T.F.F.T

+tile.kekztech_tfftmultihatch_block.1.desc=Allows for automated interaction with all stored fluids in a single place

+tile.kekztech_tfftmultihatch_block.2.desc=Right-click with screwdriver to activate auto-output

+tile.kekztech_tfftmultihatch_block.3.desc=Auto-output will try to output fluids into adjacent tanks at a rate of 1000L/s per fluid

 

 # -------- Item Server: Structure Blocks

 tile.kekztech_itemserverdrive_block.name=Item Server Drive

+tile.kekztech_itemserverdrive_block.0.desc=Item Server Storage Drive

 tile.kekztech_itemserverrackcasing_block.name=Item Server Rack Casing

+tile.kekztech_itemserverrackcasing_block.0.desc=Shiny new server rack

 tile.kekztech_itemserverioport_block.name=Item Server I/O Port

+tile.kekztech_itemserverioport_block.0.desc=I/O Port for interfacing with an Item Server

 

 # -------- Item Server: Crafting Components

 item.kekztech_crafting_item.16.name=Item Server Blade

 

 # -------- Item Proxy: Structure Blocks

 tile.kekztech_itemproxycable_block.name=Item Proxy Network Cable

+tile.kekztech_itemproxycable_block.0.desc=Connects Item Proxy Nodes

 tile.kekztech_itemproxysource_block.name=Item Proxy Network Source

+tile:kekztech_itemproxysource_block.0.desc=Point to an inventory to act as source for the item proxy network

+tile:kekztech_itemproxysource_block.1.desc=Insert an Integrated Circuit to set the network channel

+tile:kekztech_itemproxysource_block.2.desc=Only one source can use one channel on the same network

 tile.kekztech_itemproxyendpoint_block.name=Item Proxy Network Endpoint

+tile.kekztech_itemproxyendpoint_block.0.desc=Point the marked side to where you want to provide an inventory proxy to

+tile.kekztech_itemproxyendpoint_block.1.desc=Insert an Integrated Circuit to set the network channel

 

 # -------- Lapotronic Super Capacitor: Structure Blocks

 tile.kekztech_lapotronicenergyunit_block.0.name=Lapotronic Super Capacitor Casing

@@ -121,6 +135,7 @@ tile.kekztech_lapotronicenergyunit_block.3.name=Lapotronic Capacitor (ZPM)
 tile.kekztech_lapotronicenergyunit_block.4.name=Lapotronic Capacitor (UV)

 tile.kekztech_lapotronicenergyunit_block.5.name=Ultimate Capacitor (UHV)

 tile.kekztech_lapotronicenergyunit_block.6.name=Really Ultimate Capacitor (UEV)

+tile.kekztech_lapotronicenergyunit_block.desc=Part of the Lapotronic Super Capacitor

 

 # -------- Thaumium Reinforced Jar: Block

 tile.kekztech_thaumiumreinforcedjar_block.0.name=Thaumium Reinforced Jar