From 5bd87867377b5acbf7a76d75513230a45083c18d Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sun, 5 May 2024 12:22:17 +0200
Subject: [PATCH] Update entity mapping usage

---
 .../api/rewriters/EntityRewriterBase.java     |  23 ------------------
 .../packets/EntityPackets1_14.java            |  23 ++++++++++--------
 .../packets/EntityPackets1_16.java            |  19 ++++++++-------
 .../packets/EntityPackets1_16_2.java          |  11 ++++++---
 .../packets/EntityPackets1_17.java            |  18 ++++++++------
 .../data/mappings-1.14to1.13.2.nbt            | Bin 15127 -> 15311 bytes
 .../viabackwards/data/mappings-1.15to1.14.nbt | Bin 5293 -> 5373 bytes
 .../data/mappings-1.16.2to1.16.nbt            | Bin 1087 -> 1159 bytes
 .../viabackwards/data/mappings-1.16to1.15.nbt | Bin 59760 -> 60099 bytes
 .../data/mappings-1.17to1.16.2.nbt            | Bin 22976 -> 23104 bytes
 10 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java
index 58795978..a3f2b334 100644
--- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java
+++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java
@@ -23,7 +23,6 @@ import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.entities.storage.EntityData;
 import com.viaversion.viabackwards.api.entities.storage.WrappedMetadata;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.data.Int2IntMapMappings;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
 import com.viaversion.viaversion.api.data.entity.TrackedEntity;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
@@ -163,28 +162,6 @@ public abstract class EntityRewriterBase<C extends ClientboundPacketType, T exte
         return data;
     }
 
-    /**
-     * Maps entity ids based on the enum constant's names.
-     *
-     * @param oldTypes     entity types of the higher version
-     * @param newTypeClass entity types enum class of the lower version
-     * @param <E>          new enum type
-     */
-    @Override
-    public <E extends Enum<E> & EntityType> void mapTypes(EntityType[] oldTypes, Class<E> newTypeClass) {
-        if (typeMappings == null) {
-            typeMappings = Int2IntMapMappings.of();
-        }
-        for (EntityType oldType : oldTypes) {
-            try {
-                E newType = Enum.valueOf(newTypeClass, oldType.name());
-                typeMappings.setNewId(oldType.getId(), newType.getId());
-            } catch (IllegalArgumentException ignored) {
-                // Don't warn
-            }
-        }
-    }
-
     public void registerMetaTypeHandler(
         @Nullable MetaType itemType,
         @Nullable MetaType blockStateType,
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
index ffce82c1..2a256419 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
@@ -331,16 +331,6 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
 
     @Override
     protected void registerRewrites() {
-        mapTypes(EntityTypes1_14.values(), EntityTypes1_13.EntityType.class);
-
-        mapEntityTypeWithData(EntityTypes1_14.CAT, EntityTypes1_14.OCELOT).jsonName();
-        mapEntityTypeWithData(EntityTypes1_14.TRADER_LLAMA, EntityTypes1_14.LLAMA).jsonName();
-        mapEntityTypeWithData(EntityTypes1_14.FOX, EntityTypes1_14.WOLF).jsonName();
-        mapEntityTypeWithData(EntityTypes1_14.PANDA, EntityTypes1_14.POLAR_BEAR).jsonName();
-        mapEntityTypeWithData(EntityTypes1_14.PILLAGER, EntityTypes1_14.VILLAGER).jsonName();
-        mapEntityTypeWithData(EntityTypes1_14.WANDERING_TRADER, EntityTypes1_14.VILLAGER).jsonName();
-        mapEntityTypeWithData(EntityTypes1_14.RAVAGER, EntityTypes1_14.COW).jsonName();
-
         filter().handler((event, meta) -> {
             int typeId = meta.metaType().typeId();
             if (typeId <= 15) {
@@ -499,6 +489,19 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
         }
     }
 
+    @Override
+    public void onMappingDataLoaded() {
+        mapTypes();
+
+        mapEntityTypeWithData(EntityTypes1_14.CAT, EntityTypes1_14.OCELOT).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.TRADER_LLAMA, EntityTypes1_14.LLAMA).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.FOX, EntityTypes1_14.WOLF).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.PANDA, EntityTypes1_14.POLAR_BEAR).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.PILLAGER, EntityTypes1_14.VILLAGER).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.WANDERING_TRADER, EntityTypes1_14.VILLAGER).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.RAVAGER, EntityTypes1_14.COW).jsonName();
+    }
+
     @Override
     public EntityType typeFromId(int typeId) {
         return EntityTypes1_14.getTypeFromId(typeId);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java
index d8a51e67..95cb1534 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java
@@ -26,7 +26,6 @@ import com.viaversion.viaversion.api.data.entity.StoredEntityData;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
@@ -253,14 +252,6 @@ public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Pr
             }
         });
 
