From 331cc7eedea1496ef13e6d2e92fe9f6d597001ea Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Wed, 17 Jul 2024 20:31:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9F=B3=E6=95=88=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mcreator/target/client/ClickHandler.java |  5 ++++-
 .../net/mcreator/target/entity/Mk42Entity.java   | 12 +++++-------
 src/main/resources/assets/target/lang/en_us.json |  3 ++-
 src/main/resources/assets/target/lang/zh_cn.json |  3 ++-
 src/main/resources/assets/target/sounds.json     | 16 ++++++++--------
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/java/net/mcreator/target/client/ClickHandler.java b/src/main/java/net/mcreator/target/client/ClickHandler.java
index abbfc0fb6..a81095137 100644
--- a/src/main/java/net/mcreator/target/client/ClickHandler.java
+++ b/src/main/java/net/mcreator/target/client/ClickHandler.java
@@ -8,6 +8,7 @@ import net.mcreator.target.entity.MortarEntity;
 import net.mcreator.target.init.TargetModKeyMappings;
 import net.mcreator.target.init.TargetModMobEffects;
 import net.mcreator.target.init.TargetModTags;
+import net.mcreator.target.item.common.ammo.CannonShellItem;
 import net.mcreator.target.network.TargetModVariables;
 import net.mcreator.target.network.message.*;
 import net.mcreator.target.tools.TraceTool;
@@ -74,7 +75,9 @@ public class ClickHandler {
             if (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity) {
                 event.setCanceled(true);
                 TargetMod.PACKET_HANDLER.sendToServer(new VehicleFireMessage(0));
-                return;
+                if (player.getMainHandItem().getItem() instanceof CannonShellItem) {
+                    return;
+                }
             }
             if (player.getMainHandItem().is(TargetModTags.Items.GUN)) {
                 event.setCanceled(true);
diff --git a/src/main/java/net/mcreator/target/entity/Mk42Entity.java b/src/main/java/net/mcreator/target/entity/Mk42Entity.java
index 9a4f5a7e0..f51f51212 100644
--- a/src/main/java/net/mcreator/target/entity/Mk42Entity.java
+++ b/src/main/java/net/mcreator/target/entity/Mk42Entity.java
@@ -233,17 +233,16 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity {
             this.getPersistentData().putInt("fire_cooldown", this.getPersistentData().getInt("fire_cooldown") - 1);
         }
 
-        if (this.getPersistentData().getBoolean("firing") && gunner instanceof Player player && this.getPersistentData().getInt("fire_cooldown") == 0) {
-            cannonShoot(player);
-        }
-
-        if (this.getPersistentData().getBoolean("shot")) {
+        if (this.getPersistentData().getInt("fire_cooldown") > 28) {
             gunner.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
                 capability.recoilHorizon = 2 * Math.random() - 1;
                 capability.cannonFiring = 1;
                 capability.syncPlayerVariables(gunner);
             });
-            this.getPersistentData().putBoolean("shot", false);
+        }
+
+        if (this.getPersistentData().getBoolean("firing") && gunner instanceof Player player && this.getPersistentData().getInt("fire_cooldown") == 0) {
+            cannonShoot(player);
         }
 
         this.refreshDimensions();
@@ -302,7 +301,6 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity {
             }
 
             this.getPersistentData().putInt("fire_cooldown", 30);
-            this.getPersistentData().putBoolean("shot", true);
 
             server.sendParticles(ParticleTypes.CAMPFIRE_COSY_SMOKE,
                     this.getX() + 5 * this.getLookAngle().x,
diff --git a/src/main/resources/assets/target/lang/en_us.json b/src/main/resources/assets/target/lang/en_us.json
index b47fc1844..b4d2ac730 100644
--- a/src/main/resources/assets/target/lang/en_us.json
+++ b/src/main/resources/assets/target/lang/en_us.json
@@ -108,7 +108,8 @@
   "des.target.creative_ammo_box": "Creative Ammo *2147483647",
   "item.target.ammo_supplier.supply": "%s Ammo +%s",
   "item.target.ammo_supplier.creative": "All Ammo +2147483647",
-  "item.target.he_5_inches": "5'' HE Shell",
+  "item.target.he_5_inches": "HE Shell",
+  "item.target.ap_5_inches": "AP Shell",
 
   "item.target.target_deployer": "Target",
   "item.target.senpai_spawn_egg": "Senpai Spawn Egg",
diff --git a/src/main/resources/assets/target/lang/zh_cn.json b/src/main/resources/assets/target/lang/zh_cn.json
index 135d3a194..e9a82a1c6 100644
--- a/src/main/resources/assets/target/lang/zh_cn.json
+++ b/src/main/resources/assets/target/lang/zh_cn.json
@@ -108,7 +108,8 @@
   "des.target.creative_ammo_box": "创造弹药 *2147483647",
   "item.target.ammo_supplier.supply": "%s弹药 +%s",
   "item.target.ammo_supplier.creative": "所有弹药 +2147483647",
-  "item.target.he_5_inches": "5寸口径高爆弹",
+  "item.target.he_5_inches": "高爆弹",
+  "item.target.ap_5_inches": "穿甲弹",
 
   "item.target.target_deployer": "标靶",
   "item.target.senpai_spawn_egg": "野兽先辈刷怪蛋",
diff --git a/src/main/resources/assets/target/sounds.json b/src/main/resources/assets/target/sounds.json
index 575766d95..f6b0fde1e 100644
--- a/src/main/resources/assets/target/sounds.json
+++ b/src/main/resources/assets/target/sounds.json
@@ -1519,14 +1519,6 @@
       }
     ]
   },
-  "mK_42_fire_3p": {
-    "sounds": [
-      {
-        "name": "target:mk_42/mk_42_fire_3p",
-        "stream": false
-      }
-    ]
-  },
   "mk_42_far": {
     "sounds": [
       {
@@ -1542,5 +1534,13 @@
         "stream": false
       }
     ]
+  },
+  "mk_42_fire_3p": {
+    "sounds": [
+      {
+        "name": "target:mk_42/mk_42_fire_3p",
+        "stream": false
+      }
+    ]
   }
 }
\ No newline at end of file