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

---
 .../com/atsuishio/superbwarfare/event/GunEventHandler.java | 7 +++----
 .../superbwarfare/network/message/ReloadMessage.java       | 6 +++---
 .../java/com/atsuishio/superbwarfare/tools/GunsTool.java   | 2 +-
 src/main/resources/data/superbwarfare/guns/aa_12.json      | 2 +-
 src/main/resources/data/superbwarfare/guns/abekiri.json    | 2 +-
 src/main/resources/data/superbwarfare/guns/ak_12.json      | 2 +-
 src/main/resources/data/superbwarfare/guns/ak_47.json      | 2 +-
 src/main/resources/data/superbwarfare/guns/devotion.json   | 2 +-
 src/main/resources/data/superbwarfare/guns/glock_17.json   | 2 +-
 src/main/resources/data/superbwarfare/guns/glock_18.json   | 2 +-
 src/main/resources/data/superbwarfare/guns/hk_416.json     | 2 +-
 src/main/resources/data/superbwarfare/guns/m_1911.json     | 2 +-
 src/main/resources/data/superbwarfare/guns/m_4.json        | 2 +-
 src/main/resources/data/superbwarfare/guns/m_60.json       | 2 +-
 src/main/resources/data/superbwarfare/guns/m_98b.json      | 2 +-
 src/main/resources/data/superbwarfare/guns/mk_14.json      | 2 +-
 src/main/resources/data/superbwarfare/guns/ntw_20.json     | 2 +-
 src/main/resources/data/superbwarfare/guns/qbz_95.json     | 2 +-
 src/main/resources/data/superbwarfare/guns/rpk.json        | 2 +-
 src/main/resources/data/superbwarfare/guns/sentinel.json   | 2 +-
 src/main/resources/data/superbwarfare/guns/sks.json        | 2 +-
 src/main/resources/data/superbwarfare/guns/svd.json        | 2 +-
 src/main/resources/data/superbwarfare/guns/vector.json     | 2 +-
 23 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
index fa8ea1170..d37e0b1c7 100644
--- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
+++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
@@ -273,6 +273,7 @@ public class GunEventHandler {
         return 1;
     }
 
+    @SuppressWarnings("ConstantValue")
     private static boolean handleButterflyBullet(Perk perk, ItemStack heldItem, Player player) {
         int perkLevel = PerkHelper.getItemPerkLevel(perk, heldItem);
 
@@ -321,7 +322,7 @@ public class GunEventHandler {
                     stack.getOrCreateTag().putBoolean("is_empty_reloading", true);
                     playGunEmptyReloadSounds(player);
                 } else {
-                    data.putInt("ReloadTime", (int) tag.getDouble("normal_reload_time") + 1);
+                    data.putInt("ReloadTime", GunsTool.getGunIntTag(stack, "NormalReloadTime") + 1);
                     stack.getOrCreateTag().putBoolean("is_normal_reloading", true);
                     playGunNormalReloadSounds(player);
                 }
@@ -845,9 +846,7 @@ public class GunEventHandler {
                         ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos())));
 
                 if (stack.is(ModItems.MARLIN.get())) {
-                    ModUtils.queueServerWork((int) (5 + 1.5 * shooterHeight), () -> {
-                        SoundTool.playLocalSound(serverPlayer, ModSounds.SHELL_CASING_NORMAL.get(), (float) Math.max(1.5 - 0.2 * shooterHeight, 0), 1);
-                    });
+                    ModUtils.queueServerWork((int) (5 + 1.5 * shooterHeight), () -> SoundTool.playLocalSound(serverPlayer, ModSounds.SHELL_CASING_NORMAL.get(), (float) Math.max(1.5 - 0.2 * shooterHeight, 0), 1));
                 }
             }
         }
diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java
index f602f3000..f915a97d8 100644
--- a/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java
+++ b/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java
@@ -1,9 +1,9 @@
 package com.atsuishio.superbwarfare.network.message;
 
-import com.atsuishio.superbwarfare.network.ModVariables;
-import com.atsuishio.superbwarfare.tools.GunsTool;
 import com.atsuishio.superbwarfare.init.ModItems;
 import com.atsuishio.superbwarfare.init.ModTags;
