Remap UI sound source to master in 1.21.6->1.21.5 (#1056)

Author: FlorianMichael

common/src/main/java/com/viaversion/viabackwards/api/rewriters/SoundRewriter.java

@@ -64,12 +64,11 @@ public PacketHandler getNamedSoundHandler() {
     public PacketHandler getStopSoundHandler() {
         return wrapper -> {
             final byte flags = wrapper.passthrough(Types.BYTE);
-            if ((flags & 0x02) == 0) return; // No sound specified
-
             if ((flags & 0x01) != 0) {
                 wrapper.passthrough(Types.VAR_INT); // Source
             }
 
+            if ((flags & 0x02) == 0) return; // No sound specified
             final String soundId = wrapper.read(Types.STRING);
             final String mappedId = protocol.getMappingData().getMappedNamedSound(soundId);
             if (mappedId == null) {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java

@@ -90,8 +90,22 @@ protected void registerPackets() {
 
         final SoundRewriter<ClientboundPacket1_21_6> soundRewriter = new SoundRewriter<>(this);
         soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND);
+        appendClientbound(ClientboundPackets1_21_6.SOUND, wrapper -> {
+            wrapper.passthrough(Types.VAR_INT); // Source
+            fixSoundSource(wrapper);
+        });
         soundRewriter.registerSound1_19_3(ClientboundPackets1_21_6.SOUND_ENTITY);
+        appendClientbound(ClientboundPackets1_21_6.SOUND_ENTITY, wrapper -> {
+            wrapper.passthrough(Types.VAR_INT); // Source
+            fixSoundSource(wrapper);
+        });
         soundRewriter.registerStopSound(ClientboundPackets1_21_6.STOP_SOUND);
+        appendClientbound(ClientboundPackets1_21_6.STOP_SOUND, wrapper -> {
+            final byte flags = wrapper.get(Types.BYTE, 0);
+            if ((flags & 0x01) != 0) {
+                fixSoundSource(wrapper);
+            }
+        });
 
         new StatisticsRewriter<>(this).register(ClientboundPackets1_21_6.AWARD_STATS);
         new AttributeRewriter<>(this).register1_21(ClientboundPackets1_21_6.UPDATE_ATTRIBUTES);
@@ -238,10 +252,11 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
         cancelClientbound(ClientboundPackets1_21_6.TRACKED_WAYPOINT);
     }
 
-    private void clearDialog(final PacketWrapper wrapper) {
-        wrapper.cancel();
-        final DialogViewProvider provider = Via.getManager().getProviders().get(DialogViewProvider.class);
-        provider.closeDialog(wrapper.user());
+    private void fixSoundSource(final PacketWrapper wrapper) {
+        final int source = wrapper.get(Types.VAR_INT, 0);
+        if (source == 10) { // New ui source, map to master
+            wrapper.set(Types.VAR_INT, 0, 0);
+        }
     }
 
     private void updateTags(final PacketWrapper wrapper) {
@@ -275,6 +290,12 @@ private void updateTags(final PacketWrapper wrapper) {
         }
     }
 
+    private void clearDialog(final PacketWrapper wrapper) {
+        wrapper.cancel();
+        final DialogViewProvider provider = Via.getManager().getProviders().get(DialogViewProvider.class);
+        provider.closeDialog(wrapper.user());
+    }
+
     private void storeServerLinks(final PacketWrapper wrapper) {
         final ServerLinks serverLinks = new ServerLinks();
         final int length = wrapper.passthrough(Types.VAR_INT);