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

修复某些载具禁止乘客手部动作的bug

Browse source
This commit is contained in:
Atsuihsio 2025-02-07 13:38:09 +08:00
parent 37aaa58eec
commit d2369660d3
16 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -13,5 +13,5 @@ mod_description=A Warfare Mod
minecraft_version=1.20.1 minecraft_version=1.20.1
jei_version=15.2.0.27 jei_version=15.2.0.27
cloth_config_version=11.1.106 cloth_config_version=11.1.106
mod_version=0.5.5 mod_version=0.5.6
mod_authors=Atsuishio, Roki27, Light_Quanta mod_authors=Atsuishio, Roki27, Light_Quanta

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

@ -92,7 +92,7 @@ public class ClickHandler {
int button = event.getButton(); int button = event.getButton();
if (stack.is(ModTags.Items.GUN) || stack.is(ModItems.MONITOR.get()) || stack.is(ModItems.LUNGE_MINE.get()) || player.hasEffect(ModMobEffects.SHOCK.get()) if (stack.is(ModTags.Items.GUN) || stack.is(ModItems.MONITOR.get()) || stack.is(ModItems.LUNGE_MINE.get()) || player.hasEffect(ModMobEffects.SHOCK.get())
|| (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand())) { || (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player))) {
if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT) { if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT) {
event.setCanceled(true); event.setCanceled(true);
} }
@ -303,7 +303,7 @@ public class ClickHandler {
} }
if (player.getVehicle() instanceof IArmedVehicleEntity iVehicle && iVehicle.banHand()) { if (player.getVehicle() instanceof IArmedVehicleEntity iVehicle && iVehicle.banHand(player)) {
if (iVehicle.isDriver(player)) { if (iVehicle.isDriver(player)) {
ClientEventHandler.holdFireVehicle = true; ClientEventHandler.holdFireVehicle = true;
} }
@ -351,7 +351,7 @@ public class ClickHandler {
public static void handleWeaponZoomPress(Player player, ItemStack stack) { public static void handleWeaponZoomPress(Player player, ItemStack stack) {
ModUtils.PACKET_HANDLER.sendToServer(new ZoomMessage(0)); ModUtils.PACKET_HANDLER.sendToServer(new ZoomMessage(0));
if (player.getVehicle() instanceof IArmedVehicleEntity iVehicle && iVehicle.banHand()) { if (player.getVehicle() instanceof IArmedVehicleEntity iVehicle && iVehicle.banHand(player)) {
if (iVehicle.isDriver(player)) { if (iVehicle.isDriver(player)) {
ClientEventHandler.zoomVehicle = true; ClientEventHandler.zoomVehicle = true;
} }

2
src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java
View file

@ -57,7 +57,7 @@ public class CrossHairOverlay {
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit)
return; return;
if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand()) return; if (!player.getMainHandItem().is(ModTags.Items.GUN) || (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player))) return;
GuiGraphics guiGraphics = event.getGuiGraphics(); GuiGraphics guiGraphics = event.getGuiGraphics();

2
src/main/java/com/atsuishio/superbwarfare/client/overlay/GrenadeLauncherOverlay.java
View file

@ -30,7 +30,7 @@ public class GrenadeLauncherOverlay {
if (player != null && player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) if (player != null && player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit)
return; return;
if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand()) if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player))
return; return;
if (!shouldRenderCrossHair(player)) return; if (!shouldRenderCrossHair(player)) return;

2
src/main/java/com/atsuishio/superbwarfare/client/overlay/JavelinHudOverlay.java
View file

@ -55,7 +55,7 @@ public class JavelinHudOverlay {
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit)
return; return;
if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand()) return; if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player)) return;
if ((stack.getItem() == ModItems.JAVELIN.get() && !stack.getOrCreateTag().getBoolean("HoloHidden")) && Minecraft.getInstance().options.getCameraType().isFirstPerson() && ClientEventHandler.zoom) { if ((stack.getItem() == ModItems.JAVELIN.get() && !stack.getOrCreateTag().getBoolean("HoloHidden")) && Minecraft.getInstance().options.getCameraType().isFirstPerson() && ClientEventHandler.zoom) {
RenderSystem.disableDepthTest(); RenderSystem.disableDepthTest();

2
src/main/java/com/atsuishio/superbwarfare/client/overlay/KillMessageOverlay.java
View file

@ -178,7 +178,7 @@ public class KillMessageOverlay {
if (player != null && player.getVehicle() instanceof VehicleEntity vehicleEntity) { if (player != null && player.getVehicle() instanceof VehicleEntity vehicleEntity) {
// 载具图标 // 载具图标
if ((vehicleEntity instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.isDriver(player) && iArmedVehicle.banHand()) || record.damageType == ModDamageTypes.VEHICLE_STRIKE) { if ((vehicleEntity instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.isDriver(player) && iArmedVehicle.banHand(player)) || record.damageType == ModDamageTypes.VEHICLE_STRIKE) {
renderItem = true; renderItem = true;
ResourceLocation resourceLocation = vehicleEntity.getVehicleIcon(); ResourceLocation resourceLocation = vehicleEntity.getVehicleIcon();

2
src/main/java/com/atsuishio/superbwarfare/client/overlay/RedTriangleOverlay.java
View file

@ -37,7 +37,7 @@ public class RedTriangleOverlay {
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
if (!stack.is(ModItems.RPG.get())) return; if (!stack.is(ModItems.RPG.get())) return;
if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand()) if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player))
return; return;
Entity idf = SeekTool.seekLivingEntity(player, player.level(), 128, 6); Entity idf = SeekTool.seekLivingEntity(player, player.level(), 128, 6);

4
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java
View file

@ -731,8 +731,8 @@ public class Ah6Entity extends ContainerMobileEntity implements GeoEntity, IHeli
} }
@Override @Override
public boolean banHand() { public boolean banHand(Player player) {
return true; return player == this.getFirstPassenger();
} }
@Override @Override

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

@ -538,7 +538,7 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity,
} }
@Override @Override
public boolean banHand() { public boolean banHand(Player player) {
return true; return true;
} }

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

@ -804,7 +804,7 @@ public class Bmp2Entity extends ContainerMobileEntity implements GeoEntity, ICha
} }
@Override @Override
public boolean banHand() { public boolean banHand(Player player) {
return true; return true;
} }

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

