From 51dd923b5e5e66481c1eacf9bfea6761ec0a01f6 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 14 Dec 2024 15:26:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/client/ClickHandler.java | 14 +++++++------- .../superbwarfare/entity/ICannonEntity.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java index 583d8053d..64a13f4b5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java @@ -41,6 +41,7 @@ import static com.atsuishio.superbwarfare.event.ClientEventHandler.drawTime; public class ClickHandler { public static boolean switchZoom = false; + private static boolean notInGame() { Minecraft mc = Minecraft.getInstance(); if (mc.player == null) return true; @@ -93,7 +94,7 @@ public class ClickHandler { if (player.getMainHandItem().is(ModTags.Items.GUN) || stack.is(ModItems.MONITOR.get()) || player.hasEffect(ModMobEffects.SHOCK.get()) - || (player.getVehicle() != null && (player.getVehicle() instanceof ICannonEntity || player.getVehicle() instanceof IVehicleEntity))) { + || (player.getVehicle() != null && player.getVehicle() instanceof IVehicleEntity)) { if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT) { event.setCanceled(true); } @@ -158,8 +159,7 @@ public class ClickHandler { var tag = stack.getOrCreateTag(); if (tag.getBoolean("CanSwitchScope")) { ModUtils.PACKET_HANDLER.sendToServer(new SwitchScopeMessage(scroll)); - } - else if (tag.getBoolean("CanAdjustZoomFov") || stack.is(ModItems.MINIGUN.get())) { + } else if (tag.getBoolean("CanAdjustZoomFov") || stack.is(ModItems.MINIGUN.get())) { ModUtils.PACKET_HANDLER.sendToServer(new AdjustZoomFovMessage(scroll)); } event.setCanceled(true); @@ -279,7 +279,7 @@ public class ClickHandler { } } - public static void handleWeaponFirePress (Player player, ItemStack stack) { + public static void handleWeaponFirePress(Player player, ItemStack stack) { if (player.hasEffect(ModMobEffects.SHOCK.get())) { return; @@ -329,18 +329,18 @@ public class ClickHandler { } } - public static void handleWeaponFireRelease () { + public static void handleWeaponFireRelease() { ModUtils.PACKET_HANDLER.sendToServer(new FireMessage(1)); ClientEventHandler.holdFire = false; ClientEventHandler.customRpm = 0; } - public static void handleWeaponZoomPress () { + public static void handleWeaponZoomPress() { ModUtils.PACKET_HANDLER.sendToServer(new ZoomMessage(0)); ClientEventHandler.zoom = true; } - public static void handleWeaponZoomRelease () { + public static void handleWeaponZoomRelease() { ModUtils.PACKET_HANDLER.sendToServer(new ZoomMessage(1)); ClientEventHandler.zoom = false; } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/ICannonEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/ICannonEntity.java index c15479c59..75a6409e6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/ICannonEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/ICannonEntity.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.entity; import net.minecraft.world.entity.player.Player; -public interface ICannonEntity { +public interface ICannonEntity extends IVehicleEntity { void cannonShoot(Player player); }