From 9447216b54cc1b816a049094b0ed9404e4a9d626 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sat, 4 Jan 2025 02:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96NBT#ChargeTime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/event/GunEventHandler.java         | 12 +++++-------
 .../superbwarfare/event/LivingEventHandler.java      |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
index 801b53064..88961fc28 100644
--- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
+++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
@@ -824,7 +824,7 @@ public class GunEventHandler {
         CompoundTag tag = stack.getOrCreateTag();
         // 启动换弹
         if (tag.getBoolean("start_sentinel_charge")) {
-            tag.putInt("sentinel_charge_time", 127);
+            GunsTool.setGunIntTag(stack, "ChargeTime", 127);
             GunsTool.setGunBooleanTag(stack, "Charging", true);
 
             SoundEvent sound1p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ModUtils.MODID, "sentinel_charge"));
@@ -835,12 +835,11 @@ public class GunEventHandler {
             tag.putBoolean("start_sentinel_charge", false);
         }
 
-        if (tag.getInt("sentinel_charge_time") > 0) {
-            tag.putInt("sentinel_charge_time", tag.getInt("sentinel_charge_time") - 1);
+        if (GunsTool.getGunIntTag(stack, "ChargeTime", 0) > 0) {
+            GunsTool.setGunIntTag(stack, "ChargeTime", GunsTool.getGunIntTag(stack, "ChargeTime", 0) - 1);
         }
 
-        if (tag.getInt("sentinel_charge_time") == 17) {
-
+        if (GunsTool.getGunIntTag(stack, "ChargeTime", 0) == 17) {
             for (var cell : player.getInventory().items) {
                 if (cell.is(ModItems.CELL.get())) {
                     assert stack.getCapability(ForgeCapabilities.ENERGY).resolve().isPresent();
@@ -866,9 +865,8 @@ public class GunEventHandler {
             }
         }
 
-        if (tag.getInt("sentinel_charge_time") == 1) {
+        if (GunsTool.getGunIntTag(stack, "ChargeTime", 0) == 1) {
             GunsTool.setGunBooleanTag(stack, "Charging", false);
         }
     }
-
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
index 7994c8042..1890cca6a 100644
--- a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
+++ b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
@@ -352,7 +352,7 @@ public class LivingEventHandler {
 
                         if (oldStack.is(ModItems.SENTINEL.get())) {
                             data.putBoolean("Charging", false);
-                            oldTags.putInt("sentinel_charge_time", 0);
+                            data.putInt("ChargeTime", 0);
                         }
 
                         player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
@@ -387,7 +387,7 @@ public class LivingEventHandler {
 
                         if (newStack.is(ModItems.SENTINEL.get())) {
                             GunsTool.setGunBooleanTag(newStack, "Charging", false);
-                            newStack.getOrCreateTag().putInt("sentinel_charge_time", 0);
+                            GunsTool.setGunIntTag(newStack, "ChargeTime", 0);
                         }
 
                         int level = PerkHelper.getItemPerkLevel(ModPerks.KILLING_TALLY.get(), newStack);