diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java index c322f3857..f8eae6418 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java @@ -134,7 +134,10 @@ public class ClickHandler { if (stack.is(ModItems.ARTILLERY_INDICATOR.get())) { PacketDistributor.sendToServer(SetFiringParametersMessage.INSTANCE); event.setCanceled(true); - return; + } + if (stack.is(ModItems.MONITOR.get()) && player.getOffhandItem().is(ModItems.ARTILLERY_INDICATOR.get())) { + PacketDistributor.sendToServer(DroneFireMessage.INSTANCE); + event.setCanceled(true); } } @@ -389,7 +392,11 @@ public class ClickHandler { } if (stack.is(ModItems.MONITOR.get())) { - PacketDistributor.sendToServer(DroneFireMessage.INSTANCE); + if (player.getOffhandItem().is(ModItems.ARTILLERY_INDICATOR.get())) { + ClientEventHandler.holdFire = true; + } else { + PacketDistributor.sendToServer(DroneFireMessage.INSTANCE); + } } if (stack.is(ModItems.LUNGE_MINE.get())) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneHudOverlay.java index 86a2d2eba..eb9207f84 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/DroneHudOverlay.java @@ -2,6 +2,7 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.RenderHelper; +import com.atsuishio.superbwarfare.component.ModDataComponents; import com.atsuishio.superbwarfare.entity.vehicle.DroneEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; @@ -15,6 +16,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.LayeredDraw; import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; @@ -31,7 +35,10 @@ import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; import static com.atsuishio.superbwarfare.client.RenderHelper.preciseBlit; +import static com.atsuishio.superbwarfare.client.overlay.SpyglassRangeOverlay.FRIENDLY_INDICATOR; +import static com.atsuishio.superbwarfare.client.overlay.SpyglassRangeOverlay.INDICATOR; import static com.atsuishio.superbwarfare.entity.vehicle.DroneEntity.*; +import static com.atsuishio.superbwarfare.item.ArtilleryIndicator.TAG_CANNON; @OnlyIn(Dist.CLIENT) public class DroneHudOverlay implements LayeredDraw.Layer { @@ -167,6 +174,59 @@ public class DroneHudOverlay implements LayeredDraw.Layer { } } } + + // 射击诸元标记 + + ItemStack offStack = player.getOffhandItem(); + if (offStack.is(ModItems.FIRING_PARAMETERS.get()) || offStack.is(ModItems.ARTILLERY_INDICATOR.get())) { + var parameters = offStack.get(ModDataComponents.FIRING_PARAMETERS); + BlockPos blockPos; + if (parameters != null) { + blockPos = parameters.pos(); + } else { + blockPos = new BlockPos(0, 0, 0); + } + + double targetX = blockPos.getX(); + double targetY = blockPos.getY(); + double targetZ = blockPos.getZ(); + + RenderSystem.disableDepthTest(); + RenderSystem.depthMask(false); + RenderSystem.enableBlend(); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + RenderSystem.setShaderColor(1, 1, 1, 1); + + // 标记位置 + Vec3 pos = new Vec3(targetX, targetY, targetZ); + Vec3 point = VectorUtil.worldToScreen(pos, cameraPos); + if (point != null) { + float x = (float) point.x; + float y = (float) point.y; + preciseBlit(guiGraphics, INDICATOR, Mth.clamp(x - 6, 0, w - 12), Mth.clamp(y - 6, 0, h - 12), 0, 0, 12, 12, 12, 12); + } + + // 火炮位置 + + if (offStack.is(ModItems.ARTILLERY_INDICATOR.get())) { + ListTag tags = NBTTool.getTag(offStack).getList(TAG_CANNON, Tag.TAG_COMPOUND); + for (int m = 0; m < tags.size(); m++) { + var t = tags.getCompound(m); + Entity e = EntityFindUtil.findEntity(player.level(), t.getString("UUID")); + if (e != null) { + Vec3 posF = e.getBoundingBox().getCenter(); + Vec3 pointF = VectorUtil.worldToScreen(posF, cameraPos); + if (pointF != null) { + float xf = (float) pointF.x; + float yf = (float) pointF.y; + + preciseBlit(guiGraphics, FRIENDLY_INDICATOR, Mth.clamp(xf - 6, 0, w - 12), Mth.clamp(yf - 6, 0, h - 12), 0, 0, 12, 12, 12, 12); + } + } + } + } + } } RenderSystem.depthMask(true); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java index b5b49e15d..59273d34d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/SpyglassRangeOverlay.java @@ -41,8 +41,8 @@ import static com.atsuishio.superbwarfare.item.ArtilleryIndicator.TAG_CANNON; public class SpyglassRangeOverlay implements LayeredDraw.Layer { public static final ResourceLocation ID = Mod.loc("spyglass_range"); - private static final ResourceLocation INDICATOR = Mod.loc("textures/screens/indicator.png"); - private static final ResourceLocation FRIENDLY_INDICATOR = Mod.loc("textures/screens/friendly_indicator.png"); + public static final ResourceLocation INDICATOR = Mod.loc("textures/screens/indicator.png"); + public static final ResourceLocation FRIENDLY_INDICATOR = Mod.loc("textures/screens/friendly_indicator.png"); private static float scopeScale = 1; private static float lerpHoldArtilleryIndicator; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/A10Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/A10Entity.java index 014eb17dd..977313413 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/A10Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/A10Entity.java @@ -49,8 +49,8 @@ import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.neoforge.event.EventHooks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.joml.Math; import org.joml.*; +import org.joml.Math; import software.bernie.geckolib.animatable.GeoEntity; import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.animation.AnimatableManager; @@ -475,7 +475,7 @@ public class A10Entity extends ContainerMobileVehicleEntity implements GeoEntity } if (backInputDown) { - this.entityData.set(POWER, Math.max(this.entityData.get(POWER) - 0.002f, -0.05f)); + this.entityData.set(POWER, Math.max(this.entityData.get(POWER) - 0.002f, onGround() ? -0.05f : 0.01f)); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index 16d223cfc..1db0d5f46 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -290,7 +290,7 @@ public class ClientEventHandler { canDoubleJump = false; } - if (stack.is(ModItems.ARTILLERY_INDICATOR.get()) && holdFire) { + if ((stack.is(ModItems.ARTILLERY_INDICATOR.get()) || (stack.is(ModItems.MONITOR.get()) && player.getOffhandItem().is(ModItems.ARTILLERY_INDICATOR.get()))) && holdFire) { holdArtilleryIndicator = Mth.clamp(holdArtilleryIndicator + 1, 0, 10); if (holdArtilleryIndicator >= 9) { PacketDistributor.sendToServer(ArtilleryIndicatorFireMessage.INSTANCE); diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientMouseHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientMouseHandler.java index e158a2201..e8e4a6059 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientMouseHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientMouseHandler.java @@ -81,8 +81,8 @@ public class ClientMouseHandler { PacketDistributor.sendToServer(new MouseMoveMessage(0, 0)); return; } - speedX = drone.getMouseSensitivity() * (posN.x - posO.x); - speedY = drone.getMouseSensitivity() * (posN.y - posO.y); + speedX = (drone.getMouseSensitivity() / ClientEventHandler.droneFovLerp) * (posN.x - posO.x); + speedY = (drone.getMouseSensitivity() / ClientEventHandler.droneFovLerp) * (posN.y - posO.y); lerpSpeedX = Mth.lerp(drone.getMouseSpeedX(), lerpSpeedX, speedX); lerpSpeedY = Mth.lerp(drone.getMouseSpeedY(), lerpSpeedY, speedY); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/ArtilleryIndicator.java b/src/main/java/com/atsuishio/superbwarfare/item/ArtilleryIndicator.java index a6fa5ecf7..a0078823f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/ArtilleryIndicator.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/ArtilleryIndicator.java @@ -42,6 +42,9 @@ public class ArtilleryIndicator extends Item { @Override @ParametersAreNonnullByDefault public @NotNull InteractionResultHolder use(Level pLevel, Player pPlayer, InteractionHand pHand) { + if (pHand == InteractionHand.OFF_HAND) { + return InteractionResultHolder.fail(pPlayer.getItemInHand(pHand)); + } pPlayer.playSound(SoundEvents.SPYGLASS_USE, 1.0F, 1.0F); pPlayer.startUsingItem(pHand); return InteractionResultHolder.consume(pPlayer.getItemInHand(pHand)); diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ArtilleryIndicatorFireMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ArtilleryIndicatorFireMessage.java index 510c523b3..6c1d0b559 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ArtilleryIndicatorFireMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ArtilleryIndicatorFireMessage.java @@ -34,8 +34,13 @@ public enum ArtilleryIndicatorFireMessage implements CustomPacketPayload { Player player = context.player(); ItemStack stack = player.getMainHandItem(); + if (player.getMainHandItem().is(ModItems.MONITOR.get()) && player.getOffhandItem().is(ModItems.ARTILLERY_INDICATOR.get())) { + stack = player.getOffhandItem(); + } + if (stack.is(ModItems.ARTILLERY_INDICATOR.get())) { - ListTag tags = NBTTool.getTag(stack).getList(TAG_CANNON, Tag.TAG_COMPOUND); + var mainTag = NBTTool.getTag(stack); + ListTag tags = mainTag.getList(TAG_CANNON, Tag.TAG_COMPOUND); for (int i = 0; i < tags.size(); i++) { var tag = tags.getCompound(i); Entity entity = EntityFindUtil.findEntity(player.level(), tag.getString("UUID")); diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/DroneFireMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/DroneFireMessage.java index 6752d2963..a9bac6506 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/DroneFireMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/DroneFireMessage.java @@ -3,14 +3,21 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.component.ModDataComponents; import com.atsuishio.superbwarfare.entity.vehicle.DroneEntity; +import com.atsuishio.superbwarfare.entity.vehicle.Mk42Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mle1934Entity; +import com.atsuishio.superbwarfare.entity.vehicle.MortarEntity; import com.atsuishio.superbwarfare.init.ModItems; +import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.FiringParameters; import com.atsuishio.superbwarfare.tools.EntityFindUtil; import com.atsuishio.superbwarfare.tools.NBTTool; import com.atsuishio.superbwarfare.tools.SeekTool; +import com.atsuishio.superbwarfare.tools.SoundTool; import io.netty.buffer.ByteBuf; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; @@ -23,7 +30,7 @@ import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.network.handling.IPayloadContext; import org.jetbrains.annotations.NotNull; -import java.util.Objects; +import static com.atsuishio.superbwarfare.item.ArtilleryIndicator.TAG_CANNON; public enum DroneFireMessage implements CustomPacketPayload { INSTANCE; @@ -35,46 +42,71 @@ public enum DroneFireMessage implements CustomPacketPayload { public static void handler(final IPayloadContext context) { Player player = context.player(); ItemStack stack = player.getMainHandItem(); - var tag = NBTTool.getTag(stack); + var mainTag = NBTTool.getTag(stack); - if (stack.is(ModItems.MONITOR.get()) && tag.getBoolean("Using") && tag.getBoolean("Linked")) { - DroneEntity drone = EntityFindUtil.findDrone(player.level(), tag.getString("LinkedDrone")); - if (drone == null) return; + if (stack.is(ModItems.MONITOR.get()) && mainTag.getBoolean("Using") && mainTag.getBoolean("Linked")) { + DroneEntity drone = EntityFindUtil.findDrone(player.level(), mainTag.getString("LinkedDrone")); + if (drone != null) { + if (player.getOffhandItem().is(ModItems.FIRING_PARAMETERS.get()) || player.getOffhandItem().is(ModItems.ARTILLERY_INDICATOR.get())) { + boolean lookAtEntity = false; - if (!player.getOffhandItem().is(ModItems.FIRING_PARAMETERS.get())) { - drone.fire = true; - } else { - boolean lookAtEntity = false; + Entity lookingEntity = SeekTool.seekLivingEntity(drone, drone.level(), 512, 2); - Entity lookingEntity = SeekTool.seekLivingEntity(drone, drone.level(), 512, 2); + BlockHitResult result = player.level().clip(new ClipContext(drone.getEyePosition(), drone.getEyePosition().add(drone.getLookAngle().scale(512)), + ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, drone)); + Vec3 hitPos = result.getLocation(); - BlockHitResult result = drone.level().clip(new ClipContext(drone.getEyePosition(), drone.getEyePosition().add(drone.getViewVector(1).scale(512)), - ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, drone)); - Vec3 hitPos = result.getLocation(); + if (lookingEntity != null) { + lookAtEntity = true; + } - if (lookingEntity != null) { - lookAtEntity = true; - } + ItemStack offStack = player.getOffhandItem(); + var parameters = offStack.get(ModDataComponents.FIRING_PARAMETERS); + var isDepressed = parameters != null && parameters.isDepressed(); - ItemStack offStack = player.getOffhandItem(); - var parameters = offStack.get(ModDataComponents.FIRING_PARAMETERS); - var isDepressed = parameters != null && parameters.isDepressed(); + BlockPos pos; + if (lookAtEntity) { + pos = lookingEntity.blockPosition(); + } else { + pos = new BlockPos((int) hitPos.x, (int) hitPos.y, (int) hitPos.z); + } + offStack.set(ModDataComponents.FIRING_PARAMETERS, new FiringParameters.Parameters(pos, isDepressed)); - if (lookAtEntity) { - offStack.set(ModDataComponents.FIRING_PARAMETERS, new FiringParameters.Parameters(lookingEntity.blockPosition(), isDepressed)); + player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.target_pos") + .withStyle(ChatFormatting.GRAY) + .append(Component.literal("[" + + pos.getX() + + "," + pos.getY() + + "," + pos.getZ() + + "]")), true); + SoundTool.playLocalSound(player, ModSounds.CANNON_ZOOM_IN.get(), 2, 1); + + if (offStack.is(ModItems.ARTILLERY_INDICATOR.get())) { + var offTag = NBTTool.getTag(offStack); + ListTag tags = offTag.getList(TAG_CANNON, Tag.TAG_COMPOUND); + for (int i = 0; i < tags.size(); i++) { + var tag = tags.getCompound(i); + Entity entity = EntityFindUtil.findEntity(player.level(), tag.getString("UUID")); + if (entity instanceof MortarEntity mortarEntity) { + if (!mortarEntity.setTarget(offStack)) { + player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.warn").withStyle(ChatFormatting.RED), true); + } + } + if (entity instanceof Mk42Entity mk42Entity) { + if (!mk42Entity.setTarget(offStack, true)) { + player.displayClientMessage(Component.translatable("tips.superbwarfare.mk_42.warn").withStyle(ChatFormatting.RED), true); + } + } + if (entity instanceof Mle1934Entity mle1934Entity) { + if (!mle1934Entity.setTarget(offStack, true)) { + player.displayClientMessage(Component.translatable("tips.superbwarfare.mle_1934.warn").withStyle(ChatFormatting.RED), true); + } + } + } + } } else { - offStack.set(ModDataComponents.FIRING_PARAMETERS, new FiringParameters.Parameters(new BlockPos((int) hitPos.x, (int) hitPos.y, (int) hitPos.z), isDepressed)); + drone.fire = true; } - - var pos = Objects.requireNonNull(offStack.get(ModDataComponents.FIRING_PARAMETERS)).pos(); - - player.displayClientMessage(Component.translatable("tips.superbwarfare.mortar.target_pos") - .withStyle(ChatFormatting.GRAY) - .append(Component.literal("[" - + pos.getX() - + "," + pos.getY() - + "," + pos.getZ() - + "]")), true); } } } diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/VectorUtil.java b/src/main/java/com/atsuishio/superbwarfare/tools/VectorUtil.java index 70cbab7e2..f61b06cef 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/VectorUtil.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/VectorUtil.java @@ -1,8 +1,21 @@ package com.atsuishio.superbwarfare.tools; +import com.atsuishio.superbwarfare.config.client.DisplayConfig; +import com.atsuishio.superbwarfare.entity.vehicle.DroneEntity; +import com.atsuishio.superbwarfare.entity.vehicle.base.LandArmorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; +import com.atsuishio.superbwarfare.event.ClientEventHandler; +import com.atsuishio.superbwarfare.init.ModItems; +import com.atsuishio.superbwarfare.init.ModMobEffects; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.Minecraft; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.util.Mth; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.Vec3; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.EventPriority; @@ -54,8 +67,50 @@ public class VectorUtil { @SubscribeEvent(priority = EventPriority.LOWEST) public static void captureCamera(ViewportEvent.ComputeCameraAngles event) { + float roll; + roll = ClientEventHandler.cameraRoll; + + Entity entity = event.getCamera().getEntity(); + + if (entity instanceof Player player && !player.isSpectator() && player.hasEffect(ModMobEffects.SHOCK)) { + float shakeStrength = (float) DisplayConfig.SHOCK_SCREEN_SHAKE.get() / 100.0f; + if (shakeStrength <= 0.0f) return; + roll = (float) Mth.nextDouble(RandomSource.create(), 8, 12) * shakeStrength; + } + + if (entity.getRootVehicle() instanceof VehicleEntity vehicle && (!event.getCamera().isDetached() || vehicle instanceof LandArmorEntity && ClientEventHandler.zoomVehicle)) { + // rotate camera + float a = vehicle.getTurretYaw((float) event.getPartialTick()); + float r = (Mth.abs(a) - 90f) / 90f; + float r2; + if (Mth.abs(a) <= 90f) { + r2 = a / 90f; + } else { + if (a < 0) { + r2 = -(180f + a) / 90f; + } else { + r2 = (180f - a) / 90f; + } + } + + roll = -r * vehicle.getRoll((float) event.getPartialTick()) + r2 * vehicle.getViewXRot((float) event.getPartialTick()); + } + + Minecraft mc = Minecraft.getInstance(); + LocalPlayer player = mc.player; + if (player != null) { + ItemStack stack = player.getMainHandItem(); + var tag = NBTTool.getTag(stack); + if (stack.is(ModItems.MONITOR.get()) && tag.getBoolean("Using") && tag.getBoolean("Linked")) { + DroneEntity drone = EntityFindUtil.findDrone(player.level(), tag.getString("LinkedDrone")); + if (drone != null) { + roll = event.getRoll(); + } + } + } + PoseStack poseStack = new PoseStack(); - poseStack.mulPose(Axis.ZP.rotationDegrees(event.getRoll())); + poseStack.mulPose(Axis.ZP.rotationDegrees(roll)); poseStack.mulPose(Axis.XP.rotationDegrees(event.getPitch())); poseStack.mulPose(Axis.YP.rotationDegrees(event.getYaw() + 180.0F));