From fed6530d9d405fed88fad10d9d89d685a95b11f9 Mon Sep 17 00:00:00 2001 From: jss2a98aj Date: Mon, 27 Feb 2023 14:23:11 -0500 Subject: [PATCH] Added a tooltip helper function --- .../api/expanded/BaubleItemHelper.java | 35 +++++++++++++++++++ .../java/baubles/common/ItemDebugger.java | 20 +++-------- .../resources/assets/baubles/lang/en_US.lang | 6 +++- 3 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 src/main/java/baubles/api/expanded/BaubleItemHelper.java diff --git a/src/main/java/baubles/api/expanded/BaubleItemHelper.java b/src/main/java/baubles/api/expanded/BaubleItemHelper.java new file mode 100644 index 0000000..b51631b --- /dev/null +++ b/src/main/java/baubles/api/expanded/BaubleItemHelper.java @@ -0,0 +1,35 @@ +package baubles.api.expanded; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.util.StatCollector; + +import java.util.List; + +public class BaubleItemHelper { + + /** + * Adds compatible slot information to an item's tooltip, but only when shift is held. + * + * @param tooltip The tooltip list. + * @param types The item's types. + * @return If shift was held. + */ + @SideOnly(Side.CLIENT) + public static boolean addSlotInformation(List tooltip, String[] types) { + boolean shiftHeld = GuiScreen.isShiftKeyDown(); + if(shiftHeld) { + tooltip.add(StatCollector.translateToLocal("tooltip.compatibleslots")); + for(int i = 0; i < types.length; i++) { + String type = StatCollector.translateToLocal("slot." + types[i]); + if(i < types.length - 1) type += ","; + tooltip.add(type); + } + } else { + tooltip.add(StatCollector.translateToLocal("tooltip.shiftprompt")); + } + return shiftHeld; + } + +} diff --git a/src/main/java/baubles/common/ItemDebugger.java b/src/main/java/baubles/common/ItemDebugger.java index 31d9e1e..1f52569 100644 --- a/src/main/java/baubles/common/ItemDebugger.java +++ b/src/main/java/baubles/common/ItemDebugger.java @@ -4,10 +4,10 @@ import java.util.List; import baubles.api.BaubleType; import baubles.api.expanded.BaubleExpandedSlots; +import baubles.api.expanded.BaubleItemHelper; import baubles.api.expanded.IBaubleExpanded; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; public class ItemDebugger extends Item implements IBaubleExpanded { @@ -28,7 +27,7 @@ public class ItemDebugger extends Item implements IBaubleExpanded { @SideOnly(Side.CLIENT) private IIcon[] icons; - + @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister ir) { @@ -72,18 +71,7 @@ public class ItemDebugger extends Item implements IBaubleExpanded { @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean debug) { - if(GuiScreen.isShiftKeyDown()) { - tooltip.add(StatCollector.translateToLocal("tooltip.compatibleslots")); - - String[] types = getBaubleTypes(stack); - for(int i = 0; i < types.length; i++) { - String type = StatCollector.translateToLocal("slot." + types[i]); - if(i < types.length - 1) type += ","; - tooltip.add(type); - } - } else { - tooltip.add(StatCollector.translateToLocal("tooltip.shiftprompt")); - } + BaubleItemHelper.addSlotInformation(tooltip, getBaubleTypes(stack)); } @Override @@ -117,7 +105,7 @@ public class ItemDebugger extends Item implements IBaubleExpanded { public boolean canUnequip(ItemStack itemStack, EntityLivingBase player) { return true; } - + @SideOnly(Side.CLIENT) public IIcon getBackgroundIconForSlotType(String type) { if(type != null && BaubleExpandedSlots.isTypeRegistered(type)) { diff --git a/src/main/resources/assets/baubles/lang/en_US.lang b/src/main/resources/assets/baubles/lang/en_US.lang index 86fd834..b88e0b3 100644 --- a/src/main/resources/assets/baubles/lang/en_US.lang +++ b/src/main/resources/assets/baubles/lang/en_US.lang @@ -10,18 +10,22 @@ button.normal=Normal keybind.baublesinventory=Baubles Inventory # # Tooltips -tooltip.compatibleslots=Equippable in the following Bauble slots: +tooltip.compatibleslots=Equippable in the following slots: tooltip.shiftprompt=Hold §bSHIFT§7 for more info. # # Slots slot.amulet=§aAmulet§7 slot.belt=§aBelt§7 slot.body=§aBody§7 +slot.boots=§aBoots§7 slot.cape=§aCape§7 slot.charm=§aCharm§7 +slot.chestplate=§aChestplate§7 slot.earring=§aEarring§7 slot.gauntlet=§aGauntlet§7 slot.head=§aHead§7 +slot.helmet=§aHelmet§7 +slot.leggings=§aLeggings§7 slot.quiver=§aQuiver§7 slot.ring=§aRing§7 slot.shield=§aShield§7