Add proper combat sounds

core/src/main/java/org/geysermc/geyser/registry/loader/SoundRegistryLoader.java

@@ -60,6 +60,7 @@ public Map<String, SoundMapping> load(String input) {
                             javaSound,
                             brMap.has("bedrock_mapping") ? brMap.get("bedrock_mapping").getAsString() : null,
                             brMap.has("playsound_mapping") ? brMap.get("playsound_mapping").getAsString() : null,
+                            brMap.has("integrated_playsound_mapping") ? brMap.get("integrated_playsound_mapping").getAsString() : null,
                             brMap.has("extra_data") ? brMap.get("extra_data").getAsInt() : -1,
                             brMap.has("identifier") ? brMap.get("identifier").getAsString() : null,
                             brMap.has("level_event") && brMap.get("level_event").getAsBoolean(),

core/src/main/java/org/geysermc/geyser/registry/type/SoundMapping.java

@@ -25,15 +25,16 @@
 
 package org.geysermc.geyser.registry.type;
 
-public record SoundMapping(String java, String bedrock, String playsound, int extraData, String identifier,
+public record SoundMapping(String java, String bedrock, String playsound, String integratedPlaySound, int extraData, String identifier,
                            boolean levelEvent, float pitchAdjust) {
-    public SoundMapping(String java, String bedrock, String playsound, int extraData, String identifier, boolean levelEvent, float pitchAdjust) {
+    public SoundMapping(String java, String bedrock, String playsound, String integratedPlaySound, int extraData, String identifier, boolean levelEvent, float pitchAdjust) {
         this.java = java;
         this.bedrock = bedrock == null || bedrock.isEmpty() ? null : bedrock;
         this.playsound = playsound == null || playsound.isEmpty() ? null : playsound;
+        this.integratedPlaySound = integratedPlaySound == null || integratedPlaySound.isEmpty() ? playsound : integratedPlaySound;
         this.extraData = extraData;
         this.identifier = identifier == null || identifier.isEmpty() ? ":" : identifier;
         this.levelEvent = levelEvent;
         this.pitchAdjust = pitchAdjust;
     }
-}
+}

core/src/main/java/org/geysermc/geyser/util/SoundUtils.java

@@ -112,9 +112,11 @@ public static void playSound(GeyserSession session, Sound javaSound, Vector3f po
             return;
         }
 
-        if (soundMapping.playsound() != null) {
+        String playsound = session.integratedPackActive() ? soundMapping.integratedPlaySound() : soundMapping.playsound();
+
+        if (playsound != null) {
             // We always prefer the PlaySound mapping because we can control volume and pitch
-            playSound(session, soundMapping.playsound(), position, volume, pitch * soundMapping.pitchAdjust());
+            playSound(session, playsound, position, volume, pitch * soundMapping.pitchAdjust());
             return;
         }