@ -14,7 +14,7 @@ public interface IArmedVehicleEntity {
int getAmmoCount(Player player); int getAmmoCount(Player player);
boolean banHand(); boolean banHand(Player player);
boolean hidePassenger(); boolean hidePassenger();

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

@ -772,7 +772,7 @@ public class Lav150Entity extends ContainerMobileEntity implements GeoEntity, IC
} }
@Override @Override
public boolean banHand() { public boolean banHand(Player player) {
return true; return true;
} }

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

@ -435,7 +435,7 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, ICannonEntit
} }
@Override @Override
public boolean banHand() { public boolean banHand(Player player) {
return true; return true;
} }

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

@ -486,7 +486,7 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, ICannonEn
} }
@Override @Override
public boolean banHand() { public boolean banHand(Player player) {
return true; return true;
} }

5
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java
View file

@ -5,7 +5,6 @@ import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig; import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.init.*;
import com.atsuishio.superbwarfare.item.gun.GunItem;
import com.atsuishio.superbwarfare.network.ModVariables; import com.atsuishio.superbwarfare.network.ModVariables;
import com.atsuishio.superbwarfare.network.message.ShakeClientMessage; import com.atsuishio.superbwarfare.network.message.ShakeClientMessage;
import com.atsuishio.superbwarfare.tools.CustomExplosion; import com.atsuishio.superbwarfare.tools.CustomExplosion;
@ -542,8 +541,8 @@ public class SpeedboatEntity extends ContainerMobileEntity implements GeoEntity,
} }
@Override @Override
public boolean banHand() { public boolean banHand(Player player) {
return !(this.getFirstPassenger() instanceof Player player) || !(player.getMainHandItem().getItem() instanceof GunItem); return player == this.getFirstPassenger();
} }
@Override @Override

12
src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java
View file

@ -266,7 +266,7 @@ public class ClientEventHandler {
if (stack.getItem() instanceof GunItem gunItem) { if (stack.getItem() instanceof GunItem gunItem) {
if (gunItem.canUseMelee(stack) && gunMelee == 0 && drawTime < 0.01 if (gunItem.canUseMelee(stack) && gunMelee == 0 && drawTime < 0.01
&& ModKeyMappings.MELEE.isDown() && ModKeyMappings.MELEE.isDown()
&& !(player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand()) && !(player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player))
&& !holdFireVehicle && !holdFireVehicle
&& !notInGame() && !notInGame()
&& !player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit && !player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit
@ -422,7 +422,7 @@ public class ClientEventHandler {
} }
if ((holdFire || burstFireSize > 0) if ((holdFire || burstFireSize > 0)
&& !(player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand()) && !(player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player))
&& !holdFireVehicle && !holdFireVehicle
&& (stack.is(ModTags.Items.NORMAL_GUN) && (stack.is(ModTags.Items.NORMAL_GUN)
&& cantFireTime == 0 && cantFireTime == 0
@ -846,7 +846,7 @@ public class ClientEventHandler {
} }
} }
if (player != null && player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand()) if (player != null && player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player))
return; return;
if (level != null && stack.is(ModTags.Items.GUN)) { if (level != null && stack.is(ModTags.Items.GUN)) {
@ -911,7 +911,7 @@ public class ClientEventHandler {
} }
} }
if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand()) { if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player)) {
event.setCanceled(true); event.setCanceled(true);
} }
} }
@ -1008,7 +1008,7 @@ public class ClientEventHandler {
double speed = 1.5 - (0.07 * weight); double speed = 1.5 - (0.07 * weight);
if (zoom if (zoom
&& !(player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand()) && !(player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player))
&& !notInGame() && !notInGame()
&& drawTime < 0.01 && drawTime < 0.01
&& !player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) { && !player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
@ -1306,7 +1306,7 @@ public class ClientEventHandler {
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.isDriver(player) && iArmedVehicle.banHand() && zoomVehicle) { if (player.getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.isDriver(player) && iArmedVehicle.banHand(player) && zoomVehicle) {
event.setFOV(event.getFOV() / iArmedVehicle.zoomFov()); event.setFOV(event.getFOV() / iArmedVehicle.zoomFov());
return; return;
} }