From 43e3a66c9c5dbeff0ef15a40d6850ea568b05584 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 10 May 2024 15:29:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A2=E5=A1=9E=E5=85=8B?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mcreator/target/item/gun/BocekItem.java | 5 +++-- .../mcreator/target/tools/TooltipTool.java | 22 +++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/mcreator/target/item/gun/BocekItem.java b/src/main/java/net/mcreator/target/item/gun/BocekItem.java index 179b67ef7..edbee85e7 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -8,6 +8,7 @@ import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.BocekreloadProcedure; import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.RarityTool; +import net.mcreator.target.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -136,8 +137,8 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { } @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); + public void appendHoverText(ItemStack stack, Level world, List list, TooltipFlag flag) { + TooltipTool.addBocekTips(list, stack); } @Override diff --git a/src/main/java/net/mcreator/target/tools/TooltipTool.java b/src/main/java/net/mcreator/target/tools/TooltipTool.java index 90167681c..d42654b14 100644 --- a/src/main/java/net/mcreator/target/tools/TooltipTool.java +++ b/src/main/java/net/mcreator/target/tools/TooltipTool.java @@ -68,17 +68,17 @@ public class TooltipTool { } public static void addBocekTips(List tooltip, ItemStack stack) { -// tooltip.add(Component.literal("")); -// -// double damage = (ItemNBTTool.getDouble(stack, "damage", 0) + -// ItemNBTTool.getDouble(stack, "adddamage", 0)) -// * ItemNBTTool.getDouble(stack, "damageadd", 1); -// -// tooltip.add(Component.translatable("des.target.tips.damage").withStyle(ChatFormatting.GRAY) -// .append(Component.literal("").withStyle(ChatFormatting.RESET)) -// .append(Component.literal(new DecimalFormat("##.#").format(damage)).withStyle(ChatFormatting.GREEN))); -// -// addLevelTips(tooltip, stack); + tooltip.add(Component.literal("")); + + double total = ItemNBTTool.getDouble(stack, "damage", 0) * ItemNBTTool.getDouble(stack, "damageadd", 1); + + tooltip.add(Component.translatable("des.target.tips.damage").withStyle(ChatFormatting.GRAY) + .append(Component.literal("").withStyle(ChatFormatting.RESET)) + .append(Component.literal(new DecimalFormat("##.#").format(total * 0.1) + " * 10").withStyle(ChatFormatting.GREEN)) + .append(Component.literal(" / ").withStyle(ChatFormatting.RESET)) + .append(Component.literal(new DecimalFormat("##.#").format(total)).withStyle(ChatFormatting.GREEN))); + + addLevelTips(tooltip, stack); } public static void addSentinelTips(List tooltip, ItemStack stack) {