From b5563dcaa4bfce0893f7ca7b47a12758bbca4cc8 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sat, 2 Nov 2024 23:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A9=BA=E4=BB=93=E6=8D=A2?=
 =?UTF-8?q?=E5=BC=B9nbt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/event/GunEventHandler.java  |  4 ++--
 .../network/message/ReloadMessage.java        |  2 +-
 .../superbwarfare/tools/GunsTool.java         | 20 +++++++++++++++++--
 .../data/superbwarfare/guns/aa_12.json        |  2 +-
 .../data/superbwarfare/guns/abekiri.json      |  2 +-
 .../data/superbwarfare/guns/ak_12.json        |  2 +-
 .../data/superbwarfare/guns/ak_47.json        |  2 +-
 .../data/superbwarfare/guns/devotion.json     |  2 +-
 .../data/superbwarfare/guns/glock_17.json     |  2 +-
 .../data/superbwarfare/guns/glock_18.json     |  2 +-
 .../data/superbwarfare/guns/hk_416.json       |  2 +-
 .../superbwarfare/guns/hunting_rifle.json     |  2 +-
 .../data/superbwarfare/guns/javelin.json      |  2 +-
 .../data/superbwarfare/guns/k_98.json         |  2 +-
 .../data/superbwarfare/guns/m_1911.json       |  2 +-
 .../data/superbwarfare/guns/m_4.json          |  2 +-
 .../data/superbwarfare/guns/m_60.json         |  2 +-
 .../data/superbwarfare/guns/m_79.json         |  2 +-
 .../data/superbwarfare/guns/m_98b.json        |  2 +-
 .../data/superbwarfare/guns/mk_14.json        |  2 +-
 .../data/superbwarfare/guns/ntw_20.json       |  2 +-
 .../data/superbwarfare/guns/qbz_95.json       |  2 +-
 .../data/superbwarfare/guns/rpg.json          |  2 +-
 .../data/superbwarfare/guns/rpk.json          |  2 +-
 .../data/superbwarfare/guns/sentinel.json     |  2 +-
 .../data/superbwarfare/guns/sks.json          |  2 +-
 .../data/superbwarfare/guns/svd.json          |  2 +-
 .../data/superbwarfare/guns/taser.json        |  2 +-
 .../data/superbwarfare/guns/trachelium.json   |  2 +-
 .../data/superbwarfare/guns/vector.json       |  2 +-
 30 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java
