From d9feb95cffea08cf82e739449d4ec79cdcd4a82a Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Sat, 18 May 2024 03:15:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dzoom=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mcreator/target/client/screens/CrossHairOverlay.java | 2 +- .../java/net/mcreator/target/event/GunEventHandler.java | 2 +- .../net/mcreator/target/event/LivingEntityEventHandler.java | 2 +- .../java/net/mcreator/target/event/PlayerEventHandler.java | 6 +++--- src/main/java/net/mcreator/target/network/ZoomMessage.java | 2 +- ...SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/mcreator/target/client/screens/CrossHairOverlay.java b/src/main/java/net/mcreator/target/client/screens/CrossHairOverlay.java index c45bfa307..c1bc1c8f0 100644 --- a/src/main/java/net/mcreator/target/client/screens/CrossHairOverlay.java +++ b/src/main/java/net/mcreator/target/client/screens/CrossHairOverlay.java @@ -110,7 +110,7 @@ public class CrossHairOverlay { if (player == null) return false; if (player.isSpectator()) return false; - if (!player.getMainHandItem().is(TargetModTags.Items.GUN) || !(player.getPersistentData().getDouble("zoom_time") < 7)) + if (!player.getMainHandItem().is(TargetModTags.Items.GUN) || !(player.getPersistentData().getDouble("zoom_animation_time") < 7)) return false; return !(player.getMainHandItem().getItem() == TargetModItems.M_79.get()) diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index 69edae96c..389da1978 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -72,7 +72,7 @@ public class GunEventHandler { } double zoom; - if (player.getPersistentData().getDouble("zoom_time") > 4) { + if (player.getPersistentData().getDouble("zoom_animation_time") > 4) { if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { zoom = 0.0001; } else if (stack.is(TargetModTags.Items.SHOTGUN)) { diff --git a/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java b/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java index b5867a1b1..c494aa2e6 100644 --- a/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java +++ b/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java @@ -199,7 +199,7 @@ public class LivingEntityEventHandler { }); player.getPersistentData().putDouble("zoom_pos", 0); - player.getPersistentData().putDouble("zoom_time", 0); + player.getPersistentData().putDouble("zoom_animation_time", 0); if (newStack.getOrCreateTag().getDouble("bolt_action_time") > 0) { newStack.getOrCreateTag().putDouble("bolt_action_anim", 0); } diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java index d89b62c5c..bcc162b81 100644 --- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java @@ -272,11 +272,11 @@ public class PlayerEventHandler { capability.syncPlayerVariables(player); }); - if (player.getPersistentData().getInt("zoom_time") < 10) { - player.getPersistentData().putInt("zoom_time", player.getPersistentData().getInt("zoom_time") + 1); + if (player.getPersistentData().getInt("zoom_animation_time") < 10) { + player.getPersistentData().putInt("zoom_animation_time", player.getPersistentData().getInt("zoom_animation_time") + 1); } } else { - player.getPersistentData().putInt("zoom_time", 0); + player.getPersistentData().putInt("zoom_animation_time", 0); } } } diff --git a/src/main/java/net/mcreator/target/network/ZoomMessage.java b/src/main/java/net/mcreator/target/network/ZoomMessage.java index fbe630ff5..7a557ba66 100644 --- a/src/main/java/net/mcreator/target/network/ZoomMessage.java +++ b/src/main/java/net/mcreator/target/network/ZoomMessage.java @@ -58,7 +58,7 @@ public class ZoomMessage { capability.zooming = false; capability.syncPlayerVariables(entity); }); - entity.getPersistentData().putDouble("zoom_time", 0); + entity.getPersistentData().putDouble("zoom_animation_time", 0); } } diff --git a/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 78e008939..b279c4202 100644 --- a/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -73,8 +73,8 @@ public class SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { if (itemstack.getOrCreateTag().getDouble("firing") > 0) { itemstack.getOrCreateTag().putDouble("firing", (itemstack.getOrCreateTag().getDouble("firing") - 1)); } - if (itemstack.getOrCreateTag().getDouble("zoom_speed") > 0) { - itemstack.getOrCreateTag().putDouble("zoom_speed", (itemstack.getOrCreateTag().getDouble("zoom_speed") - 1)); + if (itemstack.getOrCreateTag().getDouble("zoom_firing") > 0) { + itemstack.getOrCreateTag().putDouble("zoom_firing", (itemstack.getOrCreateTag().getDouble("zoom_firing") - 1)); } cid = itemstack.getOrCreateTag().getDouble("cid");