From 68b8481de15fd22d10a3649ffad8173c3543692b Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 13 Nov 2024 16:20:14 +0100
Subject: [PATCH] 24w46a

---
 .../Protocol1_21_4To1_21_2.java               |   4 ++--
 .../rewriter/EntityPacketRewriter1_21_4.java  |  17 +++++++++++------
 .../data/mappings-1.21.4to1.21.2.nbt          | Bin 1893 -> 2733 bytes
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/Protocol1_21_4To1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/Protocol1_21_4To1_21_2.java
index 3ae59ecd..9669ff3a 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/Protocol1_21_4To1_21_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/Protocol1_21_4To1_21_2.java
@@ -27,7 +27,7 @@ import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.rewriter.EntityPacke
 import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.rewriter.ParticleRewriter1_21_4;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Particle;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_2;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
 import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
 import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
 import com.viaversion.viaversion.api.type.Types;
@@ -161,7 +161,7 @@ public final class Protocol1_21_4To1_21_2 extends BackwardsProtocol<ClientboundP
 
     @Override
     public void init(final UserConnection user) {
-        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_21_2.PLAYER));
+        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_21_4.PLAYER));
     }
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/rewriter/EntityPacketRewriter1_21_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/rewriter/EntityPacketRewriter1_21_4.java
index 592cb767..ae272499 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/rewriter/EntityPacketRewriter1_21_4.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/rewriter/EntityPacketRewriter1_21_4.java
@@ -24,7 +24,7 @@ import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.Protocol1_21_4To1_21
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_2;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.Types1_21_2;
@@ -45,7 +45,7 @@ public final class EntityPacketRewriter1_21_4 extends EntityRewriter<Clientbound
 
     @Override
     public void registerPackets() {
-        registerTrackerWithData1_19(ClientboundPackets1_21_2.ADD_ENTITY, EntityTypes1_21_2.FALLING_BLOCK);
+        registerTrackerWithData1_19(ClientboundPackets1_21_2.ADD_ENTITY, EntityTypes1_21_4.FALLING_BLOCK);
         registerSetEntityData(ClientboundPackets1_21_2.SET_ENTITY_DATA, Types1_21_4.ENTITY_DATA_LIST, Types1_21_2.ENTITY_DATA_LIST);
         registerRemoveEntities(ClientboundPackets1_21_2.REMOVE_ENTITIES);
 
@@ -157,10 +157,10 @@ public final class EntityPacketRewriter1_21_4 extends EntityRewriter<Clientbound
             Types1_21_2.ENTITY_DATA_TYPES.componentType,
             Types1_21_2.ENTITY_DATA_TYPES.optionalComponentType
         );
-        registerBlockStateHandler(EntityTypes1_21_2.ABSTRACT_MINECART, 11);
+        registerBlockStateHandler(EntityTypes1_21_4.ABSTRACT_MINECART, 11);
 
-        filter().type(EntityTypes1_21_2.CREAKING_TRANSIENT).removeIndex(18); // Is tearing down
-        filter().type(EntityTypes1_21_2.SALMON).index(17).handler((event, data) -> {
+        filter().type(EntityTypes1_21_4.CREAKING).removeIndex(18); // Is tearing down
+        filter().type(EntityTypes1_21_4.SALMON).index(17).handler((event, data) -> {
             final int typeId = data.value();
             final String type = switch (typeId) {
                 case 0 -> "small";
@@ -171,8 +171,13 @@ public final class EntityPacketRewriter1_21_4 extends EntityRewriter<Clientbound
         });
     }
 
+    @Override
+    public void onMappingDataLoaded() {
+        mapTypes();
+    }
+
     @Override
     public EntityType typeFromId(final int type) {
-        return EntityTypes1_21_2.getTypeFromId(type);
+        return EntityTypes1_21_4.getTypeFromId(type);
     }
 }
diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.21.4to1.21.2.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.21.4to1.21.2.nbt
index cc1dcdbc917ccc25d0e63cb1ac5aa6fb3fcb91c6..cb10a95a1e032eb141d697f4ee0eab351caf0cf2 100644
GIT binary patch
delta 846
zcmc)I*-n!|6u|NGwVy(2LWD%F3MDZi;SMA5h6@VHDvN-M-~!ba{FJ5IqR3Vd5EN0$
z2wGP*McEVzhzPs`nxJrRd<^(ErqAFczvRqJa^}p*`4csFWYBKeJtQWFS40B-yi{MB
zh}DjCWZ)!DAro21Mh<e3httSM0SZxsGblz0N^utFa2{p2fO1seA}--Fu88=ol>}9A
z;3}@c2^XqSgX=JG12<8NI@F^9Zrs9cc);(hjktrmXu>@-qXn&KL%aCI>LchtC+?#Q
z-RQvs^r8<B@d*8Ri~&5sQw+k7At*e<Fh=kkFA%^>yuxd|!Q0T|?=XrnjAH_mc#jX5
z!bg0<G-fc1In3iTzF+~12x1A#Six7U;v3fR9qZV@iA|BXE&RYwk@%xX60y-<8||&#
z#xMNF4wK`h-x5&AwG<Vt+f;&n_<uOCNA0P>zuLHF@r36&Mk#YnbhyTtJ(h^pq5P&;
zbx==K$$CU)q^sU*cnz1wES5Tl+wF3e8qJKFjA&vqoSIp5&%cA=a9WMq_;A+H#uiM`
HkD2!Y$e5P_

delta 380
zcmXxgJxfAy6oBz_eY>P2ggAuv5)BOvYC%HTA|fFo5fLI0Q6V8A6>^D);C==555Bdv
zH#sylI5apkG&D3gL^udaI5ac_Jq->&IMX=~=OH-oR}$W~PaMaVh^$vLn|4CPNFs$T
zq>(`u+t|S__K-s!`#8WMj&OnkPEo`eN;t<Q%HW`Jg=^g4R>Z7|M9mt5!Y76z3t>b=
zN_8~QM2lqW;y+nEI@WBF&=b0NMh`D|#T(wy#|H*rYiNuKzVU-!5;V9mgIUZWh<TV;
u#1fW4m9dH#w2jV}>t6F((?<r>ohQu(cYN9zP$N&O=5(nQUGLa>#Q6tJZa;?r