diff --git a/gradle.properties b/gradle.properties index 9885908..4e6ddea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ mixin_extras_version=0.3.3 # subproject versions kibu-fabric-hooks-version=0.5.1 -kibu-hooks-version=0.52.0 +kibu-hooks-version=0.53.0 kibu-command-api-version=0.9.0 kibu-scheduler-api-version=0.8.0 kibu-hook-api-version=1.4.0 diff --git a/kibu-hooks/src/main/java/work/lclpnet/kibu/hook/mixin/ServerPlayNetworkHandlerMixin.java b/kibu-hooks/src/main/java/work/lclpnet/kibu/hook/mixin/ServerPlayNetworkHandlerMixin.java index b4403b1..95a3a6a 100644 --- a/kibu-hooks/src/main/java/work/lclpnet/kibu/hook/mixin/ServerPlayNetworkHandlerMixin.java +++ b/kibu-hooks/src/main/java/work/lclpnet/kibu/hook/mixin/ServerPlayNetworkHandlerMixin.java @@ -312,4 +312,15 @@ private static double clampVertical(double d) { public void kibu$onTeleportConfirm(TeleportConfirmC2SPacket packet, CallbackInfo ci) { PlayerTeleportedCallback.HOOK.invoker().onTeleported(player); } + + @Inject( + method = "onHandSwing", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/server/network/ServerPlayerEntity;updateLastActionTime()V" + ) + ) + public void kibu$onHandSwing(HandSwingC2SPacket packet, CallbackInfo ci) { + PlayerSwingHandHook.HOOK.invoker().onSwingHand(player, packet.getHand()); + } } diff --git a/kibu-hooks/src/main/java/work/lclpnet/kibu/hook/player/PlayerSwingHandHook.java b/kibu-hooks/src/main/java/work/lclpnet/kibu/hook/player/PlayerSwingHandHook.java new file mode 100644 index 0000000..4f2c0d8 --- /dev/null +++ b/kibu-hooks/src/main/java/work/lclpnet/kibu/hook/player/PlayerSwingHandHook.java @@ -0,0 +1,20 @@ +package work.lclpnet.kibu.hook.player; + +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.Hand; +import work.lclpnet.kibu.hook.Hook; +import work.lclpnet.kibu.hook.HookFactory; + +/** + * Called when the player swings an arm. + */ +public interface PlayerSwingHandHook { + + Hook HOOK = HookFactory.createArrayBacked(PlayerSwingHandHook.class, callbacks -> (player, hand) -> { + for (var cb : callbacks) { + cb.onSwingHand(player, hand); + } + }); + + void onSwingHand(ServerPlayerEntity player, Hand hand); +} diff --git a/src/testmod/java/work/lclpnet/test/KibuTestMod.java b/src/testmod/java/work/lclpnet/test/KibuTestMod.java index 00733b7..aac4055 100644 --- a/src/testmod/java/work/lclpnet/test/KibuTestMod.java +++ b/src/testmod/java/work/lclpnet/test/KibuTestMod.java @@ -52,6 +52,7 @@ public void onInitialize() { entityEditor(); preventBeyond300(); teleportWithBrick(); + misc(); } private void teleportWithBrick() { @@ -304,4 +305,8 @@ private void preventWithStick() { WorldPhysicsHooks.REPLACE_DISK_ENCHANTMENT.register((world, pos, entity, state) -> entity instanceof ServerPlayerEntity player && player.getMainHandStack().isOf(STICK)); } + + private void misc() { + PlayerSwingHandHook.HOOK.register((player, hand) -> System.out.println("player swings " + hand)); + } }