Automatically call mapTypes in entity rewriter

Author: kennytv

common/src/main/java/com/viaversion/viaversion/protocols/template/EntityPacketRewriter99_1.java

@@ -21,7 +21,6 @@
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_11;
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes26_1;
 import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
-import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPackets26_1;
 import com.viaversion.viaversion.rewriter.EntityRewriter;
 
 // Replace if needed
@@ -64,12 +63,6 @@ protected void registerRewrites() {
         );
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        // IF ENTITY TYPES CHANGED: Automatically map entity id changes AFTER entity ids have been loaded
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(final int type) {
         return EntityTypes1_21_11.getTypeFromId(type);

common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/EntityPacketRewriter1_14.java

@@ -385,7 +385,7 @@ protected void registerRewrites() {
 
     @Override
     public void onMappingDataLoaded() {
-        mapTypes();
+        super.onMappingDataLoaded();
         if (Via.getConfig().translateOcelotToCat()) {
             // A better solution for this would be to despawn the ocelot and spawn a cat in its place, but that would
             // require a lot of data tracking and is not worth the effort.

common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/EntityPacketRewriter1_16.java

@@ -224,11 +224,6 @@ protected void registerRewrites() {
         });
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(int type) {
         return EntityTypes1_16.getTypeFromId(type);

common/src/main/java/com/viaversion/viaversion/protocols/v1_16_1to1_16_2/rewriter/EntityPacketRewriter1_16_2.java

@@ -93,11 +93,6 @@ protected void registerRewrites() {
         });
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(int type) {
         return EntityTypes1_16_2.getTypeFromId(type);

common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/rewriter/EntityPacketRewriter1_17.java

@@ -188,11 +188,6 @@ protected void registerRewrites() {
         filter().type(EntityTypes1_17.SHULKER).removeIndex(17);
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(int type) {
         return EntityTypes1_17.getTypeFromId(type);

common/src/main/java/com/viaversion/viaversion/protocols/v1_18_2to1_19/rewriter/EntityPacketRewriter1_19.java

@@ -299,11 +299,6 @@ protected void registerRewrites() {
         filter().type(EntityTypes1_19.CAT).index(19).mapDataType(typeId -> Types1_19.ENTITY_DATA_TYPES.catVariantType);
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(final int type) {
         return EntityTypes1_19.getTypeFromId(type);

common/src/main/java/com/viaversion/viaversion/protocols/v1_19_1to1_19_3/rewriter/EntityPacketRewriter1_19_3.java

@@ -169,11 +169,6 @@ protected void registerRewrites() {
         });
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(final int type) {
         return EntityTypes1_19_3.getTypeFromId(type);

common/src/main/java/com/viaversion/viaversion/protocols/v1_19_3to1_19_4/rewriter/EntityPacketRewriter1_19_4.java

@@ -236,11 +236,6 @@ protected void registerRewrites() {
         filter().type(EntityTypes1_19_4.ABSTRACT_HORSE).removeIndex(18); // Owner UUID
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(final int type) {
         return EntityTypes1_19_4.getTypeFromId(type);

common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/rewriter/EntityPacketRewriter1_20_3.java

@@ -135,11 +135,6 @@ protected void registerRewrites() {
         registerBlockStateHandler(EntityTypes1_20_3.ABSTRACT_MINECART, 11);
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(final int type) {
         return EntityTypes1_20_3.getTypeFromId(type);

common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java

@@ -557,11 +557,6 @@ private void addColor(@Nullable final EntityData particleMeta, final int color)
         }
     }
 
-    @Override
-    public void onMappingDataLoaded() {
-        mapTypes();
-    }
-
     @Override
     public EntityType typeFromId(final int type) {
         return EntityTypes1_20_5.getTypeFromId(type);