From cf21a39105da95548748bcb78118ed769ca7efa2 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Tue, 16 Jul 2024 01:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=93=A8=E5=85=B5=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/mcreator/target/item/gun/Ntw20.java    | 2 +-
 src/main/java/net/mcreator/target/tools/TooltipTool.java | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/mcreator/target/item/gun/Ntw20.java b/src/main/java/net/mcreator/target/item/gun/Ntw20.java
index 68eabadd3..d7006ea9d 100644
--- a/src/main/java/net/mcreator/target/item/gun/Ntw20.java
+++ b/src/main/java/net/mcreator/target/item/gun/Ntw20.java
@@ -200,6 +200,6 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem {
 
     @Override
     public String getGunDisplayName() {
-        return "NTW_20";
+        return "NTW-20";
     }
 }
\ No newline at end of file
diff --git a/src/main/java/net/mcreator/target/tools/TooltipTool.java b/src/main/java/net/mcreator/target/tools/TooltipTool.java
index d8ba20e38..3123f93a3 100644
--- a/src/main/java/net/mcreator/target/tools/TooltipTool.java
+++ b/src/main/java/net/mcreator/target/tools/TooltipTool.java
@@ -8,6 +8,7 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities;
 
 import java.text.DecimalFormat;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class TooltipTool {
 
@@ -85,9 +86,13 @@ public class TooltipTool {
     public static void addSentinelTips(List<Component> tooltip, ItemStack stack) {
         tooltip.add(Component.literal(""));
 
-        boolean flag = ItemNBTTool.getDouble(stack, "charging_time", 0) > 0;
+        AtomicBoolean flag = new AtomicBoolean(false);
 
-        if (flag) {
+        stack.getCapability(ForgeCapabilities.ENERGY).ifPresent(
+                e -> flag.set(e.getEnergyStored() > 0)
+        );
+
+        if (flag.get()) {
             double damage = (ItemNBTTool.getDouble(stack, "damage", 0) +
                     ItemNBTTool.getDouble(stack, "add_damage", 0))
                     * ItemNBTTool.getDouble(stack, "damageadd", 1);