Added Tooltip for Canister Holding Items

Traverse-Joe · Nov 19, 2024 · 0e3d45e · 0e3d45e
1 parent 39c7b18
commit 0e3d45e
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -29,7 +29,7 @@ mod_name=Baubley Heart Canisters
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=1.1.2
+mod_version=1.2.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

diff --git a/src/main/java/com/traverse/bhc/common/items/ItemHeartAmulet.java b/src/main/java/com/traverse/bhc/common/items/ItemHeartAmulet.java
@@ -1,12 +1,16 @@
 package com.traverse.bhc.common.items;
 
+import com.traverse.bhc.common.BaubleyHeartCanisters;
 import com.traverse.bhc.common.container.HeartAmuletContainer;
 import com.traverse.bhc.common.init.RegistryHandler;
+import com.traverse.bhc.common.util.HealthModifier;
 import com.traverse.bhc.common.util.HeartType;
 import com.traverse.bhc.common.util.SoulContainerProvider;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.LivingEntity;
@@ -22,6 +26,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.IntStream;
 
 import static com.traverse.bhc.common.util.HealthModifier.updatePlayerHealth;
 
@@ -48,6 +53,11 @@ public InteractionResultHolder<ItemStack> use(Level level, Player player, Intera
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         tooltipComponents.add(Component.translatable(Util.makeDescriptionId("tooltip", RegistryHandler.HEART_AMULET.getId())).withStyle(ChatFormatting.GOLD));
         super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
+        if(Screen.hasShiftDown()) {
+            int[] heartCount = new int[]{HealthModifier.getHeartCount(stack)};
+            int heartTotal = IntStream.of(heartCount).sum();
+            tooltipComponents.add(Component.translatable(Util.makeDescriptionId("tooltip", BaubleyHeartCanisters.id("heart_amount")), heartTotal).setStyle(Style.EMPTY.applyFormat(ChatFormatting.DARK_RED)));
+        }
     }
 
     @Override

diff --git a/src/main/java/com/traverse/bhc/common/items/ItemSoulHeartAmulet.java b/src/main/java/com/traverse/bhc/common/items/ItemSoulHeartAmulet.java
@@ -1,10 +1,13 @@
 package com.traverse.bhc.common.items;
 
+import com.traverse.bhc.common.BaubleyHeartCanisters;
 import com.traverse.bhc.common.container.SoulHeartAmuletContainer;
 import com.traverse.bhc.common.init.RegistryHandler;
+import com.traverse.bhc.common.util.HealthModifier;
 import com.traverse.bhc.common.util.SoulContainerProvider;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
 import net.minecraft.world.InteractionHand;
@@ -18,6 +21,7 @@
 import top.theillusivec4.curios.api.type.capability.ICurioItem;
 
 import java.util.List;
+import java.util.stream.IntStream;
 
 import static com.traverse.bhc.common.util.HealthModifier.updatePlayerHealth;
 
@@ -46,6 +50,11 @@ public InteractionResultHolder<ItemStack> use(Level level, Player player, Intera
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
         tooltipComponents.add(Component.translatable(Util.makeDescriptionId("tooltip", RegistryHandler.HEART_AMULET.getId())).setStyle(Style.EMPTY.applyFormat(ChatFormatting.GOLD)));
+        if(Screen.hasShiftDown()) {
+            int[] heartCount = new int[]{HealthModifier.getHeartCount(stack)};
+            int heartTotal = IntStream.of(heartCount).sum();
+            tooltipComponents.add(Component.translatable(Util.makeDescriptionId("tooltip", BaubleyHeartCanisters.id("heart_amount")), heartTotal).setStyle(Style.EMPTY.applyFormat(ChatFormatting.DARK_RED)));
+        }
     }
 
     @Override

diff --git a/src/main/java/com/traverse/bhc/common/items/tools/ItemBladeOfVitality.java b/src/main/java/com/traverse/bhc/common/items/tools/ItemBladeOfVitality.java
@@ -10,6 +10,7 @@
 import com.traverse.bhc.common.util.SoulContainerProvider;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.core.Holder;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
@@ -31,6 +32,7 @@
 import net.neoforged.neoforge.event.ItemAttributeModifierEvent;
 
 import java.util.List;
+import java.util.stream.IntStream;
 
 @EventBusSubscriber(modid = BaubleyHeartCanisters.MODID, bus = EventBusSubscriber.Bus.GAME)
 public class ItemBladeOfVitality extends SwordItem implements SoulContainerProvider {
@@ -101,6 +103,11 @@ public static void onAttributeModifiers(ItemAttributeModifierEvent event) {
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
         super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
         tooltipComponents.add(Component.translatable(Util.makeDescriptionId("tooltip", RegistryHandler.BLADE_OF_VITALITY.getId())).setStyle(Style.EMPTY.applyFormat(ChatFormatting.GOLD)));
+        if(Screen.hasShiftDown()) {
+            int[] heartCount = new int[]{HealthModifier.getHeartCount(stack)};
+            int heartTotal = IntStream.of(heartCount).sum();
+            tooltipComponents.add(Component.translatable(Util.makeDescriptionId("tooltip", BaubleyHeartCanisters.id("heart_amount")), heartTotal).setStyle(Style.EMPTY.applyFormat(ChatFormatting.DARK_RED)));
+        }
     }
 
     @Override

diff --git a/src/main/java/com/traverse/bhc/common/items/tools/ItemVigorBow.java b/src/main/java/com/traverse/bhc/common/items/tools/ItemVigorBow.java
@@ -7,6 +7,7 @@
 import com.traverse.bhc.common.util.SoulContainerProvider;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
 import net.minecraft.resources.ResourceLocation;
@@ -26,6 +27,7 @@
 import net.neoforged.neoforge.event.EventHooks;
 
 import java.util.List;
+import java.util.stream.IntStream;
 
 public class ItemVigorBow extends BowItem implements SoulContainerProvider {
 
@@ -126,5 +128,11 @@ public void appendHoverText(ItemStack stack, TooltipContext context, List<Compon
         if(HealthModifier.getHeartCount(stack) > 0) {
             tooltipComponents.add(Component.translatable(Util.makeDescriptionId("tooltip", BaubleyHeartCanisters.id("bonus")), HealthModifier.getHeartCount(stack)).setStyle(Style.EMPTY.applyFormat(ChatFormatting.BLUE)));
         }
+        if(Screen.hasShiftDown()) {
+            int[] heartCount = new int[]{HealthModifier.getHeartCount(stack)};
+            int heartTotal = IntStream.of(heartCount).sum();
+            tooltipComponents.add(Component.translatable(Util.makeDescriptionId("tooltip", BaubleyHeartCanisters.id("heart_amount")), heartTotal).setStyle(Style.EMPTY.applyFormat(ChatFormatting.DARK_RED)));
+        }
+
     }
 }
diff --git a/src/main/resources/assets/bhc/lang/en_us.json b/src/main/resources/assets/bhc/lang/en_us.json
@@ -34,8 +34,8 @@
   "tooltip.bhc.blade_of_vitality": "Sneak + right click to open!",
   "tooltip.bhc.patch_amount": "Heal Amount: %s",
   "tooltip.bhc.patch_durability": "Remaining uses: %s",
+  "tooltip.bhc.heart_amount": "Total Canisters: %s",
   "tooltip.bhc.bonus": "+%s Bonus Damage",
-
   "message.bhc.soul_heart_used": "Soul Heart Has Been Consumed!",
   "curios.identifier.heart_amulet": "Heart Amulet"
 }