From 46320af06014aeef133ca0e83d359dff795866d5 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 1 Apr 2016 20:52:48 +0200 Subject: [PATCH] Tool Tips Adding Draconium to GT --- src/main/java/gregtech/api/items/GT_CoolantCell_Item.java | 5 +++-- src/main/java/gregtech/api/items/GT_Generic_Item.java | 4 ++-- src/main/java/gregtech/api/items/GT_MetaBase_Item.java | 2 +- src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 2 +- src/main/java/gregtech/api/items/GT_SolderingTool_Item.java | 2 +- src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java | 2 +- src/main/java/gregtech/common/items/GT_FluidDisplayItem.java | 3 ++- .../gregtech/common/items/GT_IntegratedCircuit_Item.java | 5 +++-- .../java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 5 +++-- src/main/java/gregtech/common/items/GT_SensorCard_Item.java | 5 +++-- 10 files changed, 20 insertions(+), 15 deletions(-) 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 1229e2f0..c085bf93 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_Generic_Item.java b/src/main/java/gregtech/api/items/GT_Generic_Item.java index a6ce9d67..42827018 100644 --- a/src/main/java/gregtech/api/items/GT_Generic_Item.java +++ b/src/main/java/gregtech/api/items/GT_Generic_Item.java @@ -95,10 +95,10 @@ public class GT_Generic_Item extends Item implements IProjectileItem { aList.add((aStack.getMaxDamage() - getDamage(aStack)) + " / " + aStack.getMaxDamage()); if (mTooltip != null) aList.add(GT_LanguageManager.getTranslation(mTooltip)); if (GT_ModHandler.isElectricItem(aStack)) aList.add("Tier: " + getTier(aStack)); - addAdditionalToolTips(aList, aStack); + addAdditionalToolTips(aList, aStack, aPlayer); } - protected void addAdditionalToolTips(List aList, ItemStack aStack) { + protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) { // } diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java index c1d8e428..c97d34f7 100644 --- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -223,7 +223,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci if (tList != null) for (IItemBehaviour tBehavior : tList) aList = tBehavior.getAdditionalToolTips(this, aList, aStack); - addAdditionalToolTips(aList, aStack); + addAdditionalToolTips(aList, aStack, aPlayer); } @Override diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index 37e1d3a9..64f1657d 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -292,7 +292,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements } @Override - public void addAdditionalToolTips(List aList, ItemStack aStack) { + public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) { long tMaxDamage = getToolMaxDamage(aStack); Materials tMaterial = getPrimaryMaterial(aStack); IToolStats tStats = getToolStats(aStack); 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 51c300c7..3273d138 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 b186cca4..db289ef2 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 c7cf0dbb..2ceeca88 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 8727d6bd..41847190 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 d938ad99..fd61199a 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; @@ -773,8 +774,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 36a83717..28472ed4 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) {