Tooltip fix

9 files changed, 20 insertions, 14 deletions

diff --git a/build.properties b/build.properties
index ef5ff06b64..035cf35b96 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1566-1.7.10
 
-gt.version=5.09.19
+gt.version=5.09.20
 
 ae2.version=rv2-beta-33
 applecore.version=1.7.10-1.2.1+107.59407
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
index e6d87cfdd6..5a94d3b439 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
@@ -2,6 +2,7 @@ package gregtech.api.items;
 
 import gregtech.api.GregTech_API;
 import ic2.core.util.StackUtil;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
@@ -47,8 +48,8 @@ public class GT_CoolantCell_Item
         }
     }
 
-    public void addAdditionalToolTips(List aList, ItemStack aStack) {
-        super.addAdditionalToolTips(aList, aStack);
+    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
+        super.addAdditionalToolTips(aList, aStack, aPlayer);
         aList.add("Stored Heat: " + getHeatOfStack(aStack));
         switch (getControlTagOfStack(aStack)) {
             case 1:
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
index f2169085d6..8f28854028 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
@@ -1,6 +1,7 @@
 package gregtech.api.items;
 
 import ic2.core.util.StackUtil;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -134,8 +135,8 @@ public class GT_RadioactiveCell_Item
         setDamageForStack(stack, getDamageOfStack(stack) + Dmg);
     }
 
-    public void addAdditionalToolTips(List aList, ItemStack aStack) {
-        super.addAdditionalToolTips(aList, aStack);
+    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
+        super.addAdditionalToolTips(aList, aStack, aPlayer);
         //aList.add("Time left: " + (this.maxDelay - getDurabilityOfStack(aStack)) + " secs");
         aList.add("Durability: " + (this.maxDmg - getDurabilityOfStack(aStack)) + "/" + this.maxDmg);
     }
diff --git a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
index 51c300c751..3273d13854 100644
--- a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
+++ b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
@@ -24,7 +24,7 @@ public class GT_SolderingTool_Item extends GT_Tool_Item {
     }
 
     @Override
-    public void addAdditionalToolTips(List aList, ItemStack aStack) {
+    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
         aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Sets the Strength of outputted Redstone"));
         aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Needs Soldering Metal in Inventory!"));
     }
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
index b186cca40a..db289ef240 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
@@ -18,7 +18,7 @@ public class GT_Spray_Pepper_Item extends GT_Tool_Item {
     }
 
     @Override
-    public void addAdditionalToolTips(List aList, ItemStack aStack) {
+    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
         aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "especially Pedobears, Care Bears,"));
         aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Confession Bears, Bear Grylls"));
         aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_3", "And ofcourse Man-Bear-Pig"));
diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index c7cf0dbb48..2ceeca88ce 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -8,6 +8,7 @@ import gregtech.api.items.GT_Generic_Item;
 import gregtech.api.util.GT_Utility;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

+import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

@@ -25,7 +26,7 @@ public class GT_FluidDisplayItem
         ItemList.Display_Fluid.set(this);

     }

 

-    protected void addAdditionalToolTips(List aList, ItemStack aStack) {

+    protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {

         NBTTagCompound aNBT = aStack.getTagCompound();

         if (GT_Values.D1) {

             Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());

diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
index 8727d6bd94..4184719060 100644
--- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
+++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
@@ -12,6 +12,7 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

+import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

 

@@ -76,8 +77,8 @@ public class GT_IntegratedCircuit_Item
         return getModeString(aMetaData) + " " + (byte) (aMetaData & 0xFF);

     }

 

-    public void addAdditionalToolTips(List aList, ItemStack aStack) {

-        super.addAdditionalToolTips(aList, aStack);

+    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {

+        super.addAdditionalToolTips(aList, aStack, aPlayer);

         aList.add(GT_LanguageManager.addStringLocalization(new StringBuilder().append(getUnlocalizedName()).append(".configuration").toString(), "Configuration: ") + getConfigurationString(getDamage(aStack)));

     }

 

diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index 06a586ca7d..73439d196c 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -17,6 +17,7 @@ import gregtech.common.items.behaviors.*;
 import net.minecraft.block.Block;

 import net.minecraft.enchantment.Enchantment;

 import net.minecraft.entity.item.EntityItem;

+import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.init.Blocks;

 import net.minecraft.init.Items;

 import net.minecraft.item.EnumAction;

@@ -797,8 +798,8 @@ public class GT_MetaGenerated_Item_01
         return false;

     }

 

-    protected void addAdditionalToolTips(List aList, ItemStack aStack) {

-        super.addAdditionalToolTips(aList, aStack);

+    protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {

+        super.addAdditionalToolTips(aList, aStack, aPlayer);

         int aDamage = aStack.getItemDamage();

         if ((aDamage < 32000) && (aDamage >= 0)) {

             Materials aMaterial = GregTech_API.sGeneratedMaterials[(aDamage % 1000)];

diff --git a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
index 36a8371799..28472ed445 100644
--- a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
+++ b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
@@ -6,6 +6,7 @@ import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.items.GT_Generic_Item;

 import gregtech.api.util.GT_LanguageManager;

 import net.minecraft.creativetab.CreativeTabs;

+import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

@@ -29,8 +30,8 @@ public class GT_SensorCard_Item
         setMaxStackSize(1);

     }

 

-    public void addAdditionalToolTips(List aList, ItemStack aStack) {

-        super.addAdditionalToolTips(aList, aStack);

+    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {

+        super.addAdditionalToolTips(aList, aStack, aPlayer);

         if (aStack != null) {

             NBTTagCompound tNBT = aStack.getTagCompound();

             if (tNBT == null) {