优化波塞克换弹

src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java

@@ -229,7 +229,6 @@ public class ClickHandler {
                 if (!isEditing) {
                     player.playSound(ModSounds.EDIT_MODE.get(), 1, 1);
                 }
-                // TODO 退出时的动画渐变
                 isEditing = !isEditing;
             }
 
@@ -346,7 +345,9 @@ public class ClickHandler {
                 bowPower = 0;
                 holdFire = true;
                 player.setSprinting(false);
-                return;
+                if (data.ammo.get() > 0) {
+                    return;
+                }
             }
 
             if (!data.useBackpackAmmo() && data.ammo.get() <= 0 && data.reload.time() == 0) {

src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java

@@ -10,6 +10,7 @@ import com.atsuishio.superbwarfare.init.ModSounds;
 import com.atsuishio.superbwarfare.item.gun.GunItem;
 import com.atsuishio.superbwarfare.item.gun.data.GunData;
 import com.atsuishio.superbwarfare.network.message.receive.ShootClientMessage;
+import com.atsuishio.superbwarfare.network.message.send.ReloadMessage;
 import com.atsuishio.superbwarfare.perk.AmmoPerk;
 import com.atsuishio.superbwarfare.perk.Perk;
 import com.atsuishio.superbwarfare.tools.GunsTool;
@@ -102,11 +103,7 @@ public class BocekItem extends GunItem implements GeoItem {
         if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
 
         var data = GunData.from(stack);
-
+        if (data.reload.empty()) {
-        // TODO 调整成正常的判断逻辑
-        if (GunsTool.getGunIntTag(GunData.from(stack).tag, "ArrowEmpty") > 0 && data.ammo.get() == 0
-//                && (data.countBackupAmmo(player) > 0 || InventoryTool.hasCreativeAmmoBox(player))
-        ) {
             return event.setAndContinue(RawAnimation.begin().thenPlay("animation.bocek.reload"));
         }
 
@@ -133,19 +130,8 @@ public class BocekItem extends GunItem implements GeoItem {
     @ParametersAreNonnullByDefault
     public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) {
         super.inventoryTick(stack, world, entity, slot, selected);
-
+        if (GunsTool.getGunIntTag(GunData.from(stack).tag, "ArrowEmpty") > 0) {
-        if (entity instanceof Player player) {
+            GunsTool.setGunIntTag(GunData.from(stack).tag, "ArrowEmpty", GunsTool.getGunIntTag(GunData.from(stack).tag, "ArrowEmpty") - 1);
-            var data = GunData.from(stack);
-
-            if (GunsTool.getGunIntTag(GunData.from(stack).tag, "ArrowEmpty") > 0) {
-                GunsTool.setGunIntTag(data.tag, "ArrowEmpty", GunsTool.getGunIntTag(GunData.from(stack).tag, "ArrowEmpty") - 1);
-            }
-
-            if (GunsTool.getGunIntTag(data.tag, "ArrowEmpty") == 0 && data.ammo.get() == 0 && data.hasBackupAmmo(player)) {
-                data.consumeBackupAmmo(player, 1);
-                data.ammo.set(1);
-            }
-            data.save();
         }
     }
 
@@ -182,6 +168,11 @@ public class BocekItem extends GunItem implements GeoItem {
     public void onShoot(GunData data, Player player, double spread, boolean zoom) {
     }
 
+    @Override
+    public boolean isMagazineReload(ItemStack stack) {
+        return true;
+    }
+
     @Override
     public void onFireKeyRelease(GunData data, Player player, double power, boolean zoom) {
         super.onFireKeyRelease(data, player, power, zoom);
@@ -223,6 +214,7 @@ public class BocekItem extends GunItem implements GeoItem {
             data.ammo.set(data.ammo.get() - 1);
             data.save();
         }
+        PacketDistributor.sendToServer(new ReloadMessage(0));
     }
 
 

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

@@ -5,5 +5,6 @@
   "Weight": 3,
   "BypassesArmor": 0.25,
   "Magazine": 1,
+  "EmptyReloadTime": 6,
   "AmmoType": "minecraft:arrow"
 }