Fix big red button targeting and animation 修复大红按钮目标判定与按压动画

src/main/java/dev/dubhe/anvilcraft/block/entity/BigRedButtonBlockEntity.java

@@ -37,12 +37,13 @@ public void onLoad() {
         }
     }
 
-    public void press(Player player) {
+    public boolean press(Player player) {
         if (this.level == null || this.level.isClientSide || !player.isAlive() || player.isSpectator() || player.isShiftKeyDown()
-            || player.getMainHandItem().is(ModItems.BUILDING_ROD)) return;
+            || player.getMainHandItem().is(ModItems.BUILDING_ROD)) return false;
         this.holders.put(player.getUUID(), this.level.getGameTime());
         this.setPressed(true);
         this.level.scheduleTick(this.worldPosition, this.getBlockState().getBlock(), 1);
+        return true;
     }
 
     public void release(Player player) {

src/main/java/dev/dubhe/anvilcraft/client/event/BigRedButtonInputListener.java

@@ -1,6 +1,7 @@
 package dev.dubhe.anvilcraft.client.event;
 
 import dev.dubhe.anvilcraft.AnvilCraft;
+import dev.dubhe.anvilcraft.block.BigRedButtonBlock;
 import dev.dubhe.anvilcraft.init.block.ModBlocks;
 import dev.dubhe.anvilcraft.item.BuildingRodItem;
 import dev.dubhe.anvilcraft.network.BigRedButtonHoldPacket;
@@ -11,6 +12,7 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
@@ -27,6 +29,8 @@ public class BigRedButtonInputListener {
     private static @Nullable BlockPos heldPos;
     private static @Nullable ClientLevel heldLevel;
     private static int heartbeatTicks;
+    private static int holdId;
+    private static boolean confirmed;
     private static final float HELD_SWING_PROGRESS = 0.125f;
     private static @Nullable ClientLevel animationLevel;
     private static float previousSwingProgress;
@@ -36,16 +40,17 @@ public class BigRedButtonInputListener {
     public static void onUse(InputEvent.InteractionKeyMappingTriggered event) {
         if (!event.isUseItem()) return;
         Minecraft minecraft = Minecraft.getInstance();
-        BlockPos pos = targetedButton(minecraft);
-        if (pos == null) return;
+        BlockHitResult hit = targetedButton(minecraft);
+        if (hit == null) return;
+        BlockPos pos = hit.getBlockPos();
         event.setCanceled(true);
         event.setSwingHand(false);
         if (pos.equals(heldPos) && minecraft.level == heldLevel) return;
         release();
         heldPos = pos;
         heldLevel = minecraft.level;
         heartbeatTicks = 0;
-        PacketDistributor.sendToServer(new BigRedButtonHoldPacket(pos, true));
+        PacketDistributor.sendToServer(new BigRedButtonHoldPacket(pos, hit.getLocation(), true, holdId));
     }
 
     @SubscribeEvent
@@ -68,14 +73,15 @@ public static void onKey(InputEvent.Key event) {
     public static void onClientTick(ClientTickEvent.Pre event) {
         if (heldPos == null) return;
         Minecraft minecraft = Minecraft.getInstance();
+        BlockHitResult hit = targetedButton(minecraft);
         if (minecraft.level != heldLevel || !minecraft.options.keyUse.isDown()
-            || !heldPos.equals(targetedButton(minecraft))) {
+            || hit == null || !heldPos.equals(hit.getBlockPos())) {
             release();
             return;
         }
         if (++heartbeatTicks >= 5) {
             heartbeatTicks = 0;
-            PacketDistributor.sendToServer(new BigRedButtonHoldPacket(heldPos, true));
+            PacketDistributor.sendToServer(new BigRedButtonHoldPacket(heldPos, hit.getLocation(), true, holdId));
         }
     }
 
@@ -88,7 +94,16 @@ public static void onAnimationTick(ClientTickEvent.Post event) {
             swingProgress = 0;
         }
         previousSwingProgress = swingProgress;
-        swingProgress = Mth.approach(swingProgress, heldPos == null ? 0 : HELD_SWING_PROGRESS, HELD_SWING_PROGRESS / 2);
+        boolean pressed = confirmed && heldPos != null && minecraft.player != null
+            && minecraft.level == heldLevel && minecraft.level != null
+            && minecraft.level.getBlockState(heldPos).is(ModBlocks.BIG_RED_BUTTON)
+            && minecraft.level.getBlockState(heldPos).getValue(BigRedButtonBlock.PRESSED);
+        swingProgress = Mth.approach(swingProgress, pressed ? HELD_SWING_PROGRESS : 0, HELD_SWING_PROGRESS / 2);
+    }
+
+    public static void handleHoldResult(BlockPos pos, int id, boolean accepted) {
+        if (id != holdId || !pos.equals(heldPos) || Minecraft.getInstance().level != heldLevel) return;
+        confirmed = accepted;
     }
 
     public static float getHandSwingProgress(InteractionHand hand, float partialTick, float vanillaProgress) {
@@ -99,21 +114,23 @@ public static float getHandSwingProgress(InteractionHand hand, float partialTick
     }
 
     @Nullable
-    private static BlockPos targetedButton(Minecraft minecraft) {
+    private static BlockHitResult targetedButton(Minecraft minecraft) {
         if (minecraft.level == null || minecraft.player == null || minecraft.screen != null || !minecraft.isWindowActive()
             || !minecraft.player.isAlive() || minecraft.player.isSpectator() || minecraft.player.isShiftKeyDown()
             || BuildingRodItem.isHeld(minecraft.player)) return null;
         if (!(minecraft.hitResult instanceof BlockHitResult hit) || hit.getType() != HitResult.Type.BLOCK) return null;
-        return minecraft.level.getBlockState(hit.getBlockPos()).is(ModBlocks.BIG_RED_BUTTON) ? hit.getBlockPos() : null;
+        return minecraft.level.getBlockState(hit.getBlockPos()).is(ModBlocks.BIG_RED_BUTTON) ? hit : null;
     }
 
     private static void release() {
         Minecraft minecraft = Minecraft.getInstance();
         if (heldPos != null && minecraft.level == heldLevel && minecraft.getConnection() != null) {
-            PacketDistributor.sendToServer(new BigRedButtonHoldPacket(heldPos, false));
+            PacketDistributor.sendToServer(new BigRedButtonHoldPacket(heldPos, Vec3.ZERO, false, holdId));
         }
         heldPos = null;
         heldLevel = null;
+        holdId++;
+        confirmed = false;
         heartbeatTicks = 0;
     }
 }

src/main/java/dev/dubhe/anvilcraft/network/BigRedButtonHoldPacket.java

@@ -1,26 +1,32 @@
 package dev.dubhe.anvilcraft.network;
 
+import dev.anvilcraft.lib.v2.codec.StreamCodecUtil;
 import dev.anvilcraft.lib.v2.network.packet.IPacket;
-import dev.anvilcraft.lib.v2.network.packet.IServerboundPacket;
+import dev.anvilcraft.lib.v2.network.packet.ISensitiveBiPacket;
+import dev.anvilcraft.lib.v2.util.Util;
 import dev.dubhe.anvilcraft.AnvilCraft;
-import dev.dubhe.anvilcraft.block.BigRedButtonBlock;
 import dev.dubhe.anvilcraft.block.entity.BigRedButtonBlockEntity;
-import io.netty.buffer.ByteBuf;
+import dev.dubhe.anvilcraft.client.event.BigRedButtonInputListener;
 import net.minecraft.core.BlockPos;
+import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.ClipContext;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
+import net.neoforged.neoforge.network.PacketDistributor;
 
-public record BigRedButtonHoldPacket(BlockPos pos, boolean held) implements IServerboundPacket {
+public record BigRedButtonHoldPacket(BlockPos pos, Vec3 hitLocation, boolean held, int holdId) implements ISensitiveBiPacket {
     public static final Type<BigRedButtonHoldPacket> TYPE = IPacket.type(AnvilCraft.of("big_red_button_hold"));
-    public static final StreamCodec<ByteBuf, BigRedButtonHoldPacket> STREAM_CODEC = StreamCodec.composite(
+    public static final StreamCodec<FriendlyByteBuf, BigRedButtonHoldPacket> STREAM_CODEC = StreamCodec.composite(
         BlockPos.STREAM_CODEC, BigRedButtonHoldPacket::pos,
+        StreamCodecUtil.VEC3, BigRedButtonHoldPacket::hitLocation,
         ByteBufCodecs.BOOL, BigRedButtonHoldPacket::held,
+        ByteBufCodecs.VAR_INT, BigRedButtonHoldPacket::holdId,
         BigRedButtonHoldPacket::new
     );
 
@@ -29,21 +35,38 @@ public Type<? extends CustomPacketPayload> type() {
         return TYPE;
     }
 
+    @Override
+    public void handleOnClient(Player player) {
+        BigRedButtonInputListener.handleHoldResult(this.pos, this.holdId, this.held);
+    }
+
     @Override
     public void handleOnServer(Player player) {
-        if (!player.level().hasChunkAt(this.pos)) return;
-        if (!(player.level().getBlockEntity(this.pos) instanceof BigRedButtonBlockEntity button)) return;
-        if (!this.held) {
+        boolean accepted = this.updateButton(player);
+        PacketDistributor.sendToPlayer(
+            Util.cast(player), new BigRedButtonHoldPacket(this.pos, this.hitLocation, accepted, this.holdId)
+        );
+    }
+
+    private boolean updateButton(Player player) {
+        if (!player.level().hasChunkAt(this.pos)) return false;
+        if (!(player.level().getBlockEntity(this.pos) instanceof BigRedButtonBlockEntity button)) return false;
+        if (!this.held || !this.canPress(player)) {
             button.release(player);
-            return;
+            return false;
         }
-        if (!player.isAlive() || player.isSpectator() || !player.canInteractWithBlock(this.pos, 1.0)) return;
-        Vec3 target = this.pos.getCenter().relative(button.getBlockState().getValue(BigRedButtonBlock.FACING), -0.375);
-        HitResult hit = player.level().clip(new ClipContext(
-            player.getEyePosition(), target, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player
+        return button.press(player);
+    }
+
+    private boolean canPress(Player player) {
+        if (!player.isAlive() || player.isSpectator() || !player.canInteractWithBlock(this.pos, 1.0)) return false;
+        if (!Double.isFinite(this.hitLocation.x) || !Double.isFinite(this.hitLocation.y) || !Double.isFinite(this.hitLocation.z)
+            || !new AABB(this.pos).inflate(1.0E-5).contains(this.hitLocation)) return false;
+        Vec3 eye = player.getEyePosition();
+        Vec3 target = this.hitLocation.add(this.hitLocation.subtract(eye).normalize().scale(1.0E-4));
+        BlockHitResult hit = player.level().clip(new ClipContext(
+            eye, target, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player
         ));
-        if (!(hit instanceof BlockHitResult blockHit) || hit.getType() != HitResult.Type.BLOCK
-            || !blockHit.getBlockPos().equals(this.pos)) return;
-        button.press(player);
+        return hit.getType() == HitResult.Type.BLOCK && hit.getBlockPos().equals(this.pos);
     }
 }