-        mapEntityType(EntityTypes1_16.ZOMBIFIED_PIGLIN, EntityTypes1_15.ZOMBIE_PIGMAN);
-        mapTypes(EntityTypes1_16.values(), EntityTypes1_15.class);
-
-        mapEntityTypeWithData(EntityTypes1_16.HOGLIN, EntityTypes1_16.COW).jsonName();
-        mapEntityTypeWithData(EntityTypes1_16.ZOGLIN, EntityTypes1_16.COW).jsonName();
-        mapEntityTypeWithData(EntityTypes1_16.PIGLIN, EntityTypes1_16.ZOMBIFIED_PIGLIN).jsonName();
-        mapEntityTypeWithData(EntityTypes1_16.STRIDER, EntityTypes1_16.MAGMA_CUBE).jsonName();
-
         filter().type(EntityTypes1_16.ZOGLIN).cancel(16);
         filter().type(EntityTypes1_16.HOGLIN).cancel(15);
 
@@ -308,6 +299,16 @@ public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Pr
         });
     }
 
+    @Override
+    public void onMappingDataLoaded() {
+        mapTypes();
+
+        mapEntityTypeWithData(EntityTypes1_16.HOGLIN, EntityTypes1_16.COW).jsonName();
+        mapEntityTypeWithData(EntityTypes1_16.ZOGLIN, EntityTypes1_16.COW).jsonName();
+        mapEntityTypeWithData(EntityTypes1_16.PIGLIN, EntityTypes1_16.ZOMBIFIED_PIGLIN).jsonName();
+        mapEntityTypeWithData(EntityTypes1_16.STRIDER, EntityTypes1_16.MAGMA_CUBE).jsonName();
+    }
+
     @Override
     public EntityType typeFromId(int typeId) {
         return EntityTypes1_16.getTypeFromId(typeId);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java
index 58574818..6915eaf7 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java
@@ -23,7 +23,6 @@ import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_16_1to1_16_2.Protocol1_16_1To1_16_2;
 import com.viaversion.viabackwards.protocol.protocol1_16_1to1_16_2.storage.BiomeStorage;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -124,13 +123,17 @@ public class EntityPackets1_16_2 extends EntityRewriter<ClientboundPackets1_16_2
         registerMetaTypeHandler(Types1_16.META_TYPES.itemType, Types1_16.META_TYPES.blockStateType, null,
             Types1_16.META_TYPES.particleType, Types1_16.META_TYPES.componentType, Types1_16.META_TYPES.optionalComponentType);
 
-        mapTypes(EntityTypes1_16_2.values(), EntityTypes1_16.class);
-        mapEntityTypeWithData(EntityTypes1_16_2.PIGLIN_BRUTE, EntityTypes1_16_2.PIGLIN).jsonName();
-
         filter().type(EntityTypes1_16_2.ABSTRACT_PIGLIN).index(15).toIndex(16);
         filter().type(EntityTypes1_16_2.ABSTRACT_PIGLIN).index(16).toIndex(15);
     }
 
+    @Override
+    public void onMappingDataLoaded() {
+        mapTypes();
+
+        mapEntityTypeWithData(EntityTypes1_16_2.PIGLIN_BRUTE, EntityTypes1_16_2.PIGLIN).jsonName();
+    }
+
     @Override
     public EntityType typeFromId(int typeId) {
         return EntityTypes1_16_2.getTypeFromId(typeId);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
index d51a9f10..f58b9b58 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
@@ -22,7 +22,6 @@ import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4To1_17;
 import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_17;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
@@ -178,7 +177,6 @@ public final class EntityPackets1_17 extends EntityRewriter<ClientboundPackets1_
         registerMetaTypeHandler(Types1_16.META_TYPES.itemType, Types1_16.META_TYPES.blockStateType, null, null,
             Types1_16.META_TYPES.componentType, Types1_16.META_TYPES.optionalComponentType);
 
-        mapTypes(EntityTypes1_17.values(), EntityTypes1_16_2.class);
         filter().type(EntityTypes1_17.AXOLOTL).cancel(17);
         filter().type(EntityTypes1_17.AXOLOTL).cancel(18);
         filter().type(EntityTypes1_17.AXOLOTL).cancel(19);
@@ -187,17 +185,21 @@ public final class EntityPackets1_17 extends EntityRewriter<ClientboundPackets1_
 
         filter().type(EntityTypes1_17.GOAT).cancel(17);
 
-        mapEntityTypeWithData(EntityTypes1_17.AXOLOTL, EntityTypes1_17.TROPICAL_FISH).jsonName();
-        mapEntityTypeWithData(EntityTypes1_17.GOAT, EntityTypes1_17.SHEEP).jsonName();
-
-        mapEntityTypeWithData(EntityTypes1_17.GLOW_SQUID, EntityTypes1_17.SQUID).jsonName();
-        mapEntityTypeWithData(EntityTypes1_17.GLOW_ITEM_FRAME, EntityTypes1_17.ITEM_FRAME);
-
         filter().type(EntityTypes1_17.SHULKER).addIndex(17); // TODO Handle attachment pos?
 
         filter().removeIndex(7); // Ticks frozen
     }
 
