添加可用FireMode字段

src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java

@@ -332,13 +332,6 @@ public abstract class GunItem extends Item implements CustomRendererItem {
         return false;
     }
 
-    /**
-     * 获取武器可用的开火模式
-     */
-    public int getAvailableFireModes() {
-        return 0;
-    }
-
     /**
      * 获取额外伤害加成
      */

src/main/java/com/atsuishio/superbwarfare/item/gun/data/DefaultGunData.java

@@ -87,4 +87,7 @@ public class DefaultGunData {
             "!superbwarfare:longer_wire",
             "!superbwarfare:cupid_arrow"
     );
+
+    @SerializedName("AvailableFireModes")
+    public int availableFireModes = 1;
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/data/GunData.java

@@ -501,6 +501,10 @@ public class GunData {
         return availablePerks().contains(perk);
     }
 
+    public int getAvailableFireModes() {
+        return defaultGunData().availableFireModes;
+    }
+
     // 可持久化属性开始
     public final IntValue ammo;
     public final IntValue fireMode;

src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java

@@ -128,11 +128,6 @@ public class Glock17Item extends GunItem implements GeoItem {
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
-
     @Override
     public void addReloadTimeBehavior(Map<Integer, Consumer<GunData>> behaviors) {
         super.addReloadTimeBehavior(behaviors);

src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java

@@ -135,11 +135,6 @@ public class Glock18Item extends GunItem implements GeoItem {
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
     @Override
     public void addReloadTimeBehavior(Map<Integer, Consumer<GunData>> behaviors) {
         super.addReloadTimeBehavior(behaviors);

src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java

@@ -130,11 +130,6 @@ public class M1911Item extends GunItem implements GeoItem {
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
-
     @Override
     public void addReloadTimeBehavior(Map<Integer, Consumer<GunData>> behaviors) {
         super.addReloadTimeBehavior(behaviors);

src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java

@@ -127,11 +127,6 @@ public class Mp443Item extends GunItem implements GeoItem {
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
-
     @Override
     public void addReloadTimeBehavior(Map<Integer, Consumer<GunData>> behaviors) {
         super.addReloadTimeBehavior(behaviors);

src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java

@@ -323,9 +323,4 @@ public class Trachelium extends GunItem implements GeoItem {
     public boolean hasCustomStock(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java

@@ -189,9 +189,4 @@ public class Ntw20Item extends GunItem implements GeoItem {
     public boolean hasBipod(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java

@@ -215,11 +215,6 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, EnergyStorag
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
-
     @Override
     public String getAmmoDisplayName(GunData data) {
         return "40mm Grenade";

src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java

@@ -116,9 +116,4 @@ public class DevotionItem extends GunItem implements GeoItem {
     public boolean canEjectShell(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.AUTO.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java

@@ -148,11 +148,6 @@ public class M60Item extends GunItem implements GeoItem {
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.AUTO.flag;
-    }
-
     @Override
     public void beforeShoot(GunData data, Player player, double spread, boolean zoom) {
         super.beforeShoot(data, player, spread, zoom);

src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java

@@ -253,9 +253,4 @@ public class RpkItem extends GunItem implements GeoItem {
     public boolean hasBipod(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java

@@ -218,9 +218,4 @@ public class AK12Item extends GunItem implements GeoItem {
     public boolean canEjectShell(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java

@@ -226,9 +226,4 @@ public class AK47Item extends GunItem implements GeoItem {
     public boolean canEjectShell(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java

@@ -226,9 +226,4 @@ public class Hk416Item extends GunItem implements GeoItem {
     public boolean canEjectShell(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/InsidiousItem.java

@@ -92,9 +92,4 @@ public class InsidiousItem extends GunItem implements GeoItem {
     public boolean isMagazineReload(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.BURST.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java

@@ -232,9 +232,4 @@ public class M4Item extends GunItem implements GeoItem {
     public boolean canEjectShell(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java

@@ -132,9 +132,4 @@ public class MarlinItem extends GunItem implements GeoItem {
     public boolean isIterativeReload(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java

@@ -229,11 +229,6 @@ public class Mk14Item extends GunItem implements GeoItem {
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
     @Override
     public void addReloadTimeBehavior(Map<Integer, Consumer<GunData>> behaviors) {
         super.addReloadTimeBehavior(behaviors);

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java

@@ -237,11 +237,6 @@ public class Qbz95Item extends GunItem implements GeoItem {
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
     @Override
     public void addReloadTimeBehavior(Map<Integer, Consumer<GunData>> behaviors) {
         super.addReloadTimeBehavior(behaviors);

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java

@@ -132,11 +132,6 @@ public class SksItem extends GunItem implements GeoItem {
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
-
     @Override
     public void addReloadTimeBehavior(Map<Integer, Consumer<GunData>> behaviors) {
         super.addReloadTimeBehavior(behaviors);

src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java

@@ -146,9 +146,4 @@ public class Aa12Item extends GunItem implements GeoItem {
     public boolean canEjectShell(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java

@@ -53,7 +53,7 @@ public class HomemadeShotgunItem extends GunItem implements GeoItem {
     }
 
     @Override
-    public int getBarWidth(ItemStack stack) {
+    public int getBarWidth(@NotNull ItemStack stack) {
         return Math.round(13.0F - (float) stack.getDamageValue() * 13.0F / (float) this.getMaxDamage(stack));
     }
 
@@ -152,9 +152,4 @@ public class HomemadeShotgunItem extends GunItem implements GeoItem {
         stack.hurtAndBreak(1, (ServerLevel) player.level(), player, p -> {
         });
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java

@@ -142,9 +142,4 @@ public class M870Item extends GunItem implements GeoItem {
     public boolean isIterativeReload(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java

@@ -209,9 +209,4 @@ public class VectorItem extends GunItem implements GeoItem {
     public boolean canEjectShell(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag + FireMode.BURST.flag + FireMode.AUTO.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java

@@ -91,9 +91,4 @@ public class HuntingRifleItem extends GunItem implements GeoItem {
     public boolean isMagazineReload(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java

@@ -146,9 +146,4 @@ public class K98Item extends GunItem implements GeoItem {
     public boolean isIterativeReload(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java

@@ -125,9 +125,4 @@ public class M98bItem extends GunItem implements GeoItem {
     public boolean hasBulletInBarrel(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java

@@ -139,9 +139,4 @@ public class MosinNagantItem extends GunItem implements GeoItem {
     public boolean isIterativeReload(ItemStack stack) {
         return true;
     }
-
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
 }

src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java

@@ -189,11 +189,6 @@ public class SentinelItem extends GunItem implements GeoItem, EnergyStorageItem
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
-
     @Override
     public void afterShoot(GunData data, Player player) {
         super.afterShoot(data, player);

src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java

@@ -183,11 +183,6 @@ public class SvdItem extends GunItem implements GeoItem {
         return true;
     }
 
-    @Override
-    public int getAvailableFireModes() {
-        return FireMode.SEMI.flag;
-    }
-
     @Override
     public void addReloadTimeBehavior(Map<Integer, Consumer<GunData>> behaviors) {
         super.addReloadTimeBehavior(behaviors);

src/main/java/com/atsuishio/superbwarfare/network/message/send/FireModeMessage.java

@@ -32,12 +32,12 @@ public record FireModeMessage(int msgType) implements CustomPacketPayload {
 
     public static void changeFireMode(Player player) {
         ItemStack stack = player.getMainHandItem();
-        if (stack.getItem() instanceof GunItem gunItem) {
+        if (stack.getItem() instanceof GunItem) {
             var data = GunData.from(stack);
             var tag = data.tag();
             int fireMode = data.fireMode.get();
 
-            int mode = gunItem.getAvailableFireModes();
+            int mode = data.getAvailableFireModes();
             mode &= 0b111;
 
             if (fireMode == 0) {

src/main/resources/data/superbwarfare/guns/aa_12.json

@@ -14,6 +14,7 @@
   "BypassesArmor": 0.05,
   "SoundRadius": 18,
   "RPM": 360,
+  "AvailableFireModes": 5,
   "AmmoType": "@ShotgunAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/ak_12.json

@@ -15,6 +15,7 @@
   "BypassesArmor": 0.23,
   "SoundRadius": 12,
   "RPM": 700,
+  "AvailableFireModes": 5,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/ak_47.json

@@ -15,6 +15,7 @@
   "BypassesArmor": 0.2,
   "SoundRadius": 14,
   "RPM": 600,
+  "AvailableFireModes": 5,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/devotion.json

@@ -14,6 +14,7 @@
   "BypassesArmor": 0.25,
   "SoundRadius": 13,
   "RPM": 400,
+  "AvailableFireModes": 4,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/glock_18.json

@@ -13,6 +13,7 @@
   "BypassesArmor": 0.15,
   "SoundRadius": 8,
   "RPM": 1300,
+  "AvailableFireModes": 5,
   "AmmoType": "@HandgunAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/hk_416.json

@@ -15,6 +15,7 @@
   "BypassesArmor": 0.25,
   "SoundRadius": 14,
   "RPM": 900,
+  "AvailableFireModes": 5,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/insidious.json

@@ -13,6 +13,7 @@
   "BypassesArmor": 0.4,
   "SoundRadius": 12,
   "RPM": 900,
+  "AvailableFireModes": 2,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/m_4.json

@@ -15,6 +15,7 @@
   "BypassesArmor": 0.25,
   "SoundRadius": 14,
   "RPM": 850,
+  "AvailableFireModes": 5,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/m_60.json

@@ -13,6 +13,7 @@
   "BypassesArmor": 0.25,
   "SoundRadius": 15,
   "RPM": 600,
+  "AvailableFireModes": 4,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/mk_14.json

@@ -15,6 +15,7 @@
   "BypassesArmor": 0.4,
   "SoundRadius": 16,
   "RPM": 700,
+  "AvailableFireModes": 5,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/qbz_95.json

@@ -15,6 +15,7 @@
   "BypassesArmor": 0.28,
   "SoundRadius": 13,
   "RPM": 650,
+  "AvailableFireModes": 5,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/rpk.json

@@ -15,6 +15,7 @@
   "BypassesArmor": 0.23,
   "SoundRadius": 14,
   "RPM": 600,
+  "AvailableFireModes": 5,
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/vector.json

@@ -14,6 +14,7 @@
   "BypassesArmor": 0.15,
   "SoundRadius": 11,
   "RPM": 1200,
+  "AvailableFireModes": 7,
   "AmmoType": "@HandgunAmmo",
   "AvailablePerks": [
     "@Ammo",