diff --git a/src/main/java/com/lzxnone/terraria/client/event/ItemTooltipHandler.java b/src/main/java/com/lzxnone/terraria/client/event/ItemTooltipHandler.java index 7dd8d17..f6da77f 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/ItemTooltipHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/ItemTooltipHandler.java @@ -91,6 +91,16 @@ public class ItemTooltipHandler { ).withStyle(ChatFormatting.RED) ); } + + double mana = magicWeapon.getManaTooltipValue(stack, player); + if(mana > 0.0D) { + event.getToolTip().add( + Component.translatable( + "tooltip.lzxnoneterraria.magic_weapon_mana", + mana == Math.rint(mana) ? String.valueOf((int) mana) : String.format("%.2f", mana) + ).withStyle(ChatFormatting.BLUE) + ); + } } } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java index 34fea59..b7516c1 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java @@ -142,25 +142,8 @@ public class MagicWeapon extends Weapon { //提供基础魔力消耗 protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { return 0.0D; } - protected double getManaTooltipValue(ItemStack stack) { - Player player = null; - if(net.neoforged.fml.loading.FMLEnvironment.dist.isClient()) { - player = net.minecraft.client.Minecraft.getInstance().player; - } - return getFinalManaConsumeRate(stack, player); - } - - @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltipComponents, TooltipFlag tooltipFlag) { - super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); - double mana = getManaTooltipValue(stack); - if(mana > 0.0D) { - tooltipComponents.add(Component.translatable( - "tooltip.lzxnoneterraria.magic_weapon_mana", - mana == Math.rint(mana) ? String.valueOf((int) mana) : String.format("%.2f", mana) - ).withStyle(ChatFormatting.BLUE)); - } + public double getManaTooltipValue(ItemStack stack, LivingEntity entity) { + return getFinalManaConsumeRate(stack, entity); } //获取最终魔力消耗 diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java index 942877e..8d3b30c 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java @@ -136,12 +136,8 @@ public class LastPrism extends MagicWeapon { } @Override - protected double getManaTooltipValue(ItemStack stack) { - Player player = null; - if(net.neoforged.fml.loading.FMLEnvironment.dist.isClient()) { - player = net.minecraft.client.Minecraft.getInstance().player; - } - return getFinalManaConsumeRate(stack, player, MANA_CONSUME_RATE.get()); + public double getManaTooltipValue(ItemStack stack, LivingEntity entity) { + return getFinalManaConsumeRate(stack, entity, MANA_CONSUME_RATE.get()); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(