From d73dd83a7a01f99721a5879fbab77ebda9ae60d9 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 23 Nov 2024 15:53:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=E5=92=8C=E7=81=AB=E7=82=AE=E6=97=A0=E6=B3=95=E6=94=BB=E5=87=BB?= =?UTF-8?q?=E7=9A=84bug=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=81=AB=E7=82=AE?= =?UTF-8?q?=E5=BC=80=E7=81=AB=E5=90=8E=E8=A7=86=E8=A7=92=E6=8A=96=E5=8A=A8?= =?UTF-8?q?=E6=B6=88=E5=A4=B1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../net/mcreator/superbwarfare/client/ClickHandler.java | 8 ++++++-- .../mcreator/superbwarfare/event/ClientEventHandler.java | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6172b767f..609145962 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.daemon=false mc_version=1.20.1 jei_version=15.2.0.27 cloth_config_version=11.1.106 -mod_version=0.2.7 \ No newline at end of file +mod_version=0.2.8 \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java index 04a58a129..e5cb10981 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java @@ -114,7 +114,9 @@ public class ClickHandler { } } - if (player.getMainHandItem().is(ModTags.Items.GUN)) { + if (player.getMainHandItem().is(ModTags.Items.GUN) + || stack.is(ModItems.MONITOR.get()) + || (player.getVehicle() != null && player.getVehicle() instanceof ICannonEntity && player.getMainHandItem().getItem() instanceof CannonShellItem)) { if (button == ModKeyMappings.FIRE.getKey().getValue()) { handleWeaponFirePress(player, stack); } @@ -232,7 +234,9 @@ public class ClickHandler { ModUtils.PACKET_HANDLER.sendToServer(new SensitivityMessage(false)); } - if (player.getMainHandItem().is(ModTags.Items.GUN)) { + if (player.getMainHandItem().is(ModTags.Items.GUN) + || stack.is(ModItems.MONITOR.get()) + || (player.getVehicle() != null && player.getVehicle() instanceof ICannonEntity && player.getMainHandItem().getItem() instanceof CannonShellItem)) { if (key == ModKeyMappings.FIRE.getKey().getValue()) { handleWeaponFirePress(player, stack); } diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index bf80925c1..386cf0737 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -6,6 +6,7 @@ import net.mcreator.superbwarfare.config.client.DisplayConfig; import net.mcreator.superbwarfare.entity.DroneEntity; import net.mcreator.superbwarfare.entity.ICannonEntity; import net.mcreator.superbwarfare.init.*; +import net.mcreator.superbwarfare.item.common.ammo.CannonShellItem; import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.network.message.ShootMessage; import net.mcreator.superbwarfare.perk.AmmoPerk; @@ -968,7 +969,7 @@ public class ClientEventHandler { angle = Math.atan(Mth.abs((float) cameraLocation) / (lookDistance + 2.9)) * Mth.RAD_TO_DEG; } - if (player.getMainHandItem().is(ModTags.Items.GUN)) { + if (player.getMainHandItem().is(ModTags.Items.GUN) || (player.getVehicle() != null && player.getVehicle() instanceof ICannonEntity && player.getMainHandItem().getItem() instanceof CannonShellItem)) { event.setPitch((float) (pitch + cameraRot[0] + (DisplayConfig.CAMERA_ROTATE.get() ? 0.2 : 0) * turnRot[0] + 3 * velocityY)); if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK) { event.setYaw((float) (yaw + cameraRot[1] + (DisplayConfig.CAMERA_ROTATE.get() ? 0.8 : 0) * turnRot[1] - (cameraLocation > 0 ? 1 : -1) * angle * zoomPos)); @@ -1078,6 +1079,8 @@ public class ClientEventHandler { for (int i = 0; i < 5; i++) { shellIndexTime[i] = 0; } + zoom = false; + ClickHandler.switchZoom = false; } }