Add blockhit sound

Author: ZsoltMolnarrr

CHANGELOG.md

@@ -4,6 +4,7 @@
   - Better Combat weapon attribute range is now only applied when a weapon has no modifier for vanilla range
   - Added function to reformat `Entity Interaction Range` to `Attack Range` on weapon tooltips
 - Knockback reduction for fast attacks is now stronger (configurable)
+- Added block hit sound upon swinging at blocks
 
 # 2.1.1
 

common/src/main/java/net/bettercombat/mixin/client/MinecraftClientInject.java

@@ -57,6 +57,8 @@ public abstract class MinecraftClientInject implements MinecraftClient_BetterCom
 
     @Shadow @Final public InGameHud inGameHud;
 
+    @Shadow @Nullable public HitResult crosshairTarget;
+
     private MinecraftClient thisClient() {
         return (MinecraftClient)((Object)this);
     }
@@ -345,6 +347,13 @@ private void performAttack() {
         updateTargetsInReach(targets);
         if(targets.size() == 0) {
             PlatformClient.onEmptyLeftClick(player);
+
+            if (crosshairTarget.getType() == BLOCK) {
+                var blockHitResult = (BlockHitResult) crosshairTarget;
+                var pos = blockHitResult.getBlockPos();
+                var packet = new Packets.C2S_BlockHit(pos);
+                Platform.networkC2S_Send(packet);
+            }
         }
 
         // Mimic logic of:

common/src/main/java/net/bettercombat/network/Packets.java

@@ -10,6 +10,7 @@
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.packet.CustomPayload;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -146,6 +147,17 @@ public Id<? extends CustomPayload> getId() {
         }
     }
 
+    public record C2S_BlockHit(BlockPos pos) implements CustomPayload {
+        public static Identifier ID = Identifier.of(BetterCombatMod.ID, "block_hit");
+        public static final CustomPayload.Id<C2S_BlockHit> PACKET_ID = new CustomPayload.Id<>(ID);
+        public static final PacketCodec<PacketByteBuf, C2S_BlockHit> CODEC = BlockPos.PACKET_CODEC.xmap(C2S_BlockHit::new, C2S_BlockHit::pos).cast();
+
+        @Override
+        public Id<? extends CustomPayload> getId() {
+            return PACKET_ID;
+        }
+    }
+
     public record ConfigSync(String json) implements CustomPayload {
         public static Identifier ID = Identifier.of(BetterCombatMod.ID, "config_sync");
         public static final CustomPayload.Id<ConfigSync> PACKET_ID = new CustomPayload.Id<>(ID);

common/src/main/java/net/bettercombat/network/ServerNetwork.java

@@ -209,4 +209,19 @@ public static void handleAttackRequest(Packets.C2S_AttackRequest request, Minecr
             });
         });
     }
+
+    public static void handleBlockHit(Packets.C2S_BlockHit packet, MinecraftServer server, ServerPlayerEntity player) {
+        var world = player.getWorld();
+        if (world == null) {
+            return;
+        }
+        var block = world.getBlockState(packet.pos());
+        if (block == null || block.isAir()) {
+            return;
+        }
+        var soundGroup = block.getSoundGroup();
+        if (soundGroup != null) {
+            world.playSound(null, packet.pos().getX(), packet.pos().getY(), packet.pos().getZ(), soundGroup.getHitSound(), player.getSoundCategory(), 1.0F, 1.0F);
+        }
+    }
 }

fabric/src/main/java/net/bettercombat/fabric/network/FabricServerNetwork.java

@@ -58,6 +58,7 @@ public static void init() {
         PayloadTypeRegistry.playS2C().register(Packets.AttackAnimation.PACKET_ID, Packets.AttackAnimation.CODEC);
         PayloadTypeRegistry.playC2S().register(Packets.AttackAnimation.PACKET_ID, Packets.AttackAnimation.CODEC);
         PayloadTypeRegistry.playC2S().register(Packets.C2S_AttackRequest.PACKET_ID, Packets.C2S_AttackRequest.CODEC);
+        PayloadTypeRegistry.playC2S().register(Packets.C2S_BlockHit.PACKET_ID, Packets.C2S_BlockHit.CODEC);
 
         ServerPlayNetworking.registerGlobalReceiver(Packets.AttackAnimation.PACKET_ID, (packet, context) -> {
             ServerNetwork.handleAttackAnimation(packet, context.server(), context.player());
@@ -66,6 +67,10 @@ public static void init() {
         ServerPlayNetworking.registerGlobalReceiver(Packets.C2S_AttackRequest.PACKET_ID, (packet, context) -> {
             ServerNetwork.handleAttackRequest(packet, context.server(), context.player(), context.player().networkHandler);
         });
+
+        ServerPlayNetworking.registerGlobalReceiver(Packets.C2S_BlockHit.PACKET_ID, (packet, context) -> {
+            ServerNetwork.handleBlockHit(packet, context.server(), context.player());
+        });
     }
 
     public record ConfigurationTask(String configString) implements ServerPlayerConfigurationTask {

neoforge/src/main/java/net/bettercombat/neoforge/network/NetworkEvents.java

@@ -48,6 +48,12 @@ public static void register(final RegisterPayloadHandlersEvent event) {
             ServerNetwork.handleAttackRequest(packet, server, player, vanillaHandler);
         });
 
+        registrar.playToServer(Packets.C2S_BlockHit.PACKET_ID, Packets.C2S_BlockHit.CODEC, (packet, context) -> {
+            var player = (ServerPlayerEntity)context.player();
+            var server = player.server;
+            ServerNetwork.handleBlockHit(packet, server, player);
+        });
+
         // Shared play stage
 
         registrar.playBidirectional(Packets.AttackAnimation.PACKET_ID, Packets.AttackAnimation.CODEC, (packet, context) -> {