From 68ba553b542efa951b70d79bcd219ec31634c2df Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Thu, 18 Jul 2024 16:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=86=E6=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mcreator/target/client/screens/M79UIOverlay.java    | 3 ++-
 .../net/mcreator/target/client/screens/Mk42UIOverlay.java   | 6 ++++--
 .../resources/assets/target/animations/mk_42.animation.json | 6 +++---
 .../assets/target/animations/mortar.animation.json          | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/mcreator/target/client/screens/M79UIOverlay.java b/src/main/java/net/mcreator/target/client/screens/M79UIOverlay.java
index ed6f51992..0d534493e 100644
--- a/src/main/java/net/mcreator/target/client/screens/M79UIOverlay.java
+++ b/src/main/java/net/mcreator/target/client/screens/M79UIOverlay.java
@@ -50,6 +50,7 @@ public class M79UIOverlay {
     private static boolean shouldRenderCrossHair2(Player player) {
         if (player == null) return false;
         return !player.isSpectator()
-                && Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK && (player.isPassenger() && player.getVehicle() instanceof Mk42Entity);
+                && !(player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom
+                && player.isPassenger() && player.getVehicle() instanceof Mk42Entity;
     }
 }
diff --git a/src/main/java/net/mcreator/target/client/screens/Mk42UIOverlay.java b/src/main/java/net/mcreator/target/client/screens/Mk42UIOverlay.java
index 9573f8d98..9be868a84 100644
--- a/src/main/java/net/mcreator/target/client/screens/Mk42UIOverlay.java
+++ b/src/main/java/net/mcreator/target/client/screens/Mk42UIOverlay.java
@@ -4,6 +4,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.mcreator.target.entity.Mk42Entity;
 import net.mcreator.target.item.gun.GunItem;
+import net.mcreator.target.network.TargetModVariables;
 import net.mcreator.target.tools.RenderTool;
 import net.mcreator.target.tools.TraceTool;
 import net.minecraft.client.CameraType;
@@ -54,7 +55,8 @@ public class Mk42UIOverlay {
         if (player == null) return false;
         return !player.isSpectator()
                 && !(player.getMainHandItem().getItem() instanceof GunItem)
-                && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON
-                && (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity);
+//                && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON
+                && (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity)
+                && (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom;
     }
 }
diff --git a/src/main/resources/assets/target/animations/mk_42.animation.json b/src/main/resources/assets/target/animations/mk_42.animation.json
index 9dde2141a..f123fd7f7 100644
--- a/src/main/resources/assets/target/animations/mk_42.animation.json
+++ b/src/main/resources/assets/target/animations/mk_42.animation.json
@@ -44,14 +44,14 @@
 						"0.0083": {
 							"vector": [110, 110, 110]
 						},
-						"0.025": {
+						"0.05": {
 							"vector": [110, 110, 110]
 						},
-						"0.05": {
+						"0.075": {
 							"vector": [1, 1, 1],
 							"easing": "easeOutQuad"
 						},
-						"0.0667": {
+						"0.0917": {
 							"vector": [0, 0, 0]
 						},
 						"0.6667": {
diff --git a/src/main/resources/assets/target/animations/mortar.animation.json b/src/main/resources/assets/target/animations/mortar.animation.json
index e9c8ff674..e329365f9 100644
--- a/src/main/resources/assets/target/animations/mortar.animation.json
+++ b/src/main/resources/assets/target/animations/mortar.animation.json
@@ -66,14 +66,14 @@
 						"1.0083": {
 							"vector": [1200, 1200, 1200]
 						},
-						"1.025": {
+						"1.0583": {
 							"vector": [1200, 1200, 1200]
 						},
-						"1.05": {
+						"1.0833": {
 							"vector": [1, 1, 1],
 							"easing": "easeOutQuad"
 						},
-						"1.0667": {
+						"1.1": {
 							"vector": [0, 0, 0]
 						}
 					}