Replace LegacyEntityRewriter#getObjectTypeFromId with existing method (…

…#723)
ViaVersion · Apr 22, 2024 · 948c615 · 948c615
1 parent 0cd46fd
commit 948c615
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 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
@@ -132,7 +132,7 @@ protected PacketHandler getMobSpawnRewriter(Type<List<Metadata>> metaType) {
     }
 
     protected PacketHandler getObjectTrackerHandler() {
-        return wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), getObjectTypeFromId(wrapper.get(Type.BYTE, 0)));
+        return wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), objectTypeFromId(wrapper.get(Type.BYTE, 0)));
     }
 
     protected PacketHandler getTrackerAndMetaHandler(Type<List<Metadata>> metaType, EntityType entityType) {
@@ -161,10 +161,6 @@ protected PacketHandler getObjectRewriter(Function<Byte, ObjectType> objectGette
         };
     }
 
-    protected EntityType getObjectTypeFromId(int typeId) {
-        return typeFromId(typeId);
-    }
-
     @Deprecated
     protected void addTrackedEntity(PacketWrapper wrapper, int entityId, EntityType type) throws Exception {
         tracker(wrapper.user()).addEntity(entityId, type);

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
@@ -380,7 +380,7 @@ public EntityType typeFromId(int typeId) {
     }
 
     @Override
-    protected EntityType getObjectTypeFromId(int typeId) {
+    public EntityType objectTypeFromId(int typeId) {
         return EntityTypes1_11.getTypeFromId(typeId, true);
     }
 }
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
@@ -290,7 +290,7 @@ public EntityType typeFromId(int typeId) {
     }
 
     @Override
-    protected EntityType getObjectTypeFromId(final int typeId) {
+    public EntityType objectTypeFromId(int typeId) {
         return EntityTypes1_12.getTypeFromId(typeId, true);
     }
 }
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
@@ -121,7 +121,7 @@ public EntityType typeFromId(int typeId) {
     }
 
     @Override
-    protected EntityType getObjectTypeFromId(final int typeId) {
+    public EntityType objectTypeFromId(int typeId) {
         return EntityTypes1_11.getTypeFromId(typeId, true);
     }
 }
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
@@ -362,7 +362,7 @@ public EntityType typeFromId(int typeId) {
     }
 
     @Override
-    protected EntityType getObjectTypeFromId(final int typeId) {
+    public EntityType objectTypeFromId(int typeId) {
         return EntityTypes1_13.getTypeFromId(typeId, true);
     }
 

diff --git a/...om/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java b/...om/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java
@@ -168,7 +168,7 @@ public EntityType typeFromId(int typeId) {
     }
 
     @Override
-    protected EntityType getObjectTypeFromId(final int typeId) {
+    public EntityType objectTypeFromId(int typeId) {
         return EntityTypes1_13.getTypeFromId(typeId, true);
     }
 }
diff --git a/...a/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java b/...a/com/viaversion/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java
@@ -165,7 +165,7 @@ public EntityType typeFromId(int typeId) {
     }
 
     @Override
-    protected EntityType getObjectTypeFromId(int typeId) {
+    public EntityType objectTypeFromId(int typeId) {
         return EntityTypes1_10.getTypeFromId(typeId, true);
     }
 }