From 681fa92af5792059f01c0c4bccaaca9653b21dee Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 16:56:59 -0400 Subject: [PATCH] Simplify these tooltip methods. --- .../items/DemonicTelepositionFocus.java | 23 ++++++++----------- .../items/EnhancedTelepositionFocus.java | 23 ++++++++----------- .../items/ReinforcedTelepositionFocus.java | 23 ++++++++----------- .../common/items/TelepositionFocus.java | 22 ++++++++---------- 4 files changed, 39 insertions(+), 52 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java index 52a86598..94488d80 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -29,18 +30,14 @@ public class DemonicTelepositionFocus extends TelepositionFocus { par3List.add(StatCollector.translateToLocal("tooltip.demonictelepfocus.desc2")); addBindingInformation(par1ItemStack, par3List); - if (!(par1ItemStack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.coords") + " " - + itemTag.getInteger("xCoord") - + ", " - + itemTag.getInteger("yCoord") - + ", " - + itemTag.getInteger("zCoord")); - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); - } + NBTTagCompound itemTag = IBindable.getTag(par1ItemStack); + par3List.add( + StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + + itemTag.getInteger("xCoord") + + ", " + + itemTag.getInteger("yCoord") + + ", " + + itemTag.getInteger("zCoord")); + par3List.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java index 427d11e3..c84b371e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -28,18 +29,14 @@ public class EnhancedTelepositionFocus extends TelepositionFocus { par3List.add(StatCollector.translateToLocal("tooltip.enhancedtelepfocus.desc")); addBindingInformation(par1ItemStack, par3List); - if (!(par1ItemStack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.coords") + " " - + itemTag.getInteger("xCoord") - + ", " - + itemTag.getInteger("yCoord") - + ", " - + itemTag.getInteger("zCoord")); - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); - } + NBTTagCompound itemTag = IBindable.getTag(par1ItemStack); + par3List.add( + StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + + itemTag.getInteger("xCoord") + + ", " + + itemTag.getInteger("yCoord") + + ", " + + itemTag.getInteger("zCoord")); + par3List.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java index cd6b6e5d..15f7716e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -29,18 +30,14 @@ public class ReinforcedTelepositionFocus extends TelepositionFocus { par3List.add(StatCollector.translateToLocal("tooltip.reinforcedtelepfocus.desc2")); addBindingInformation(par1ItemStack, par3List); - if (!(par1ItemStack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.coords") + " " - + itemTag.getInteger("xCoord") - + ", " - + itemTag.getInteger("yCoord") - + ", " - + itemTag.getInteger("zCoord")); - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); - } + NBTTagCompound itemTag = IBindable.getTag(par1ItemStack); + par3List.add( + StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + + itemTag.getInteger("xCoord") + + ", " + + itemTag.getInteger("yCoord") + + ", " + + itemTag.getInteger("zCoord")); + par3List.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java index 5d861f11..c77fe4ba 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java @@ -37,19 +37,15 @@ public class TelepositionFocus extends EnergyItems { par3List.add(StatCollector.translateToLocal("tooltip.telepositionfocus.desc")); addBindingInformation(par1ItemStack, par3List); - if (!(par1ItemStack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.coords") + " " - + itemTag.getInteger("xCoord") - + ", " - + itemTag.getInteger("yCoord") - + ", " - + itemTag.getInteger("zCoord")); - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); - } + NBTTagCompound itemTag = IBindable.getTag(par1ItemStack); + par3List.add( + StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + + itemTag.getInteger("xCoord") + + ", " + + itemTag.getInteger("yCoord") + + ", " + + itemTag.getInteger("zCoord")); + par3List.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); } @Override