From 9eb8961faf9cc2adc257b7c8b7846a54c4496d61 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Tue, 24 Dec 2024 16:44:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96NBT#PrepareTime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/atsuishio/superbwarfare/event/GunEventHandler.java   | 5 +++--
 .../java/com/atsuishio/superbwarfare/tools/GunsTool.java     | 3 ++-
 src/main/resources/data/superbwarfare/guns/k_98.json         | 2 +-
 src/main/resources/data/superbwarfare/guns/m_870.json        | 2 +-
 src/main/resources/data/superbwarfare/guns/marlin.json       | 2 +-
 src/main/resources/data/superbwarfare/guns/mosin_nagant.json | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
index 7682a3c5a..b70a26a17 100644
--- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
+++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
@@ -554,8 +554,9 @@ public class GunEventHandler {
                 player.getCooldowns().addCooldown(stack.getItem(), (int) tag.getDouble("prepare_empty"));
             } else {
                 playGunPrepareReloadSounds(player);
-                tag.putInt("prepare", (int) tag.getDouble("prepare_time") + 1);
-                player.getCooldowns().addCooldown(stack.getItem(), (int) tag.getDouble("prepare_time"));
+                int prepareTime = GunsTool.getGunIntTag(stack, "PrepareTime", 0);
+                tag.putInt("prepare", prepareTime + 1);
+                player.getCooldowns().addCooldown(stack.getItem(), prepareTime);
             }
 
             tag.putBoolean("force_stop", false);
diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
index 9c086861b..dff060cba 100644
--- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
+++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
@@ -56,7 +56,8 @@ public class GunsTool {
     // TODO 临时使用，移植完毕后删除
     private static final Set<String> STRING_SET = Set.of("EmptyReloadTime", "FireMode", "Weight", "SoundRadius", "BurstSize", "ProjectileAmount",
             "Spread", "NormalReloadTime", "Headshot", "Semi", "Burst", "Auto", "RecoilX", "RecoilY", "Velocity", "Damage", "BypassesArmor",
-            "RPM", "Magazine", "MinZoom", "MaxZoom", "CustomZoom", "ExplosionDamage", "ExplosionRadius", "BoltActionTime", "ClipLoad");
+            "RPM", "Magazine", "MinZoom", "MaxZoom", "CustomZoom", "ExplosionDamage", "ExplosionRadius", "BoltActionTime", "ClipLoad",
+            "PrepareTime");
 
     public static void initGun(Level level, ItemStack stack, String location) {
         if (level.getServer() == null) return;
diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json
index 998a451f0..4cb6ddeb1 100644
--- a/src/main/resources/data/superbwarfare/guns/k_98.json
+++ b/src/main/resources/data/superbwarfare/guns/k_98.json
@@ -12,7 +12,7 @@
   "Semi": 1,
   "EmptyReloadTime": 59,
   "ClipLoad": 1,
-  "prepare_time": 29,
+  "PrepareTime": 29,
   "iterative_time": 11,
   "finish_time": 18,
   "BypassesArmor": 0.5,
diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json
index 7a886b5cf..aeac2c962 100644
--- a/src/main/resources/data/superbwarfare/guns/m_870.json
+++ b/src/main/resources/data/superbwarfare/guns/m_870.json
@@ -11,7 +11,7 @@
   "Weight": 4,
   "FireMode": 0,
   "Semi": 1,
-  "prepare_time": 7,
+  "PrepareTime": 7,
   "prepare_load_time": 36,
   "iterative_time": 16,
   "finish_time": 12,
diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json
index c1ce4dc2d..df14a4231 100644
--- a/src/main/resources/data/superbwarfare/guns/marlin.json
+++ b/src/main/resources/data/superbwarfare/guns/marlin.json
@@ -10,7 +10,7 @@
   "Weight": 3,
   "FireMode": 0,
   "Semi": 1,
-  "prepare_time": 7,
+  "PrepareTime": 7,
   "iterative_time": 16,
   "finish_time": 19,
   "BypassesArmor": 0.3,
diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
index 5a007aecf..15a6aa1e0 100644
--- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
+++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
@@ -11,7 +11,7 @@
   "Weight": 5,
   "FireMode": 0,
   "Semi": 1,
-  "prepare_time": 29,
+  "PrepareTime": 29,
   "prepare_empty": 16,
   "iterative_time": 11,
   "finish_time": 18,