Update sound mapping format

VV now includes full sound name mappings, so VB can map them via registry indexes and doesn't need the extra sound file anymore

Author: kennytv

common/src/main/java/com/viaversion/viabackwards/api/data/BackwardsMappingData.java

@@ -34,7 +34,6 @@
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectArrayMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.viaversion.util.Key;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -45,7 +44,6 @@ public class BackwardsMappingData extends MappingDataBase {
 
     private final Class<? extends Protocol<?, ?, ?, ?>> vvProtocolClass;
     protected Int2ObjectMap<MappedItem> backwardsItemMappings;
-    private Map<String, String> backwardsSoundMappings;
     private Map<String, String> entityNames;
     private Int2ObjectMap<String> enchantmentNames;
 
@@ -83,7 +81,6 @@ protected void loadExtras(final CompoundTag data) {
 
         this.entityNames = loadNameByStringMappings(data, "entitynames");
         this.enchantmentNames = loadNameByIdMappings(data, "enchantmentnames");
-        this.backwardsSoundMappings = loadNameByStringMappings(data, "soundnames");
     }
 
     private @Nullable Map<String, String> loadNameByStringMappings(final CompoundTag data, final String key) {
@@ -161,10 +158,7 @@ public int getNewAttributeId(final int id) {
     }
 
     public @Nullable String getMappedNamedSound(final String id) {
-        if (backwardsSoundMappings == null) {
-            return null;
-        }
-        return backwardsSoundMappings.get(Key.stripMinecraftNamespace(id));
+        return getFullSoundMappings().mappedIdentifier(id);
     }
 
     public @Nullable String mappedEntityName(final String entityName) {
@@ -187,10 +181,6 @@ public int getNewAttributeId(final int id) {
         return backwardsItemMappings;
     }
 
-    public @Nullable Map<String, String> getBackwardsSoundMappings() {
-        return backwardsSoundMappings;
-    }
-
     public @Nullable Class<? extends Protocol<?, ?, ?, ?>> getViaVersionProtocolClass() {
         return vvProtocolClass;
     }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/Protocol1_19_3To1_19_1.java

@@ -19,10 +19,10 @@
 
 import com.google.common.base.Preconditions;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_19_1to1_19.Protocol1_19_1To1_19;
-import com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.data.BackwardsMappingData1_19_3;
 import com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.rewriter.BlockItemPacketRewriter1_19_3;
 import com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.rewriter.EntityPacketRewriter1_19_3;
 import com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.storage.ChatSessionStorage;
@@ -49,6 +49,7 @@
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
+import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.Protocol1_19_1To1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ServerboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ClientboundPackets1_19_1;
@@ -68,7 +69,7 @@
 
 public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundPackets1_19_3, ClientboundPackets1_19_1, ServerboundPackets1_19_3, ServerboundPackets1_19_1> {
 
-    public static final BackwardsMappingData1_19_3 MAPPINGS = new BackwardsMappingData1_19_3();
+    public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.19.3", "1.19", Protocol1_19_1To1_19_3.class);
     public static final ByteArrayType.OptionalByteArrayType OPTIONAL_SIGNATURE_BYTES_TYPE = new ByteArrayType.OptionalByteArrayType(256);
     public static final ByteArrayType SIGNATURE_BYTES_TYPE = new ByteArrayType(256);
     private final EntityPacketRewriter1_19_3 entityRewriter = new EntityPacketRewriter1_19_3(this);
@@ -113,7 +114,7 @@ protected void registerPackets() {
                 return;
             }
 
-            final int mappedId = MAPPINGS.mappedSound(mappedIdentifier);
+            final int mappedId = MAPPINGS.getFullSoundMappings().mappedId(mappedIdentifier);
             if (mappedId == -1) {
                 wrapper.cancel();
                 return;
@@ -401,7 +402,7 @@ public void init(final UserConnection user) {
     }
 
     @Override
-    public BackwardsMappingData1_19_3 getMappingData() {
+    public BackwardsMappingData getMappingData() {
         return MAPPINGS;
     }