kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

调整接口

Browse source
This commit is contained in:
17146 2024-12-14 15:26:26 +08:00
parent 944faf99e3
commit 51dd923b5e
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java
View file

@ -41,6 +41,7 @@ import static com.atsuishio.superbwarfare.event.ClientEventHandler.drawTime;
public class ClickHandler { public class ClickHandler {
public static boolean switchZoom = false; public static boolean switchZoom = false;
private static boolean notInGame() { private static boolean notInGame() {
Minecraft mc = Minecraft.getInstance(); Minecraft mc = Minecraft.getInstance();
if (mc.player == null) return true; if (mc.player == null) return true;
@ -93,7 +94,7 @@ public class ClickHandler {
if (player.getMainHandItem().is(ModTags.Items.GUN) if (player.getMainHandItem().is(ModTags.Items.GUN)
|| stack.is(ModItems.MONITOR.get()) || stack.is(ModItems.MONITOR.get())
|| player.hasEffect(ModMobEffects.SHOCK.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) { if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT) {
event.setCanceled(true); event.setCanceled(true);
} }
@ -158,8 +159,7 @@ public class ClickHandler {
var tag = stack.getOrCreateTag(); var tag = stack.getOrCreateTag();
if (tag.getBoolean("CanSwitchScope")) { if (tag.getBoolean("CanSwitchScope")) {
ModUtils.PACKET_HANDLER.sendToServer(new SwitchScopeMessage(scroll)); 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)); ModUtils.PACKET_HANDLER.sendToServer(new AdjustZoomFovMessage(scroll));
} }
event.setCanceled(true); event.setCanceled(true);

2
src/main/java/com/atsuishio/superbwarfare/entity/ICannonEntity.java
View file

@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.entity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
public interface ICannonEntity { public interface ICannonEntity extends IVehicleEntity {
void cannonShoot(Player player); void cannonShoot(Player player);
} }