diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index e73c2594f3..31e62aae9a 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -86,7 +86,7 @@ CLASS czr net/minecraft/client/network/ClientPlayNetworkHandler
 	METHOD a onPlaySound (Lmp;)V
 	METHOD a onPlayerListHeader (Lmr;)V
 	METHOD a onItemPickupAnimation (Lmt;)V
-	METHOD a onEntityTeleport (Lmu;)V
+	METHOD a onEntityPosition (Lmu;)V
 	METHOD a onAdvancements (Lmv;)V
 	METHOD a onEntityAttributes (Lmw;)V
 	METHOD a onEntityPotionEffect (Lmx;)V
diff --git a/mappings/net/minecraft/client/network/packet/EntityTeleportClientPacket.mapping b/mappings/net/minecraft/client/network/packet/EntityPositionClientPacket.mapping
similarity index 86%
rename from mappings/net/minecraft/client/network/packet/EntityTeleportClientPacket.mapping
rename to mappings/net/minecraft/client/network/packet/EntityPositionClientPacket.mapping
index ec0e2517aa..c942333528 100644
--- a/mappings/net/minecraft/client/network/packet/EntityTeleportClientPacket.mapping
+++ b/mappings/net/minecraft/client/network/packet/EntityPositionClientPacket.mapping
@@ -1,4 +1,4 @@
-CLASS mu net/minecraft/client/network/packet/EntityTeleportClientPacket
+CLASS mu net/minecraft/client/network/packet/EntityPositionClientPacket
 	FIELD a id I
 	FIELD b x D
 	FIELD c y D
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 18277d2929..ce81ec51a7 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -153,7 +153,7 @@ CLASS agk net/minecraft/entity/Entity
 	METHOD aA getLightmapCoordinates ()I
 	METHOD aD doesCollide ()Z
 	METHOD aF shouldSetPositionOnLoad ()Z
-	METHOD aG getId ()Ljava/lang/String;
+	METHOD aG getSavedEntityId ()Ljava/lang/String;
 	METHOD aH isValid ()Z
 	METHOD aI isInsideWall ()Z
 	METHOD aK getHeightOffset ()D
@@ -242,6 +242,7 @@ CLASS agk net/minecraft/entity/Entity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD c squaredDistanceTo (Let;)D
+	METHOD c saveSelfToTag (Lhq;)Z
 	METHOD c setSilent (Z)V
 	METHOD d getName ()Ljb;
 	METHOD d squaredDistanceTo (DDD)D
@@ -249,6 +250,7 @@ CLASS agk net/minecraft/entity/Entity
 	METHOD d getVectorFromRotation (FF)Lckz;
 		ARG 1 pitch
 	METHOD d squaredDistanceToCenter (Let;)D
+	METHOD d saveToTag (Lhq;)Z
 	METHOD d setUnaffectedByGravity (Z)V
 	METHOD e hasCustomName ()Z
 	METHOD e distanceTo (DDD)D
diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping
index b6fd8c2f22..9a57c9c906 100644
--- a/mappings/net/minecraft/entity/EntityType.mapping
+++ b/mappings/net/minecraft/entity/EntityType.mapping
@@ -1,6 +1,14 @@
 CLASS ago net/minecraft/entity/EntityType
 	CLASS ago$a Builder
+		FIELD a entityClass Ljava/lang/Class;
+		FIELD b function Ljava/util/function/Function;
+		FIELD c saveable Z
+		FIELD d summonable Z
+		METHOD a disableSummon ()Lago$a;
+		METHOD a create (Ljava/lang/Class;)Lago$a;
+		METHOD a create (Ljava/lang/Class;Ljava/util/function/Function;)Lago$a;
 		METHOD a build (Ljava/lang/String;)Lago;
+		METHOD b disableSaving ()Lago$a;
 	FIELD A FIREWORK_ROCKET Lago;
 	FIELD B GHAST Lago;
 	FIELD C GIANT Lago;
@@ -52,6 +60,8 @@ CLASS ago net/minecraft/entity/EntityType
 	FIELD aV LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD aW entityClass Ljava/lang/Class;
 	FIELD aX factory Ljava/util/function/Function;
+	FIELD aY saveable Z
+	FIELD aZ summonable Z
 	FIELD aa PARROT Lago;
 	FIELD ab PIG Lago;
 	FIELD ac PUFFERFISH Lago;
@@ -81,6 +91,8 @@ CLASS ago net/minecraft/entity/EntityType
 	FIELD b ARMOR_STAND Lago;
 	FIELD ba translationKey Ljava/lang/String;
 	FIELD bb textComponent Ljb;
+	FIELD bc lootTableId Lpz;
+	FIELD bd dataFixerType Lcom/mojang/datafixers/types/Type;
 	FIELD c ARROW Lago;
 	FIELD d BAT Lago;
 	FIELD e BLAZE Lago;
@@ -105,10 +117,29 @@ CLASS ago net/minecraft/entity/EntityType
 	FIELD x EXPERIENCE_ORB Lago;
 	FIELD y EYE_OF_ENDER Lago;
 	FIELD z FALLING_BLOCK Lago;
+	METHOD <init> (Ljava/lang/Class;Ljava/util/function/Function;ZZLcom/mojang/datafixers/types/Type;)V
+		ARG 1 entityClass
+		ARG 2 factory
+		ARG 3 saveable
+		ARG 4 summonable
+		ARG 5 dataFixerType
+	METHOD a isSaveable ()Z
+	METHOD a createInstanceFromId (ILbas;)Lagk;
 	METHOD a getId (Lago;)Lpz;
-	METHOD a newInstance (Lbas;)Lagk;
+	METHOD a create (Lbas;)Lagk;
+	METHOD a newInstance (Lbas;Lago;)Lagk;
+		ARG 0 world
+		ARG 1 type
+	METHOD a loadFromEntityTag (Lbas;Laql;Lagk;Lhq;)V
+	METHOD a spawnFromItemStack (Lbas;Lavu;Laql;Let;Lagw;ZZ)Lagk;
+	METHOD a spawn (Lbas;Lhq;Ljb;Laql;Let;Lagw;ZZ)Lagk;
+	METHOD a createInstance (Lbas;Lpz;)Lagk;
+	METHOD a fromTag (Lhq;Lbas;)Lagk;
 	METHOD a get (Ljava/lang/String;)Lago;
 	METHOD a register (Ljava/lang/String;Lago$a;)Lago;
+	METHOD b isSummonable ()Z
+	METHOD b create (Lbas;Lhq;Ljb;Laql;Let;Lagw;ZZ)Lagk;
 	METHOD c getEntityClass ()Ljava/lang/Class;
 	METHOD d getTranslationKey ()Ljava/lang/String;
 	METHOD e getTextComponent ()Ljb;
+	METHOD f getLootTableId ()Lpz;
diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
index 2f7969d007..3969d8dfe9 100644
--- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
+++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping
@@ -69,7 +69,7 @@ CLASS js net/minecraft/network/listener/ClientPlayPacketListener
 	METHOD a onPlaySound (Lmp;)V
 	METHOD a onPlayerListHeader (Lmr;)V
 	METHOD a onItemPickupAnimation (Lmt;)V
-	METHOD a onEntityTeleport (Lmu;)V
+	METHOD a onEntityPosition (Lmu;)V
 	METHOD a onAdvancements (Lmv;)V
 	METHOD a onEntityAttributes (Lmw;)V
 	METHOD a onEntityPotionEffect (Lmx;)V