index 4f5da6943..2b5a04e23 100644
--- a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java
@@ -286,7 +286,7 @@ public class GunEventHandler {
             MinecraftForge.EVENT_BUS.post(new ReloadEvent.Pre(player, stack));
             if (stack.is(ModTags.Items.OPEN_BOLT)) {
                 if (tag.getInt("ammo") == 0) {
-                    data.putInt("ReloadTime", (int) tag.getDouble("empty_reload_time") + 2);
+                    data.putInt("ReloadTime", data.getInt("EmptyReloadTime") + 2);
                     stack.getOrCreateTag().putBoolean("is_empty_reloading", true);
                     playGunEmptyReloadSounds(player);
                 } else {
@@ -295,7 +295,7 @@ public class GunEventHandler {
                     playGunNormalReloadSounds(player);
                 }
             } else {
-                data.putInt("ReloadTime", (int) tag.getDouble("empty_reload_time") + 2);
+                data.putInt("ReloadTime", data.getInt("EmptyReloadTime") + 2);
                 stack.getOrCreateTag().putBoolean("is_empty_reloading", true);
                 playGunEmptyReloadSounds(player);
             }
diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java
index 49b4372b3..782a3c190 100644
--- a/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java
+++ b/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java
@@ -63,7 +63,7 @@ public class ReloadMessage {
                 CompoundTag tag = stack.getOrCreateTag();
 
                 boolean canSingleReload = tag.getDouble("iterative_time") != 0;
-                boolean canReload = (tag.getDouble("normal_reload_time") != 0 || tag.getDouble("empty_reload_time") != 0) && tag.getDouble("clipLoad") != 1;
+                boolean canReload = (tag.getDouble("normal_reload_time") != 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/net/mcreator/superbwarfare/tools/GunsTool.java b/src/main/java/net/mcreator/superbwarfare/tools/GunsTool.java
index 2b7379c62..096942604 100644
--- a/src/main/java/net/mcreator/superbwarfare/tools/GunsTool.java
+++ b/src/main/java/net/mcreator/superbwarfare/tools/GunsTool.java
@@ -53,12 +53,28 @@ public class GunsTool {
 
     public static void initGun(Level level, ItemStack stack, String location) {
         if (level.getServer() == null) return;
-        gunsData.get(location).forEach((k, v) -> stack.getOrCreateTag().putDouble(k, v));
+        gunsData.get(location).forEach((k, v) -> {
+            if (k.equals("EmptyReloadTime")) {
+                CompoundTag data = stack.getOrCreateTag().getCompound("GunData");
+                data.putDouble(k, v);
+                stack.addTagElement("GunData", data);
+            } else {
+                stack.getOrCreateTag().putDouble(k, v);
+            }
+        });
     }
 
     public static void initCreativeGun(ItemStack stack, String location) {
         if (gunsData != null && gunsData.get(location) != null) {
-            gunsData.get(location).forEach((k, v) -> stack.getOrCreateTag().putDouble(k, v));
+            gunsData.get(location).forEach((k, v) -> {
+                if (k.equals("EmptyReloadTime")) {
+                    CompoundTag data = stack.getOrCreateTag().getCompound("GunData");
+                    data.putDouble(k, v);
+                    stack.addTagElement("GunData", data);
+                } else {
+                    stack.getOrCreateTag().putDouble(k, v);
+                }
+            });
             stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag"));
         }
     }
diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json
index bde557039..4772f3fa5 100644
--- a/src/main/resources/data/superbwarfare/guns/aa_12.json
+++ b/src/main/resources/data/superbwarfare/guns/aa_12.json
@@ -14,7 +14,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 64,
-  "empty_reload_time": 85,
+  "EmptyReloadTime": 85,
   "BypassesArmor": 0.05,
   "SoundRadius": 18,
   "rpm": 360
diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json
index 9b9ca77da..72755a37a 100644
--- a/src/main/resources/data/superbwarfare/guns/abekiri.json
+++ b/src/main/resources/data/superbwarfare/guns/abekiri.json
@@ -14,7 +14,7 @@
   "auto": 0,
   "burst_size": 1,
   "normal_reload_time": 66,
-  "empty_reload_time": 83,
+  "EmptyReloadTime": 83,
   "BypassesArmor": 0.01,
   "SoundRadius": 16,
   "rpm": 600
diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json
index 5c97983f4..b33388f62 100644
--- a/src/main/resources/data/superbwarfare/guns/ak_12.json
+++ b/src/main/resources/data/superbwarfare/guns/ak_12.json
@@ -16,7 +16,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 52,
-  "empty_reload_time": 58,
+  "EmptyReloadTime": 58,
   "BypassesArmor": 0.23,
   "SoundRadius": 12,
   "rpm": 700
diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json
index 98fe63696..29eac9f2a 100644
--- a/src/main/resources/data/superbwarfare/guns/ak_47.json
+++ b/src/main/resources/data/superbwarfare/guns/ak_47.json
@@ -16,7 +16,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 54,
-  "empty_reload_time": 69,
+  "EmptyReloadTime": 69,
   "BypassesArmor": 0.2,
   "SoundRadius": 14,
   "rpm": 600
diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json
index acb1a186b..96b3da5bb 100644
--- a/src/main/resources/data/superbwarfare/guns/devotion.json
+++ b/src/main/resources/data/superbwarfare/guns/devotion.json
@@ -15,7 +15,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 73,
-  "empty_reload_time": 95,
+  "EmptyReloadTime": 95,
   "BypassesArmor": 0.25,
   "SoundRadius": 13,
   "rpm": 400
diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json
index 45029b6b6..5d5f72e95 100644
--- a/src/main/resources/data/superbwarfare/guns/glock_17.json
+++ b/src/main/resources/data/superbwarfare/guns/glock_17.json
@@ -14,7 +14,7 @@
   "auto": 0,
   "burst_size": 1,
   "normal_reload_time": 30,
-  "empty_reload_time": 35,
+  "EmptyReloadTime": 35,
   "BypassesArmor": 0.15,
   "SoundRadius": 10,
   "rpm": 400
diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json
index b17b7b3ab..a2674eabe 100644
--- a/src/main/resources/data/superbwarfare/guns/glock_18.json
+++ b/src/main/resources/data/superbwarfare/guns/glock_18.json
@@ -14,7 +14,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 30,
-  "empty_reload_time": 35,
+  "EmptyReloadTime": 35,
   "BypassesArmor": 0.15,
   "SoundRadius": 16,
   "rpm": 1300
diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json
index 2ae592680..bcffc1ee5 100644
--- a/src/main/resources/data/superbwarfare/guns/hk_416.json
+++ b/src/main/resources/data/superbwarfare/guns/hk_416.json
@@ -16,7 +16,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 56,
-  "empty_reload_time": 64,
+  "EmptyReloadTime": 64,
   "BypassesArmor": 0.25,
   "SoundRadius": 14,
   "rpm": 900
diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
index 407389bb4..f1e383704 100644
--- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
+++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
@@ -13,7 +13,7 @@
   "burst": 0,
   "auto": 0,
   "burst_size": 1,
-  "empty_reload_time": 64,
+  "EmptyReloadTime": 64,
   "BypassesArmor": 0.7,
   "SoundRadius": 20,
   "rpm": 120
diff --git a/src/main/resources/data/superbwarfare/guns/javelin.json b/src/main/resources/data/superbwarfare/guns/javelin.json
index 41c1c6fe1..c971cad92 100644
--- a/src/main/resources/data/superbwarfare/guns/javelin.json
+++ b/src/main/resources/data/superbwarfare/guns/javelin.json
@@ -4,7 +4,7 @@
   "zoomSpread": 5,
   "mag": 1,
   "weight": 10,
-  "empty_reload_time": 78,
+  "EmptyReloadTime": 78,
   "damage": 300,
   "BypassesArmor": 1
 }
\ No newline at end of file
diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json
index 18de761d3..cac7ee499 100644
--- a/src/main/resources/data/superbwarfare/guns/k_98.json
+++ b/src/main/resources/data/superbwarfare/guns/k_98.json
@@ -14,7 +14,7 @@
   "burst": 0,
   "auto": 0,
   "burst_size": 1,
-  "empty_reload_time": 59,
+  "EmptyReloadTime": 59,
   "clipLoad": 1,
   "prepare_time": 29,
   "iterative_time": 11,
diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json
index 9ec517f4a..01993e55a 100644
--- a/src/main/resources/data/superbwarfare/guns/m_1911.json
+++ b/src/main/resources/data/superbwarfare/guns/m_1911.json
@@ -14,7 +14,7 @@
   "auto": 0,
   "burst_size": 1,
   "normal_reload_time": 30,
-  "empty_reload_time": 35,
+  "EmptyReloadTime": 35,
   "BypassesArmor": 0.2,
   "SoundRadius": 10,
   "rpm": 400
diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json
index 06d297dcd..02de58a73 100644
--- a/src/main/resources/data/superbwarfare/guns/m_4.json
+++ b/src/main/resources/data/superbwarfare/guns/m_4.json
@@ -16,7 +16,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 56,
-  "empty_reload_time": 64,
+  "EmptyReloadTime": 64,
   "BypassesArmor": 0.25,
   "SoundRadius": 14,
   "rpm": 850
diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json
index a803b673a..d941f5d62 100644
--- a/src/main/resources/data/superbwarfare/guns/m_60.json
+++ b/src/main/resources/data/superbwarfare/guns/m_60.json
@@ -14,7 +14,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 114,
-  "empty_reload_time": 133,
+  "EmptyReloadTime": 133,
   "BypassesArmor": 0.25,
   "SoundRadius": 15,
   "rpm": 600
diff --git a/src/main/resources/data/superbwarfare/guns/m_79.json b/src/main/resources/data/superbwarfare/guns/m_79.json
index 192812a29..ea56a39a1 100644
--- a/src/main/resources/data/superbwarfare/guns/m_79.json
+++ b/src/main/resources/data/superbwarfare/guns/m_79.json
@@ -6,5 +6,5 @@
   "velocity": 3.75,
   "mag": 1,
   "weight": 4,
-  "empty_reload_time": 64
+  "EmptyReloadTime": 64
 }
\ No newline at end of file
diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json
index 4294e956d..1f1a613ca 100644
--- a/src/main/resources/data/superbwarfare/guns/m_98b.json
+++ b/src/main/resources/data/superbwarfare/guns/m_98b.json
@@ -18,7 +18,7 @@
   "auto": 0,
   "burst_size": 1,
   "normal_reload_time": 60,
-  "empty_reload_time": 78,
+  "EmptyReloadTime": 78,
   "BypassesArmor": 0.6,
   "SoundRadius": 18,
   "rpm": 180
diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json
index 65a00f062..f45b85e9e 100644
--- a/src/main/resources/data/superbwarfare/guns/mk_14.json
+++ b/src/main/resources/data/superbwarfare/guns/mk_14.json
@@ -15,7 +15,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 58,
-  "empty_reload_time": 81,
+  "EmptyReloadTime": 81,
   "BypassesArmor": 0.4,
   "SoundRadius": 16,
   "rpm": 700
diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json
index c90e9f35e..e4f4e0c3e 100644
--- a/src/main/resources/data/superbwarfare/guns/ntw_20.json
+++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json
@@ -16,7 +16,7 @@
   "auto": 0,
   "burst_size": 1,
   "normal_reload_time": 63,
-  "empty_reload_time": 92,
+  "EmptyReloadTime": 92,
   "BypassesArmor": 1,
   "SoundRadius": 22,
   "rpm": 90
diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json
index 9e4b0d527..4601ced3a 100644
--- a/src/main/resources/data/superbwarfare/guns/qbz_95.json
+++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json
@@ -14,7 +14,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 58,
-  "empty_reload_time": 74,
+  "EmptyReloadTime": 74,
   "BypassesArmor": 0.28,
   "SoundRadius": 13,
   "rpm": 650
diff --git a/src/main/resources/data/superbwarfare/guns/rpg.json b/src/main/resources/data/superbwarfare/guns/rpg.json
index 233fd42a0..a247b5929 100644
--- a/src/main/resources/data/superbwarfare/guns/rpg.json
+++ b/src/main/resources/data/superbwarfare/guns/rpg.json
@@ -6,6 +6,6 @@
   "velocity": 4,
   "mag": 1,
   "weight": 7,
-  "empty_reload_time": 103,
+  "EmptyReloadTime": 103,
   "BypassesArmor": 1
 }
\ No newline at end of file
diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json
index 9f684cb99..c3d2bbb20 100644
--- a/src/main/resources/data/superbwarfare/guns/rpk.json
+++ b/src/main/resources/data/superbwarfare/guns/rpk.json
@@ -14,7 +14,7 @@
   "auto": 1,
   "burst_size": 1,
   "normal_reload_time": 73,
-  "empty_reload_time": 95,
+  "EmptyReloadTime": 95,
   "BypassesArmor": 0.23,
   "SoundRadius": 14,
   "rpm": 600
diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json
index 1068b3abe..441206219 100644
--- a/src/main/resources/data/superbwarfare/guns/sentinel.json
+++ b/src/main/resources/data/superbwarfare/guns/sentinel.json
@@ -16,7 +16,7 @@
   "auto": 0,
   "burst_size": 1,
   "normal_reload_time": 59,
-  "empty_reload_time": 89,
+  "EmptyReloadTime": 89,
   "BypassesArmor": 0.8,
   "SoundRadius": 20,
   "rpm": 240
diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json
index 4a077a744..509c90139 100644
--- a/src/main/resources/data/superbwarfare/guns/sks.json
+++ b/src/main/resources/data/superbwarfare/guns/sks.json
@@ -14,7 +14,7 @@
   "auto": 0,
   "burst_size": 1,
   "normal_reload_time": 54,
-  "empty_reload_time": 75,
+  "EmptyReloadTime": 75,
   "BypassesArmor": 0.23,
   "SoundRadius": 16,
   "rpm": 400
diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json
index 2d3c4e348..86333644d 100644
--- a/src/main/resources/data/superbwarfare/guns/svd.json
+++ b/src/main/resources/data/superbwarfare/guns/svd.json
@@ -15,7 +15,7 @@
   "auto": 0,
   "burst_size": 1,
   "normal_reload_time": 56,
-  "empty_reload_time": 70,
+  "EmptyReloadTime": 70,
   "BypassesArmor": 0.45,
   "SoundRadius": 17,
   "rpm": 400
diff --git a/src/main/resources/data/superbwarfare/guns/taser.json b/src/main/resources/data/superbwarfare/guns/taser.json
index 20fd61a49..f8d5e02c2 100644
--- a/src/main/resources/data/superbwarfare/guns/taser.json
+++ b/src/main/resources/data/superbwarfare/guns/taser.json
@@ -6,5 +6,5 @@
   "velocity": 3,
   "mag": 1,
   "weight": 1,
-  "empty_reload_time": 58
+  "EmptyReloadTime": 58
 }
\ No newline at end of file
diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json
index 75feed441..e28505d14 100644
--- a/src/main/resources/data/superbwarfare/guns/trachelium.json
+++ b/src/main/resources/data/superbwarfare/guns/trachelium.json
@@ -13,7 +13,7 @@
   "burst": 0,
   "auto": 0,
   "burst_size": 1,
-  "empty_reload_time": 65,
+  "EmptyReloadTime": 65,
   "BypassesArmor": 0.3,
   "SoundRadius": 10,
   "rpm": 300
diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json
index 98fb6621a..2ff55f419 100644
--- a/src/main/resources/data/superbwarfare/guns/vector.json
+++ b/src/main/resources/data/superbwarfare/guns/vector.json
@@ -14,7 +14,7 @@
   "auto": 1,
   "burst_size": 3,
   "normal_reload_time": 46,
-  "empty_reload_time": 64,
+  "EmptyReloadTime": 64,
   "BypassesArmor": 0.15,
   "SoundRadius": 4,
   "rpm": 1200