From 8240ff4e1a8b956fa77e2f5d3d1c47ccae48dd0e Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sun, 25 May 2025 01:51:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4otto=E7=9A=84=E8=80=90?=
 =?UTF-8?q?=E4=B9=85=E6=9D=A1=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/item/ElectricBaton.java      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/item/ElectricBaton.java b/src/main/java/com/atsuishio/superbwarfare/item/ElectricBaton.java
index 2795f082f..a05f3ad88 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/ElectricBaton.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/ElectricBaton.java
@@ -71,20 +71,24 @@ public class ElectricBaton extends SwordItem implements EnergyStorageItem {
 
     @Override
     public boolean isBarVisible(@NotNull ItemStack stack) {
-        return NBTTool.getTag(stack).getBoolean(TAG_OPEN);
+        return NBTTool.getTag(stack).getBoolean(TAG_OPEN) || super.isBarVisible(stack);
     }
 
     @Override
-    public int getBarWidth(ItemStack stack) {
-        var cap = stack.getCapability(Capabilities.EnergyStorage.ITEM);
-        if (cap == null) return 0;
+    public int getBarWidth(@NotNull ItemStack stack) {
+        if (NBTTool.getTag(stack).getBoolean(TAG_OPEN)) {
+            var cap = stack.getCapability(Capabilities.EnergyStorage.ITEM);
+            if (cap == null) return 0;
 
-        return Math.round((float) cap.getEnergyStored() * 13F / MAX_ENERGY);
+            return Math.round((float) cap.getEnergyStored() * 13F / MAX_ENERGY);
+        } else {
+            return super.getBarWidth(stack);
+        }
     }
 
     @Override
-    public int getBarColor(@NotNull ItemStack pStack) {
-        return 0xFFFF00;
+    public int getBarColor(@NotNull ItemStack stack) {
+        return NBTTool.getTag(stack).getBoolean(TAG_OPEN) ? 0xFFFF00 : super.getBarColor(stack);
     }
 
     @Override