Fix sound mapping

Exceptionflug · Jul 5, 2024 · 56a08c8 · 56a08c8
1 parent 3f0b6e4
commit 56a08c8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/protocolize-api/src/main/java/dev/simplix/protocolize/api/SimpleMappingProvider.java b/protocolize-api/src/main/java/dev/simplix/protocolize/api/SimpleMappingProvider.java
@@ -4,6 +4,7 @@
 import dev.simplix.protocolize.api.item.component.StructuredComponentType;
 import dev.simplix.protocolize.api.mapping.ProtocolIdMapping;
 import dev.simplix.protocolize.api.mapping.ProtocolMapping;
+import dev.simplix.protocolize.api.mapping.ProtocolStringMapping;
 import dev.simplix.protocolize.api.packet.RegisteredPacket;
 import dev.simplix.protocolize.api.providers.MappingProvider;
 import dev.simplix.protocolize.data.ItemType;
@@ -70,6 +71,10 @@ public <T extends Enum<T>> T mapIdToEnum(int id, int protocolVersion, Class<T> c
                     if (((ProtocolIdMapping) mapping).id() == id) {
                         return type;
                     }
+                } else if (mapping instanceof ProtocolStringMapping) {
+                    if(((ProtocolStringMapping) mapping).protocolId() == id){
+                        return type;
+                    }
                 }
             }
         }

diff --git a/...colize-api/src/main/java/dev/simplix/protocolize/api/mapping/AbstractProtocolMapping.java b/...colize-api/src/main/java/dev/simplix/protocolize/api/mapping/AbstractProtocolMapping.java
@@ -26,8 +26,8 @@ public static ProtocolIdMapping rangedIdMapping(int start, int end, int id) {
         return new RangeProtocolIdMapping(start, end, id);
     }
 
-    public static ProtocolStringMapping rangedStringMapping(int start, int end, String id) {
-        return new RangeProtocolStringMapping(start, end, id);
+    public static ProtocolStringMapping rangedStringMapping(int start, int end, String id, int protocolId) {
+        return new RangeProtocolStringMapping(start, end, id, protocolId);
     }
 
 }
diff --git a/protocolize-api/src/main/java/dev/simplix/protocolize/api/mapping/ProtocolStringMapping.java b/protocolize-api/src/main/java/dev/simplix/protocolize/api/mapping/ProtocolStringMapping.java
@@ -8,5 +8,6 @@
 public interface ProtocolStringMapping extends ProtocolMapping {
 
     String id();
+    int protocolId();
 
 }
diff --git a/...ize-api/src/main/java/dev/simplix/protocolize/api/mapping/RangeProtocolStringMapping.java b/...ize-api/src/main/java/dev/simplix/protocolize/api/mapping/RangeProtocolStringMapping.java
@@ -14,14 +14,16 @@
 public class RangeProtocolStringMapping extends AbstractProtocolMapping implements ProtocolStringMapping {
 
     private final String id;
+    private final int protocolId;
 
-    RangeProtocolStringMapping(int protocolVersionStart, int protocolVersionEnd, String id) {
+    RangeProtocolStringMapping(int protocolVersionStart, int protocolVersionEnd, String id, int protocolId) {
         super(protocolVersionStart, protocolVersionEnd);
         this.id = id;
+        this.protocolId = protocolId;
     }
 
     @Override
     public String toString() {
-        return "(" + protocolRangeStart() + "-" + protocolRangeEnd() + ": " + id + ")";
+        return "(" + protocolRangeStart() + "-" + protocolRangeEnd() + ": " + id + ":" + protocolId + ")";
     }
 }