From b61b82983bb17fc17a6b8fef149fb361cf60bbfc Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Thu, 8 Aug 2024 04:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86perk=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/tools/TooltipTool.java      | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java b/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java
index 8d67dd20a..63a376333 100644
--- a/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java
+++ b/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java
@@ -84,43 +84,44 @@ public class TooltipTool {
                 .append(Component.literal(new DecimalFormat("##.##").format(byPassRate * 100) + "%").withStyle(ChatFormatting.GOLD).withStyle(ChatFormatting.BOLD)));
     }
 
-    // TODO 实现正确的nbt获取
     private static void addPerkTips(List<Component> tooltip, ItemStack stack) {
         CompoundTag ammoTag = PerkHelper.getPerkTag(stack, Perk.Type.AMMO);
         CompoundTag functionalTag = PerkHelper.getPerkTag(stack, Perk.Type.FUNCTIONAL);
         CompoundTag damageTag = PerkHelper.getPerkTag(stack, Perk.Type.DAMAGE);
 
-        tooltip.add(Component.literal(damageTag.toString()));
-
         if (!ammoTag.isEmpty() || !functionalTag.isEmpty() || !damageTag.isEmpty()) {
-            tooltip.add(Component.translatable("perk.superbwarfare.tips").withStyle(ChatFormatting.WHITE));
+            tooltip.add(Component.literal(""));
+            tooltip.add(Component.translatable("perk.superbwarfare.tips").withStyle(ChatFormatting.GOLD));
         }
 
         if (!ammoTag.isEmpty()) {
+            String id = ammoTag.getString("id").split(":")[1];
             tooltip.add(Component.translatable("perk.superbwarfare.slot_Ammo").withStyle(ChatFormatting.YELLOW)
                     .append(Component.literal(" >> "))
                     .append(Component.literal("").withStyle(ChatFormatting.RESET))
-                    .append(Component.translatable("item.superbwarfare." + ammoTag.getString("id")).withStyle(ChatFormatting.GRAY))
-                    .append(Component.literal("Lvl. " + ammoTag.getInt("level")).withStyle(ChatFormatting.GRAY)));
-            addHideText(tooltip, Component.translatable("perk.superbwarfare." + ammoTag.getString("id") + ".desc").withStyle(ChatFormatting.GRAY));
+                    .append(Component.translatable("item.superbwarfare." + id).withStyle(ChatFormatting.WHITE))
+                    .append(Component.literal(" Lvl. " + ammoTag.getInt("level")).withStyle(ChatFormatting.WHITE)));
+            addHideText(tooltip, Component.translatable("perk.superbwarfare." + id + ".desc").withStyle(ChatFormatting.GRAY));
         }
 
         if (!functionalTag.isEmpty()) {
+            String id = functionalTag.getString("id").split(":")[1];
             tooltip.add(Component.translatable("perk.superbwarfare.slot_Functional").withStyle(ChatFormatting.GREEN)
                     .append(Component.literal(" >> "))
                     .append(Component.literal("").withStyle(ChatFormatting.RESET))
-                    .append(Component.translatable("item.superbwarfare." + functionalTag.getString("id")).withStyle(ChatFormatting.GRAY))
-                    .append(Component.literal("Lvl. " + functionalTag.getInt("level")).withStyle(ChatFormatting.GRAY)));
-            addHideText(tooltip, Component.translatable("perk.superbwarfare." + functionalTag.getString("id") + ".desc").withStyle(ChatFormatting.GRAY));
+                    .append(Component.translatable("item.superbwarfare." + id).withStyle(ChatFormatting.WHITE))
+                    .append(Component.literal(" Lvl. " + functionalTag.getInt("level")).withStyle(ChatFormatting.WHITE)));
+            addHideText(tooltip, Component.translatable("perk.superbwarfare." + id + ".desc").withStyle(ChatFormatting.GRAY));
         }
 
         if (!damageTag.isEmpty()) {
+            String id = damageTag.getString("id").split(":")[1];
             tooltip.add(Component.translatable("perk.superbwarfare.slot_Damage").withStyle(ChatFormatting.RED)
                     .append(Component.literal(" >> "))
                     .append(Component.literal("").withStyle(ChatFormatting.RESET))
-                    .append(Component.translatable("item.superbwarfare." + damageTag.getString("id")).withStyle(ChatFormatting.GRAY))
-                    .append(Component.literal("Lvl. " + damageTag.getInt("level")).withStyle(ChatFormatting.GRAY)));
-            addHideText(tooltip, Component.translatable("perk.superbwarfare." + damageTag.getString("id") + ".desc").withStyle(ChatFormatting.GRAY));
+                    .append(Component.translatable("item.superbwarfare." + id).withStyle(ChatFormatting.WHITE))
+                    .append(Component.literal(" Lvl. " + damageTag.getInt("level")).withStyle(ChatFormatting.WHITE)));
+            addHideText(tooltip, Component.translatable("perk.superbwarfare." + id + ".desc").withStyle(ChatFormatting.GRAY));
         }
     }