Add mob spawn rewriter function for pre 1.11 (#724)

ViaVersion · Apr 23, 2024 · 87f2a6b · 87f2a6b
1 parent 948c615
commit 87f2a6b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 23 deletions.
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java
@@ -113,7 +113,7 @@ public void registerMetadataRewriter(C packetType, Type<List<Metadata>> metaType
         registerMetadataRewriter(packetType, null, metaType);
     }
 
-    protected PacketHandler getMobSpawnRewriter(Type<List<Metadata>> metaType) {
+    protected PacketHandler getMobSpawnRewriter(Type<List<Metadata>> metaType, IdSetter idSetter) {
         return wrapper -> {
             int entityId = wrapper.get(Type.VAR_INT, 0);
             EntityType type = tracker(wrapper.user()).entityType(entityId);
@@ -123,14 +123,22 @@ protected PacketHandler getMobSpawnRewriter(Type<List<Metadata>> metaType) {
 
             EntityData entityData = entityDataForType(type);
             if (entityData != null) {
-                wrapper.set(Type.VAR_INT, 1, entityData.replacementId());
+                idSetter.setId(wrapper, entityData.replacementId());
                 if (entityData.hasBaseMeta()) {
                     entityData.defaultMeta().createMeta(new WrappedMetadata(metadata));
                 }
             }
         };
     }
 
+    public PacketHandler getMobSpawnRewriter(Type<List<Metadata>> metaType) {
+        return getMobSpawnRewriter(metaType, (wrapper, id) -> wrapper.set(Type.UNSIGNED_BYTE, 0, (short) id));
+    }
+
+    public PacketHandler getMobSpawnRewriter1_11(Type<List<Metadata>> metaType) {
+        return getMobSpawnRewriter(metaType, (wrapper, id) -> wrapper.set(Type.VAR_INT, 1, id));
+    }
+
     protected PacketHandler getObjectTrackerHandler() {
         return wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), objectTypeFromId(wrapper.get(Type.BYTE, 0)));
     }
@@ -165,4 +173,10 @@ protected PacketHandler getObjectRewriter(Function<Byte, ObjectType> objectGette
     protected void addTrackedEntity(PacketWrapper wrapper, int entityId, EntityType type) throws Exception {
         tracker(wrapper.user()).addEntity(entityId, type);
     }
+
+    @FunctionalInterface
+    protected interface IdSetter {
+
+        void setId(PacketWrapper wrapper, int id) throws Exception;
+    }
 }
diff --git a/...va/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java b/...va/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java
@@ -111,24 +111,13 @@ public void register() {
                 handler(getTrackerHandler(Type.UNSIGNED_BYTE, 0));
 
                 // Rewrite entity type / metadata
-                handler(wrapper -> {
-                    int entityId = wrapper.get(Type.VAR_INT, 0);
-                    EntityType type = tracker(wrapper.user()).entityType(entityId);
-
-                    List<Metadata> list = wrapper.get(Types1_9.METADATA_LIST, 0);
-                    handleMetadata(wrapper.get(Type.VAR_INT, 0), list, wrapper.user());
-
-                    EntityData entityData = entityDataForType(type);
-                    if (entityData != null) {
-                        wrapper.set(Type.UNSIGNED_BYTE, 0, (short) entityData.replacementId());
-                        if (entityData.hasBaseMeta()) {
-                            entityData.defaultMeta().createMeta(new WrappedMetadata(list));
-                        }
-                    }
+                handler(getMobSpawnRewriter(Types1_9.METADATA_LIST));
 
-                    // Sub 1.11 clients will error if the list is empty
-                    if (list.isEmpty()) {
-                        list.add(new Metadata(0, MetaType1_9.Byte, (byte) 0));
+                // Sub 1.11 clients will error if the list is empty
+                handler(wrapper -> {
+                    List<Metadata> metadata = wrapper.get(Types1_9.METADATA_LIST, 0);
+                    if (metadata.isEmpty()) {
+                        metadata.add(new Metadata(0, MetaType1_9.Byte, (byte) 0));
                     }
                 });
             }

diff --git a/.../com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java b/.../com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java
@@ -89,7 +89,7 @@ public void register() {
                 handler(getTrackerHandler());
 
                 // Rewrite entity type / metadata
-                handler(getMobSpawnRewriter(Types1_12.METADATA_LIST));
+                handler(getMobSpawnRewriter1_11(Types1_12.METADATA_LIST));
             }
         });
 

diff --git a/...om/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java b/...om/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java
@@ -78,7 +78,7 @@ public void register() {
                 handler(getTrackerHandler());
 
                 // Rewrite entity type / metadata
-                handler(getMobSpawnRewriter(Types1_9.METADATA_LIST));
+                handler(getMobSpawnRewriter1_11(Types1_9.METADATA_LIST));
             }
         });
 

diff --git a/.../com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java b/.../com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
@@ -155,7 +155,7 @@ public void register() {
                 });
 
                 // Rewrite entity type / metadata
-                handler(getMobSpawnRewriter(Types1_12.METADATA_LIST));
+                handler(getMobSpawnRewriter1_11(Types1_12.METADATA_LIST));
             }
         });
 

diff --git a/.../com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/.../com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
@@ -223,7 +223,7 @@ public void register() {
                 });
 
                 // Handle entity type & metadata
-                handler(getMobSpawnRewriter(Types1_13_2.METADATA_LIST));
+                handler(getMobSpawnRewriter1_11(Types1_13_2.METADATA_LIST));
             }
         });