From c608e69f014dcfb96b845a350209e4ac3749fec9 Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Wed, 13 Nov 2024 03:11:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E4=BD=8E=E6=95=B4=E4=BD=93=E5=90=8E?=
 =?UTF-8?q?=E5=BA=A7=EF=BC=8C=E4=BF=AE=E5=A4=8DM60=E5=BC=B9=E9=93=BE?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/event/ClientEventHandler.java        | 10 ++++++++--
 .../superbwarfare/item/gun/machinegun/M60Item.java     |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
index fa06c7de8..f90970d0b 100644
--- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
@@ -802,10 +802,16 @@ public class ClientEventHandler {
 
         double gripRecoilY = switch (gripType) {
             case 1 -> 0.7;
-            case 2 -> 2.25;
-            default -> 2.5;
+            case 2 -> 1.75;
+            default -> 2.0;
         };
 
+        if (!player.getMainHandItem().is(ModTags.Items.CAN_CUSTOM_GUN)) {
+            recoil = 1.6;
+            gripRecoilX = 0.75;
+            gripRecoilY = 1.25;
+        }
+
         double cusWeight = player.getMainHandItem().getOrCreateTag().getDouble("CustomWeight");
 
         double rpm = 1;
diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/M60Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/M60Item.java
index aaa0165fc..c103f697e 100644
--- a/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/M60Item.java
+++ b/src/main/java/net/mcreator/superbwarfare/item/gun/machinegun/M60Item.java
@@ -77,7 +77,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem {
         ItemStack stack = player.getMainHandItem();
         if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
 
-        if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
+        if (ClientEventHandler.firePosTimer > 0 && ClientEventHandler.firePosTimer < 0.45) {
             return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.fire"));
         }