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

---
 .../superbwarfare/event/GunEventHandler.java  | 14 +++----
 .../event/LivingEventHandler.java             |  2 +-
 .../event/PlayerEventHandler.java             |  2 +-
 .../superbwarfare/item/gun/GunItem.java       | 38 +++++++++----------
 .../network/message/ReloadMessage.java        | 10 +++--
 .../superbwarfare/tools/GunsTool.java         |  6 +--
 .../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_870.json        |  2 +-
 .../data/superbwarfare/guns/m_98b.json        |  2 +-
 .../data/superbwarfare/guns/marlin.json       |  2 +-
 .../data/superbwarfare/guns/mk_14.json        |  2 +-
 .../data/superbwarfare/guns/mosin_nagant.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 +-
 36 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
index 885a40c1c..78b96ca5b 100644
--- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
+++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
@@ -422,13 +422,13 @@ public class GunEventHandler {
             }
         } else {
             if (stack.is(ModTags.Items.USE_SHOTGUN_AMMO)) {
-                stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag") + (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
+                stack.getOrCreateTag().putInt("ammo", GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") + (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
             } else if (stack.is(ModTags.Items.USE_SNIPER_AMMO)) {
-                stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag") + (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
+                stack.getOrCreateTag().putInt("ammo", GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") + (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
             } else if (stack.is(ModTags.Items.USE_HANDGUN_AMMO)) {
-                stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag") + (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
+                stack.getOrCreateTag().putInt("ammo", GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") + (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
             } else if (stack.is(ModTags.Items.USE_RIFLE_AMMO)) {
-                stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag") + (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
+                stack.getOrCreateTag().putInt("ammo", GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") + (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
             }
         }
 
@@ -471,7 +471,7 @@ public class GunEventHandler {
                 player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == ModItems.JAVELIN_MISSILE.get(), 1, player.inventoryMenu.getCraftSlots());
             }
         } else {
-            stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag"));
+            stack.getOrCreateTag().putInt("ammo", GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag"));
         }
 
         stack.getOrCreateTag().putBoolean("is_normal_reloading", false);
@@ -610,7 +610,7 @@ public class GunEventHandler {
                 && tag.getInt("reload_stage") == 2
                 && tag.getInt("iterative") == 0
                 && !tag.getBoolean("stop")
-                && tag.getInt("ammo") < (int) tag.getDouble("mag") + tag.getInt("customMag")) {
+                && tag.getInt("ammo") < GunsTool.getGunIntTag(stack, "Magazine", 0) + tag.getInt("customMag")) {
 
             playGunLoopReloadSounds(player);
             tag.putDouble("iterative", (int) tag.getDouble("iterative_time"));
@@ -639,7 +639,7 @@ public class GunEventHandler {
         // 二阶段结束
         if (tag.getInt("iterative") == 1) {
             // 装满结束
-            if (tag.getInt("ammo") >= (int) tag.getDouble("mag") + tag.getInt("customMag")) {
+            if (tag.getInt("ammo") >= GunsTool.getGunIntTag(stack, "Magazine", 0) + tag.getInt("customMag")) {
                 tag.putInt("reload_stage", 3);
             }
 
diff --git a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
index 7ef10d772..f9b0e4dab 100644
--- a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
+++ b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
@@ -615,7 +615,7 @@ public class LivingEventHandler {
         float rate = level * 0.1f + (stack.is(ModTags.Items.SMG) || stack.is(ModTags.Items.RIFLE) ? 0.07f : 0f);
 
         player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
-                    int mag = stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag");
+                    int mag = GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag");
                     int ammo = stack.getOrCreateTag().getInt("ammo");
                     int ammoReload = (int) Math.min(mag, mag * rate);
                     int ammoNeed = Math.min(mag - ammo, ammoReload);
diff --git a/src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java
index 478a83b05..acfe37570 100644
--- a/src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java
+++ b/src/main/java/com/atsuishio/superbwarfare/event/PlayerEventHandler.java
@@ -334,7 +334,7 @@ public class PlayerEventHandler {
                         player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == ModItems.JAVELIN_MISSILE.get(), 1, player.inventoryMenu.getCraftSlots());
                     }
                 } else {
-                    stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag"));
+                    stack.getOrCreateTag().putInt("ammo", GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag"));
                 }
                 stack.getOrCreateTag().putBoolean("HoldOpen", false);
             }
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java
index d2a355a01..303d48cab 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java
@@ -49,44 +49,44 @@ public abstract class GunItem extends Item {
     }
 
     @Override
-    public void inventoryTick(ItemStack itemstack, Level level, Entity entity, int slot, boolean selected) {
+    public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, boolean selected) {
         if (entity instanceof LivingEntity) {
-            if (!itemstack.is(ModTags.Items.GUN)) {
+            if (!stack.is(ModTags.Items.GUN)) {
                 return;
             }
 
-            if (!ItemNBTTool.getBoolean(itemstack, "init", false)) {
-                GunsTool.initGun(level, itemstack, this.getDescriptionId().substring(this.getDescriptionId().lastIndexOf('.') + 1));
-                GunsTool.generateAndSetUUID(itemstack);
-                ItemNBTTool.setBoolean(itemstack, "init", true);
+            if (!ItemNBTTool.getBoolean(stack, "init", false)) {
+                GunsTool.initGun(level, stack, this.getDescriptionId().substring(this.getDescriptionId().lastIndexOf('.') + 1));
+                GunsTool.generateAndSetUUID(stack);
+                ItemNBTTool.setBoolean(stack, "init", true);
             }
 
-            if (itemstack.getOrCreateTag().getBoolean("draw")) {
-                itemstack.getOrCreateTag().putBoolean("draw", false);
+            if (stack.getOrCreateTag().getBoolean("draw")) {
+                stack.getOrCreateTag().putBoolean("draw", false);
             }
 
-            handleGunPerks(itemstack);
-            handleGunAttachment(itemstack);
+            handleGunPerks(stack);
+            handleGunAttachment(stack);
 
-            if ((itemstack.is(ModTags.Items.EXTRA_ONE_AMMO) && itemstack.getOrCreateTag().getInt("ammo") > itemstack.getOrCreateTag().getInt("mag") + itemstack.getOrCreateTag().getInt("customMag") + 1)
-                    || (!itemstack.is(ModTags.Items.EXTRA_ONE_AMMO) && itemstack.getOrCreateTag().getInt("ammo") > itemstack.getOrCreateTag().getInt("mag") + itemstack.getOrCreateTag().getInt("customMag"))
+            if ((stack.is(ModTags.Items.EXTRA_ONE_AMMO) && stack.getOrCreateTag().getInt("ammo") > GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") + 1)
+                    || (!stack.is(ModTags.Items.EXTRA_ONE_AMMO) && stack.getOrCreateTag().getInt("ammo") > GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag"))
             ) {
-                int count = itemstack.getOrCreateTag().getInt("ammo") - itemstack.getOrCreateTag().getInt("mag") + itemstack.getOrCreateTag().getInt("customMag") - (itemstack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0);
+                int count = stack.getOrCreateTag().getInt("ammo") - GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") - (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0);
                 entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
 
-                    if (itemstack.is(ModTags.Items.USE_SHOTGUN_AMMO)) {
+                    if (stack.is(ModTags.Items.USE_SHOTGUN_AMMO)) {
                         capability.shotgunAmmo = entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).shotgunAmmo + count;
-                    } else if (itemstack.is(ModTags.Items.USE_SNIPER_AMMO)) {
+                    } else if (stack.is(ModTags.Items.USE_SNIPER_AMMO)) {
                         capability.sniperAmmo = entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).sniperAmmo + count;
-                    } else if (itemstack.is(ModTags.Items.USE_HANDGUN_AMMO)) {
+                    } else if (stack.is(ModTags.Items.USE_HANDGUN_AMMO)) {
                         capability.handgunAmmo = entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).handgunAmmo + count;
-                    } else if (itemstack.is(ModTags.Items.USE_RIFLE_AMMO)) {
+                    } else if (stack.is(ModTags.Items.USE_RIFLE_AMMO)) {
                         capability.rifleAmmo = entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).rifleAmmo + count;
                     }
                     capability.syncPlayerVariables(entity);
                 });
 
-                itemstack.getOrCreateTag().putInt("ammo", itemstack.getOrCreateTag().getInt("mag") + itemstack.getOrCreateTag().getInt("customMag") + (itemstack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
+                stack.getOrCreateTag().putInt("ammo", GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag") + (stack.is(ModTags.Items.EXTRA_ONE_AMMO) ? 1 : 0));
             }
         }
     }
@@ -165,7 +165,7 @@ public abstract class GunItem extends Item {
                 GunsTool.setPerkIntTag(stack, "FourthTimesCharmTick", 0);
                 GunsTool.setPerkIntTag(stack, "FourthTimesCharmCount", 0);
 
-                int mag = stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag");
+                int mag = GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag");
                 stack.getOrCreateTag().putInt("ammo", Math.min(mag, stack.getOrCreateTag().getInt("ammo") + 2));
             }
         }
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 f915a97d8..728a3618d 100644
--- a/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java
+++ b/src/main/java/com/atsuishio/superbwarfare/network/message/ReloadMessage.java
@@ -96,24 +96,26 @@ public class ReloadMessage {
                 }
 
                 if (canReload || clipLoad) {
+                    int magazine = GunsTool.getGunIntTag(stack, "Magazine", 0);
+
                     if (stack.is(ModTags.Items.OPEN_BOLT)) {
                         if (stack.is(ModTags.Items.EXTRA_ONE_AMMO)) {
-                            if (tag.getInt("ammo") < tag.getDouble("mag") + tag.getInt("customMag") + 1) {
+                            if (tag.getInt("ammo") < magazine + tag.getInt("customMag") + 1) {
                                 tag.putBoolean("start_reload", true);
                             }
                         } else {
-                            if (tag.getInt("ammo") < tag.getDouble("mag") + tag.getInt("customMag")) {
+                            if (tag.getInt("ammo") < magazine + tag.getInt("customMag")) {
                                 tag.putBoolean("start_reload", true);
                             }
                         }
-                    } else if (tag.getInt("ammo") < tag.getDouble("mag") + tag.getInt("customMag")) {
+                    } else if (tag.getInt("ammo") < magazine + tag.getInt("customMag")) {
                         tag.putBoolean("start_reload", true);
                     }
                     return;
                 }
 
                 if (canSingleReload) {
-                    if (tag.getInt("ammo") < tag.getDouble("mag") + tag.getInt("customMag")) {
+                    if (tag.getInt("ammo") < GunsTool.getGunIntTag(stack, "Magazine", 0) + tag.getInt("customMag")) {
                         tag.putBoolean("start_single_reload", true);
                     }
                 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
index d897d85d3..dcad3bd97 100644
--- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
+++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
@@ -56,7 +56,7 @@ 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");
+            "RPM", "Magazine");
 
     public static void initGun(Level level, ItemStack stack, String location) {
         if (level.getServer() == null) return;
@@ -84,7 +84,7 @@ public class GunsTool {
                     stack.getOrCreateTag().putDouble(k, v);
                 }
             });
-            stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag"));
+            stack.getOrCreateTag().putInt("ammo", GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag"));
         }
     }
 
@@ -115,7 +115,7 @@ public class GunsTool {
     public static void reload(Player player, ItemStack stack, GunInfo.Type type, boolean extraOne) {
         CompoundTag tag = stack.getOrCreateTag();
 
-        int mag = tag.getInt("mag") + tag.getInt("customMag");
+        int mag = GunsTool.getGunIntTag(stack, "Magazine", 0) + tag.getInt("customMag");
         int ammo = tag.getInt("ammo");
         int ammoToAdd = mag - ammo + (extraOne ? 1 : 0);
 
diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json
index c91a5ca3a..0bbb77eb3 100644
--- a/src/main/resources/data/superbwarfare/guns/aa_12.json
+++ b/src/main/resources/data/superbwarfare/guns/aa_12.json
@@ -5,7 +5,7 @@
   "Damage": 2.5,
   "Headshot": 1.5,
   "Velocity": 17,
-  "mag": 25,
+  "Magazine": 25,
   "ProjectileAmount": 12,
   "Weight": 7,
   "FireMode": 2,
diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json
index 07e849ac0..41c8811e6 100644
--- a/src/main/resources/data/superbwarfare/guns/abekiri.json
+++ b/src/main/resources/data/superbwarfare/guns/abekiri.json
@@ -5,7 +5,7 @@
   "Damage": 5,
   "Headshot": 1.5,
   "Velocity": 15,
-  "mag": 2,
+  "Magazine": 2,
   "ProjectileAmount": 12,
   "Weight": 1,
   "FireMode": 0,
diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json
index 24c45c4fa..f8b6feaf0 100644
--- a/src/main/resources/data/superbwarfare/guns/ak_12.json
+++ b/src/main/resources/data/superbwarfare/guns/ak_12.json
@@ -7,7 +7,7 @@
   "Damage": 7.7,
   "Headshot": 2,
   "Velocity": 44.5,
-  "mag": 30,
+  "Magazine": 30,
   "Weight": 4,
   "FireMode": 2,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json
index f8d863291..31e5c5da4 100644
--- a/src/main/resources/data/superbwarfare/guns/ak_47.json
+++ b/src/main/resources/data/superbwarfare/guns/ak_47.json
@@ -7,7 +7,7 @@
   "Damage": 8.5,
   "Headshot": 2,
   "Velocity": 36,
-  "mag": 30,
+  "Magazine": 30,
   "Weight": 5,
   "FireMode": 2,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json
index 33a97349c..1c3d05b6a 100644
--- a/src/main/resources/data/superbwarfare/guns/devotion.json
+++ b/src/main/resources/data/superbwarfare/guns/devotion.json
@@ -6,7 +6,7 @@
   "Damage": 9.5,
   "Headshot": 2,
   "Velocity": 40,
-  "mag": 55,
+  "Magazine": 55,
   "Weight": 6,
   "FireMode": 2,
   "Auto": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json
index ac3516002..5ab594e41 100644
--- a/src/main/resources/data/superbwarfare/guns/glock_17.json
+++ b/src/main/resources/data/superbwarfare/guns/glock_17.json
@@ -5,7 +5,7 @@
   "Damage": 5.5,
   "Headshot": 1.5,
   "Velocity": 17,
-  "mag": 17,
+  "Magazine": 17,
   "Weight": 1,
   "FireMode": 0,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json
index c35bf1195..d564e4dfc 100644
--- a/src/main/resources/data/superbwarfare/guns/glock_18.json
+++ b/src/main/resources/data/superbwarfare/guns/glock_18.json
@@ -5,7 +5,7 @@
   "Damage": 5.5,
   "Headshot": 1.5,
   "Velocity": 17,
-  "mag": 17,
+  "Magazine": 17,
   "Weight": 1,
   "FireMode": 2,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json
index 7e79b7d4d..a375c48a0 100644
--- a/src/main/resources/data/superbwarfare/guns/hk_416.json
+++ b/src/main/resources/data/superbwarfare/guns/hk_416.json
@@ -7,7 +7,7 @@
   "Damage": 7.5,
   "Headshot": 2,
   "Velocity": 44,
-  "mag": 30,
+  "Magazine": 30,
   "Weight": 4,
   "FireMode": 2,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
index aed151406..0801a7cfb 100644
--- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
+++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
@@ -5,7 +5,7 @@
   "Damage": 65,
   "Headshot": 3,
   "Velocity": 38,
-  "mag": 1,
+  "Magazine": 1,
   "Weight": 5,
   "FireMode": 0,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/javelin.json b/src/main/resources/data/superbwarfare/guns/javelin.json
index f8dfbef39..98ee92681 100644
--- a/src/main/resources/data/superbwarfare/guns/javelin.json
+++ b/src/main/resources/data/superbwarfare/guns/javelin.json
@@ -2,7 +2,7 @@
   "CustomZoom": 1.75,
   "Spread": 5,
   "zoomSpread": 5,
-  "mag": 1,
+  "Magazine": 1,
   "Weight": 10,
   "EmptyReloadTime": 78,
   "Damage": 300,
diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json
index 5e6f50799..ca62f2deb 100644
--- a/src/main/resources/data/superbwarfare/guns/k_98.json
+++ b/src/main/resources/data/superbwarfare/guns/k_98.json
@@ -5,7 +5,7 @@
   "Damage": 35,
   "Headshot": 3,
   "Velocity": 37.75,
-  "mag": 5,
+  "Magazine": 5,
   "bolt_action_time": 22,
   "Weight": 5,
   "FireMode": 0,
diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json
index b86776ded..bf14612b0 100644
--- a/src/main/resources/data/superbwarfare/guns/m_1911.json
+++ b/src/main/resources/data/superbwarfare/guns/m_1911.json
@@ -5,7 +5,7 @@
   "Damage": 9.5,
   "Headshot": 1.5,
   "Velocity": 15,
-  "mag": 7,
+  "Magazine": 7,
   "Weight": 2,
   "FireMode": 0,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json
index 0fb129410..89dfac180 100644
--- a/src/main/resources/data/superbwarfare/guns/m_4.json
+++ b/src/main/resources/data/superbwarfare/guns/m_4.json
@@ -7,7 +7,7 @@
   "Damage": 7,
   "Headshot": 2,
   "Velocity": 44,
-  "mag": 30,
+  "Magazine": 30,
   "Weight": 4,
   "FireMode": 2,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json
index e3db4197d..3a25a9b94 100644
--- a/src/main/resources/data/superbwarfare/guns/m_60.json
+++ b/src/main/resources/data/superbwarfare/guns/m_60.json
@@ -5,7 +5,7 @@
   "Damage": 9,
   "Headshot": 2,
   "Velocity": 43,
-  "mag": 100,
+  "Magazine": 100,
   "Weight": 8,
   "FireMode": 2,
   "Auto": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/m_79.json b/src/main/resources/data/superbwarfare/guns/m_79.json
index 9e7a8ba04..0d7cc1681 100644
--- a/src/main/resources/data/superbwarfare/guns/m_79.json
+++ b/src/main/resources/data/superbwarfare/guns/m_79.json
@@ -6,7 +6,7 @@
   "ExplosionDamage": 80,
   "ExplosionRadius": 5,
   "Velocity": 3.75,
-  "mag": 1,
+  "Magazine": 1,
   "Weight": 4,
   "EmptyReloadTime": 64
 }
\ No newline at end of file
diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json
index 7db43de36..66b3b3a18 100644
--- a/src/main/resources/data/superbwarfare/guns/m_870.json
+++ b/src/main/resources/data/superbwarfare/guns/m_870.json
@@ -5,7 +5,7 @@
   "Damage": 3,
   "Headshot": 1.5,
   "Velocity": 17,
-  "mag": 8,
+  "Magazine": 8,
   "force_stop_reloading": 1,
   "ProjectileAmount": 12,
   "Weight": 4,
diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json
index 559baa3f1..988f06f31 100644
--- a/src/main/resources/data/superbwarfare/guns/m_98b.json
+++ b/src/main/resources/data/superbwarfare/guns/m_98b.json
@@ -8,7 +8,7 @@
   "Damage": 38,
   "Headshot": 3,
   "Velocity": 47.2,
-  "mag": 5,
+  "Magazine": 5,
   "bolt_action_time": 18,
   "Weight": 7,
   "FireMode": 0,
diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json
index f59579af7..df52eb0c4 100644
--- a/src/main/resources/data/superbwarfare/guns/marlin.json
+++ b/src/main/resources/data/superbwarfare/guns/marlin.json
@@ -5,7 +5,7 @@
   "Damage": 16,
   "Headshot": 2.5,
   "Velocity": 38,
-  "mag": 8,
+  "Magazine": 8,
   "force_stop_reloading": 1,
   "Weight": 3,
   "FireMode": 0,
diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json
index bee229876..509827609 100644
--- a/src/main/resources/data/superbwarfare/guns/mk_14.json
+++ b/src/main/resources/data/superbwarfare/guns/mk_14.json
@@ -7,7 +7,7 @@
   "Damage": 12,
   "Headshot": 2.5,
   "Velocity": 42.5,
-  "mag": 20,
+  "Magazine": 20,
   "Weight": 5,
   "FireMode": 0,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
index 142ec1377..2c586a248 100644
--- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
+++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
@@ -6,7 +6,7 @@
   "Damage": 33,
   "Headshot": 3,
   "Velocity": 42,
-  "mag": 5,
+  "Magazine": 5,
   "bolt_action_time": 22,
   "Weight": 5,
   "FireMode": 0,
diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json
index 8caf29f63..20fd701e6 100644
--- a/src/main/resources/data/superbwarfare/guns/ntw_20.json
+++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json
@@ -6,7 +6,7 @@
   "Damage": 140,
   "Headshot": 3,
   "Velocity": 36,
-  "mag": 3,
+  "Magazine": 3,
   "bolt_action_time": 37,
   "Weight": 10,
   "FireMode": 0,
diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json
index 219adfae0..52f22ab82 100644
--- a/src/main/resources/data/superbwarfare/guns/qbz_95.json
+++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json
@@ -7,7 +7,7 @@
   "Damage": 8.25,
   "Headshot": 2,
   "Velocity": 46,
-  "mag": 30,
+  "Magazine": 30,
   "Weight": 4,
   "FireMode": 2,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/rpg.json b/src/main/resources/data/superbwarfare/guns/rpg.json
index 755c3e5f6..650a5fa0f 100644
--- a/src/main/resources/data/superbwarfare/guns/rpg.json
+++ b/src/main/resources/data/superbwarfare/guns/rpg.json
@@ -6,7 +6,7 @@
   "ExplosionDamage": 150,
   "ExplosionRadius": 10,
   "Velocity": 4,
-  "mag": 1,
+  "Magazine": 1,
   "Weight": 7,
   "EmptyReloadTime": 103
 }
\ 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 2db851567..fa8f62594 100644
--- a/src/main/resources/data/superbwarfare/guns/rpk.json
+++ b/src/main/resources/data/superbwarfare/guns/rpk.json
@@ -5,7 +5,7 @@
   "Damage": 8.75,
   "Headshot": 2,
   "Velocity": 38,
-  "mag": 75,
+  "Magazine": 75,
   "Weight": 6,
   "FireMode": 2,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json
index d08124394..cb7dd8e95 100644
--- a/src/main/resources/data/superbwarfare/guns/sentinel.json
+++ b/src/main/resources/data/superbwarfare/guns/sentinel.json
@@ -4,7 +4,7 @@
   "RecoilX": 0.007,
   "RecoilY": 0.018,
   "Damage": 35,
-  "mag": 5,
+  "Magazine": 5,
   "Headshot": 3,
   "Velocity": 70,
   "bolt_action_time": 22,
diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json
index c2933a9ee..80c91efb4 100644
--- a/src/main/resources/data/superbwarfare/guns/sks.json
+++ b/src/main/resources/data/superbwarfare/guns/sks.json
@@ -5,7 +5,7 @@
   "Damage": 9.5,
   "Headshot": 2,
   "Velocity": 36,
-  "mag": 20,
+  "Magazine": 20,
   "Weight": 4,
   "FireMode": 0,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json
index 6527b1d94..3bf9bdf11 100644
--- a/src/main/resources/data/superbwarfare/guns/svd.json
+++ b/src/main/resources/data/superbwarfare/guns/svd.json
@@ -6,7 +6,7 @@
   "Damage": 18,
   "Headshot": 2,
   "Velocity": 42,
-  "mag": 10,
+  "Magazine": 10,
   "Weight": 5,
   "FireMode": 0,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/taser.json b/src/main/resources/data/superbwarfare/guns/taser.json
index 07fa7daee..e1333470d 100644
--- a/src/main/resources/data/superbwarfare/guns/taser.json
+++ b/src/main/resources/data/superbwarfare/guns/taser.json
@@ -4,7 +4,7 @@
   "RecoilY": 0.002,
   "Damage": 5,
   "Velocity": 3,
-  "mag": 1,
+  "Magazine": 1,
   "Weight": 1,
   "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 62702b71e..e31d7fd30 100644
--- a/src/main/resources/data/superbwarfare/guns/trachelium.json
+++ b/src/main/resources/data/superbwarfare/guns/trachelium.json
@@ -5,7 +5,7 @@
   "Damage": 19,
   "Headshot": 2,
   "Velocity": 24,
-  "mag": 6,
+  "Magazine": 6,
   "Weight": 2,
   "FireMode": 0,
   "Semi": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json
index 88e1577dd..038067290 100644
--- a/src/main/resources/data/superbwarfare/guns/vector.json
+++ b/src/main/resources/data/superbwarfare/guns/vector.json
@@ -5,7 +5,7 @@
   "Damage": 6,
   "Headshot": 1.5,
   "Velocity": 16,
-  "mag": 13,
+  "Magazine": 13,
   "Weight": 3,
   "FireMode": 2,
   "Semi": 1,