重构开火模式逻辑

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

@@ -291,15 +291,19 @@ public abstract class GunItem extends Item {
         return false;
     }
 
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return false;
+        return 0;
     }
 
-    public boolean burst(ItemStack stack) {
+    public enum FireMode {
-        return false;
+        SEMI(1),
-    }
+        BURST(2),
+        AUTO(4);
 
-    public boolean auto(ItemStack stack) {
+        public final int flag;
-        return false;
+
+        FireMode(int i) {
+            this.flag = i;
+        }
     }
 }

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

@@ -38,6 +38,7 @@ import java.util.Set;
 import java.util.function.Consumer;
 
 public class Glock17Item extends GunItem implements GeoItem, AnimatedItem {
+
     private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
     public static ItemDisplayContext transformType;
 
@@ -169,17 +170,7 @@ public class Glock17Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
-    }
-
-    @Override
-    public boolean burst(ItemStack stack) {
-        return true;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -177,12 +177,7 @@ public class Glock18Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -160,7 +160,7 @@ public class M1911Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -345,7 +345,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -161,7 +161,7 @@ public class DevotionItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean auto(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.AUTO.flag;
     }
 }

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

@@ -185,7 +185,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean auto(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.AUTO.flag;
     }
 }

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

@@ -162,12 +162,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -261,12 +261,7 @@ public class AK12Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -270,12 +270,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -272,12 +272,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -271,12 +271,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -177,7 +177,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -270,12 +270,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -268,12 +268,7 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -170,7 +170,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -194,12 +194,7 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -155,7 +155,7 @@ public class AbekiriItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -184,7 +184,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -43,6 +43,7 @@ import java.util.Set;
 import java.util.function.Consumer;
 
 public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
+
     private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
     public static ItemDisplayContext transformType;
 
@@ -246,17 +247,7 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag + FireMode.BURST.flag + FireMode.AUTO.flag;
-    }
-
-    @Override
-    public boolean burst(ItemStack stack) {
-        return true;
-    }
-
-    @Override
-    public boolean auto(ItemStack stack) {
-        return true;
     }
 }

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

@@ -136,7 +136,7 @@ public class HuntingRifleItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -184,7 +184,7 @@ public class K98Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -167,7 +167,7 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -179,7 +179,7 @@ public class MosinNagantItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -168,7 +168,7 @@ public class Ntw20Item extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -250,7 +250,7 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -155,7 +155,7 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem {
     }
 
     @Override
-    public boolean semi(ItemStack stack) {
+    public int getFireMode() {
-        return true;
+        return FireMode.SEMI.flag;
     }
 }

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

@@ -60,13 +60,16 @@ public class FireModeMessage {
 
             CompoundTag tag = stack.getOrCreateTag();
 
+            int mode = gunItem.getFireMode();
+            mode &= 0b111;
+
             if (fireMode == 0) {
-                if (gunItem.burst(stack)) {
+                if ((mode & 2) != 0) {
                     GunsTool.setGunIntTag(stack, "FireMode", 1);
                     playChangeModeSound(player);
                     return;
                 }
-                if (gunItem.auto(stack)) {
+                if ((mode & 4) != 0) {
                     GunsTool.setGunIntTag(stack, "FireMode", 2);
                     playChangeModeSound(player);
                     return;
@@ -74,12 +77,12 @@ public class FireModeMessage {
             }
 
             if (fireMode == 1) {
-                if (gunItem.auto(stack)) {
+                if ((mode & 4) != 0) {
                     GunsTool.setGunIntTag(stack, "FireMode", 2);
                     playChangeModeSound(player);
                     return;
                 }
-                if (gunItem.semi(stack)) {
+                if ((mode & 1) != 0) {
                     GunsTool.setGunIntTag(stack, "FireMode", 0);
                     playChangeModeSound(player);
                     return;
@@ -87,12 +90,12 @@ public class FireModeMessage {
             }
 
             if (fireMode == 2) {
-                if (gunItem.semi(stack)) {
+                if ((mode & 1) != 0) {
                     GunsTool.setGunIntTag(stack, "FireMode", 0);
                     playChangeModeSound(player);
                     return;
                 }
-                if (gunItem.burst(stack)) {
+                if ((mode & 2) != 0) {
                     GunsTool.setGunIntTag(stack, "FireMode", 1);
                     playChangeModeSound(player);
                     return;