+    @Override
+    public void onMappingDataLoaded() {
+        mapTypes();
+
+        mapEntityTypeWithData(EntityTypes1_17.AXOLOTL, EntityTypes1_17.TROPICAL_FISH).jsonName();
+        mapEntityTypeWithData(EntityTypes1_17.GOAT, EntityTypes1_17.SHEEP).jsonName();
+        mapEntityTypeWithData(EntityTypes1_17.GLOW_SQUID, EntityTypes1_17.SQUID).jsonName();
+        mapEntityTypeWithData(EntityTypes1_17.GLOW_ITEM_FRAME, EntityTypes1_17.ITEM_FRAME);
+    }
+
     @Override
     public EntityType typeFromId(int typeId) {
         return EntityTypes1_17.getTypeFromId(typeId);
diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.14to1.13.2.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.14to1.13.2.nbt
index 75da5a3e3f2cc61aa0aead956eaf20c91cd6123e..9d05591a2a2353dcaf50dee7f20efce69b3aaff3 100644
GIT binary patch
delta 195
zcmXZU%?bfg7=Yn#X2f7&Hw!FJ*-FecD56aHX^Mt9>MSrdC(6cUxDDk(T#Os=4i-;+
zKlR?vugjwo+<bks#u}Y_QadDBrqjq=wTNsSaZT!YQp$gaeO=td@@b%q3R-BRj{!y)
qV}=L|EV05CJ0kYPP(->S;kPtrX(B`q3PY?h!St`FRuMl{@KztLAQ}Du

delta 12
TcmX?KKD}&%y4dFXVjolhDL)1M

diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.15to1.14.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.15to1.14.nbt
index bdf82eac52049fc1bd8c2523006b1e97334f993a..b62aa457c69e7d4bba525e0fc16c7fe12283c35b 100644
GIT binary patch
delta 90
zcmZ3h`B!tp7Cv8&)Vz|+lFZa%W(Ka@#Dap<l;F&&R0alyG)4xd%oIju29{!oKsq-A
dQ(_5Fh6#vSfS461P?8T7Fb4^4-pKcd6#zSm6Ey$;

delta 12
TcmeyXxmI(-7QW3a{6AR%CQ$`5

diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.16.2to1.16.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.16.2to1.16.nbt
index 512fb40d6bb6904694ec926307d3cd4979cec757..c504e448aef2d7382c9597d1904889b1d2c8778c 100644
GIT binary patch
delta 82
zcmdnb(ayQSlgX7MHLoPIBr~;`nSm=ev7jI|B{;Jxm4SgFn~{MjGlh|vfu$HCki*Tu
Ylvo0kVFY4ZAg3fB%CXt(#`KdB0AxE6&;S4c

delta 12
TcmZqY+|RMWlWFrrrf-Y@9l`{V

diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.16to1.15.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.16to1.15.nbt
index ebe0d1c8d2b92ee5bd90f088e5822e995e8e5907..a1d2e1b751aed82e5ae1997fba0e55b38528c968 100644
GIT binary patch
delta 343
zcmXBO&q@M89Ki8$w?nvSp30ksh2#sEn?)vg3IvT*q?X-wszEjv+|yosfxuS@_U^^o
z9)sSaNAUZ@!)KU3%*^-y*WUfvKb!6PSbrrZF?waIV&uoM4#y_dN~w>6vP@X8)zRv(
zv2c{-C!Ew!LK!DG#Tlxo;~W>b#1&d_af2>yaff@XdkhcgV}voLnBxVn2q8(IFjOQ<
zCQ=~<QX&;nASF`appIuWAP+PVpp6dX6IWK(OeE_Kk|xPRJmLux%pi|?kjpyz-sX-|
QNtaPz-i;2uY>>BVduK5!wg3PC

delta 19
bcmX?nmHERZ<_-P(HXq-AoO|=i(^B#PbAAfR

diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.17to1.16.2.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.17to1.16.2.nbt
index e5f490fbf84c8810a24d50d95fe16b96cc5ce282..742748c86eefc9c587d661a7f63aec20b511bffb 100644
GIT binary patch
delta 142
zcmX@Gneo6D#tq9=>p4>MN-|3_Q;V4yxN;K<3Q|*oGpkY=7#MOG8JIFt7?~MZiXj4p
z+zd>KB|sStAZ7+)79dstVnrZU0%Bz#HUwfLpu&=TAOoZ@3W!09)qpq<h+TnL{yz`^
NX<Y`c&C67!OaPOV8R`H4

delta 14
WcmX@Gh4H{<#tq9=H>;~jng9SY=LNF>