Use VV contained sound mappings in 1.9->1.8

Author: kennytv

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/Protocol1_9To1_8.java

@@ -18,7 +18,7 @@
 package com.viaversion.viarewind.protocol.v1_9to1_8;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viarewind.protocol.v1_9to1_8.data.RewindMappingData1_8;
+import com.viaversion.viarewind.api.data.RewindMappingData;
 import com.viaversion.viarewind.protocol.v1_9to1_8.rewriter.BlockItemPacketRewriter1_9;
 import com.viaversion.viarewind.protocol.v1_9to1_8.rewriter.EntityPacketRewriter1_9;
 import com.viaversion.viarewind.protocol.v1_9to1_8.rewriter.PlayerPacketRewriter1_9;
@@ -60,7 +60,7 @@ public Byte transform(PacketWrapper packetWrapper, Float degrees) {
         }
     };
 
-    public static final RewindMappingData1_8 MAPPINGS = new RewindMappingData1_8();
+    public static final RewindMappingData MAPPINGS = new RewindMappingData("1.9.4", "1.8");
 
     private final BlockItemPacketRewriter1_9 itemRewriter = new BlockItemPacketRewriter1_9(this);
     private final EntityPacketRewriter1_9 entityRewriter = new EntityPacketRewriter1_9(this);
@@ -97,7 +97,7 @@ public void register(ViaProviders providers) {
     }
 
     @Override
-    public RewindMappingData1_8 getMappingData() {
+    public RewindMappingData getMappingData() {
         return MAPPINGS;
     }
 

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/data/RewindMappingData1_8.java

@@ -251,11 +251,11 @@ public void register() {
             public void register() {
                 handler(wrapper -> {
                     final int soundId = wrapper.read(Types.VAR_INT);
-                    final String soundName = protocol.getMappingData().soundName(soundId);
-                    if (soundName == null) {
+                    final int mappedSoundId = protocol.getMappingData().getFullSoundMappings().getNewId(soundId);
+                    if (mappedSoundId == -1) {
                         wrapper.cancel();
                     } else {
-                        wrapper.write(Types.STRING, protocol.getMappingData().getMappedNamedSound(soundName));
+                        wrapper.write(Types.STRING, protocol.getMappingData().getFullSoundMappings().mappedIdentifier(mappedSoundId));
                     }
                 });
                 read(Types.VAR_INT); // Sound category