+import com.atsuishio.superbwarfare.network.ModVariables;
+import com.atsuishio.superbwarfare.tools.GunsTool;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.player.Player;
@@ -64,7 +64,7 @@ public class ReloadMessage {
                 CompoundTag tag = stack.getOrCreateTag();
 
                 boolean canSingleReload = tag.getDouble("iterative_time") != 0;
-                boolean canReload = (tag.getDouble("normal_reload_time") != 0 || GunsTool.getGunIntTag(stack, "EmptyReloadTime") != 0) && tag.getDouble("clipLoad") != 1;
+                boolean canReload = (GunsTool.getGunIntTag(stack, "NormalReloadTime") != 0 || GunsTool.getGunIntTag(stack, "EmptyReloadTime") != 0) && tag.getDouble("clipLoad") != 1;
                 boolean clipLoad = tag.getInt("ammo") == 0 && tag.getDouble("clipLoad") == 1;
 
                 // 检查备弹
diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
index 3bb08582b..fa8fd52e5 100644
--- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
+++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
@@ -55,7 +55,7 @@ public class GunsTool {
 
     // TODO 临时使用，移植完毕后删除
     private static final Set<String> STRING_SET = Set.of("EmptyReloadTime", "FireMode", "Weight", "SoundRadius", "BurstSize", "ProjectileAmount",
-            "Spread");
+            "Spread", "NormalReloadTime");
 
     public static void initGun(Level level, ItemStack stack, String location) {
         if (level.getServer() == null) return;
diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json
index ff92d5f72..a64e8b06a 100644
--- a/src/main/resources/data/superbwarfare/guns/aa_12.json
+++ b/src/main/resources/data/superbwarfare/guns/aa_12.json
@@ -12,7 +12,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 64,
+  "NormalReloadTime": 64,
   "EmptyReloadTime": 85,
   "BypassesArmor": 0.05,
   "SoundRadius": 18,
diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json
index 3b8053784..d4de840b7 100644
--- a/src/main/resources/data/superbwarfare/guns/abekiri.json
+++ b/src/main/resources/data/superbwarfare/guns/abekiri.json
@@ -12,7 +12,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 0,
-  "normal_reload_time": 66,
+  "NormalReloadTime": 66,
   "EmptyReloadTime": 83,
   "BypassesArmor": 0.01,
   "SoundRadius": 16,
diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json
index d5254c683..1420a632c 100644
--- a/src/main/resources/data/superbwarfare/guns/ak_12.json
+++ b/src/main/resources/data/superbwarfare/guns/ak_12.json
@@ -13,7 +13,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 52,
+  "NormalReloadTime": 52,
   "EmptyReloadTime": 58,
   "BypassesArmor": 0.23,
   "SoundRadius": 12,
diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json
index 271227eb9..ace6b1dd4 100644
--- a/src/main/resources/data/superbwarfare/guns/ak_47.json
+++ b/src/main/resources/data/superbwarfare/guns/ak_47.json
@@ -13,7 +13,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 52,
+  "NormalReloadTime": 52,
   "EmptyReloadTime": 65,
   "BypassesArmor": 0.2,
   "SoundRadius": 14,
diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json
index 163132557..162c43da1 100644
--- a/src/main/resources/data/superbwarfare/guns/devotion.json
+++ b/src/main/resources/data/superbwarfare/guns/devotion.json
@@ -12,7 +12,7 @@
   "semi": 0,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 73,
+  "NormalReloadTime": 73,
   "EmptyReloadTime": 95,
   "BypassesArmor": 0.25,
   "SoundRadius": 13,
diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json
index 9457121b8..3c0ae94ce 100644
--- a/src/main/resources/data/superbwarfare/guns/glock_17.json
+++ b/src/main/resources/data/superbwarfare/guns/glock_17.json
@@ -11,7 +11,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 0,
-  "normal_reload_time": 30,
+  "NormalReloadTime": 30,
   "EmptyReloadTime": 35,
   "BypassesArmor": 0.15,
   "SoundRadius": 8,
diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json
index a1309aefe..837cf9747 100644
--- a/src/main/resources/data/superbwarfare/guns/glock_18.json
+++ b/src/main/resources/data/superbwarfare/guns/glock_18.json
@@ -11,7 +11,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 30,
+  "NormalReloadTime": 30,
   "EmptyReloadTime": 35,
   "BypassesArmor": 0.15,
   "SoundRadius": 8,
diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json
index 384192e7c..b5a46a2a2 100644
--- a/src/main/resources/data/superbwarfare/guns/hk_416.json
+++ b/src/main/resources/data/superbwarfare/guns/hk_416.json
@@ -13,7 +13,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 56,
+  "NormalReloadTime": 56,
   "EmptyReloadTime": 64,
   "BypassesArmor": 0.25,
   "SoundRadius": 14,
diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json
index ea6b799f1..a0a6b7d54 100644
--- a/src/main/resources/data/superbwarfare/guns/m_1911.json
+++ b/src/main/resources/data/superbwarfare/guns/m_1911.json
@@ -11,7 +11,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 0,
-  "normal_reload_time": 30,
+  "NormalReloadTime": 30,
   "EmptyReloadTime": 35,
   "BypassesArmor": 0.2,
   "SoundRadius": 10,
diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json
index 3c52f9e61..06adc6f9f 100644
--- a/src/main/resources/data/superbwarfare/guns/m_4.json
+++ b/src/main/resources/data/superbwarfare/guns/m_4.json
@@ -13,7 +13,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 56,
+  "NormalReloadTime": 56,
   "EmptyReloadTime": 64,
   "BypassesArmor": 0.25,
   "SoundRadius": 14,
diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json
index 65d67d8e2..1c79be99d 100644
--- a/src/main/resources/data/superbwarfare/guns/m_60.json
+++ b/src/main/resources/data/superbwarfare/guns/m_60.json
@@ -11,7 +11,7 @@
   "semi": 0,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 114,
+  "NormalReloadTime": 114,
   "EmptyReloadTime": 133,
   "BypassesArmor": 0.25,
   "SoundRadius": 15,
diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json
index 650c4f3d7..24f00d52d 100644
--- a/src/main/resources/data/superbwarfare/guns/m_98b.json
+++ b/src/main/resources/data/superbwarfare/guns/m_98b.json
@@ -15,7 +15,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 0,
-  "normal_reload_time": 60,
+  "NormalReloadTime": 60,
   "EmptyReloadTime": 78,
   "BypassesArmor": 0.6,
   "SoundRadius": 18
diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json
index f28c14cf1..014062a17 100644
--- a/src/main/resources/data/superbwarfare/guns/mk_14.json
+++ b/src/main/resources/data/superbwarfare/guns/mk_14.json
@@ -13,7 +13,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 54,
+  "NormalReloadTime": 54,
   "EmptyReloadTime": 71,
   "BypassesArmor": 0.4,
   "SoundRadius": 16,
diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json
index a46ee4141..379c4f6b3 100644
--- a/src/main/resources/data/superbwarfare/guns/ntw_20.json
+++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json
@@ -13,7 +13,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 0,
-  "normal_reload_time": 63,
+  "NormalReloadTime": 63,
   "EmptyReloadTime": 92,
   "BypassesArmor": 1,
   "SoundRadius": 22
diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json
index 3d56f6505..70923e76b 100644
--- a/src/main/resources/data/superbwarfare/guns/qbz_95.json
+++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json
@@ -13,7 +13,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 60,
+  "NormalReloadTime": 60,
   "EmptyReloadTime": 74,
   "BypassesArmor": 0.28,
   "SoundRadius": 13,
diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json
index b4fec18a8..1fa2bd6bc 100644
--- a/src/main/resources/data/superbwarfare/guns/rpk.json
+++ b/src/main/resources/data/superbwarfare/guns/rpk.json
@@ -11,7 +11,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 1,
-  "normal_reload_time": 73,
+  "NormalReloadTime": 73,
   "EmptyReloadTime": 95,
   "BypassesArmor": 0.23,
   "SoundRadius": 14,
diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json
index 4381c9704..ea0c360a2 100644
--- a/src/main/resources/data/superbwarfare/guns/sentinel.json
+++ b/src/main/resources/data/superbwarfare/guns/sentinel.json
@@ -13,7 +13,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 0,
-  "normal_reload_time": 59,
+  "NormalReloadTime": 59,
   "EmptyReloadTime": 89,
   "BypassesArmor": 0.8,
   "SoundRadius": 20
diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json
index fe88162ee..e095b74d8 100644
--- a/src/main/resources/data/superbwarfare/guns/sks.json
+++ b/src/main/resources/data/superbwarfare/guns/sks.json
@@ -11,7 +11,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 0,
-  "normal_reload_time": 54,
+  "NormalReloadTime": 54,
   "EmptyReloadTime": 75,
   "BypassesArmor": 0.23,
   "SoundRadius": 16,
diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json
index 0d6e3b923..388956fc4 100644
--- a/src/main/resources/data/superbwarfare/guns/svd.json
+++ b/src/main/resources/data/superbwarfare/guns/svd.json
@@ -12,7 +12,7 @@
   "semi": 1,
   "burst": 0,
   "auto": 0,
-  "normal_reload_time": 56,
+  "NormalReloadTime": 56,
   "EmptyReloadTime": 70,
   "BypassesArmor": 0.45,
   "SoundRadius": 17,
diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json
index 1796dc731..89785d8bd 100644
--- a/src/main/resources/data/superbwarfare/guns/vector.json
+++ b/src/main/resources/data/superbwarfare/guns/vector.json
@@ -12,7 +12,7 @@
   "burst": 1,
   "auto": 1,
   "BurstSize": 3,
-  "normal_reload_time": 46,
+  "NormalReloadTime": 46,
   "EmptyReloadTime": 64,
   "BypassesArmor": 0.15,
   "SoundRadius": 11,