From 7820caf7bc9c6a1bf5b67c31af1a0722d12eea34 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Thu, 9 May 2024 21:52:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E5=87=86=E5=BF=83=E5=9C=A8=E6=97=81?= =?UTF-8?q?=E8=A7=82=E8=80=85=E6=A8=A1=E5=BC=8F=E4=B8=8B=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...airXianShiYouXiNeiDieJiaCengProcedure.java | 21 ++++++++++++------- ...9uiXianShiYouXiNeiDieJiaCengProcedure.java | 15 +++++++------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java b/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java index 02d6119f7..d5172fcc1 100644 --- a/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java @@ -6,16 +6,21 @@ import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; public class CrosshairXianShiYouXiNeiDieJiaCengProcedure { public static boolean execute(Entity entity) { - if (entity == null) - return false; - return (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).is(ItemTags.create(new ResourceLocation("target:gun"))) - && entity.getPersistentData().getDouble("zoom_time") < 7 - && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get()) - && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON; + if (entity == null) return false; + + if (entity instanceof Player player) { + if (player.isSpectator()) return false; + if (!player.getMainHandItem().is(ItemTags.create(new ResourceLocation("target:gun"))) + || !(entity.getPersistentData().getDouble("zoom_time") < 7) + ) return false; + + return !(player.getMainHandItem().getItem() == TargetModItems.M_79.get()) + && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON; + } + return false; } } diff --git a/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java b/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java index e0111b053..36aded845 100644 --- a/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java @@ -5,14 +5,17 @@ import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; public class M79uiXianShiYouXiNeiDieJiaCengProcedure { public static boolean execute(Entity entity) { - if (entity == null) - return false; - return (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get() && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON - && !(entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming; + if (entity == null) return false; + if (entity instanceof Player player) { + return !player.isSpectator() + && player.getMainHandItem().getItem() == TargetModItems.M_79.get() + && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON + && !entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()).zooming; + } + return false; } }