diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index 232eb7c00c..ce0bb7e53b 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -2,6 +2,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	FIELD field_16771 sessionId Ljava/util/UUID;
 	FIELD field_19144 chunkLoadDistance I
 	FIELD field_24321 worldProperties Lnet/minecraft/class_638$class_5271;
+	FIELD field_25063 dimensionTracker Lnet/minecraft/class_5318;
 	FIELD field_3687 random Ljava/util/Random;
 	FIELD field_3688 recipeManager Lnet/minecraft/class_1863;
 	FIELD field_3689 connection Lnet/minecraft/class_2535;
diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping
index 3717041267..57f571c194 100644
--- a/mappings/net/minecraft/network/PacketByteBuf.mapping
+++ b/mappings/net/minecraft/network/PacketByteBuf.mapping
@@ -39,3 +39,5 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 	METHOD method_17814 readBlockHitResult ()Lnet/minecraft/class_3965;
 	METHOD method_19456 readChunkSectionPos ()Lnet/minecraft/class_4076;
 	METHOD method_19772 readString ()Ljava/lang/String;
+	METHOD method_29171 decode (Lcom/mojang/serialization/Codec;)Ljava/lang/Object;
+	METHOD method_29172 encode (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)V
diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
index 660983b129..9c367acd15 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
@@ -4,18 +4,26 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	FIELD field_12280 playerEntityId I
 	FIELD field_12281 hardcore Z
 	FIELD field_12282 gameMode Lnet/minecraft/class_1934;
-	FIELD field_12284 dimension Lnet/minecraft/class_5318$class_5319;
+	FIELD field_12284 dimensionTracker Lnet/minecraft/class_5318$class_5319;
 	FIELD field_19145 chunkLoadDistance I
 	FIELD field_20665 seed J
 	FIELD field_20666 flatWorld Z
 	FIELD field_24618 reducedDebugInfo Z
 	FIELD field_24619 showDeathScreen Z
+	FIELD field_25134 dimensionId Lnet/minecraft/class_2960;
 	METHOD <init> (ILnet/minecraft/class_1934;JZLnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_2960;IIZZZZ)V
 		ARG 1 playerEntityId
 		ARG 2 gameMode
 		ARG 3 seed
 		ARG 5 hardcore
-		ARG 6 dimensionType
+		ARG 6 dimensionTracker
+		ARG 7 dimensionId
+		ARG 8 maxPlayers
+		ARG 9 chunkLoadDistance
+		ARG 10 reducedDebugInfo
+		ARG 11 showDeathScreen
+		ARG 12 debugWorld
+		ARG 13 flatWorld
 	METHOD method_11561 getGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_11562 hasReducedDebugInfo ()Z
 	METHOD method_11564 getEntityId ()I
@@ -26,3 +34,4 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	METHOD method_22424 showsDeathScreen ()Z
 	METHOD method_28118 isHardcore ()Z
 	METHOD method_28119 isDebugWorld ()Z
+	METHOD method_29176 getDimensionId ()Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/world/dimension/DimensionTracker.mapping b/mappings/net/minecraft/world/dimension/DimensionTracker.mapping
new file mode 100644
index 0000000000..430e0a42ce
--- /dev/null
+++ b/mappings/net/minecraft/world/dimension/DimensionTracker.mapping
@@ -0,0 +1,9 @@
+CLASS net/minecraft/class_5318 net/minecraft/world/dimension/DimensionTracker
+	METHOD method_29116 getRegistry ()Lnet/minecraft/class_2378;
+	METHOD method_29117 create ()Lnet/minecraft/class_5318$class_5319;
+	CLASS class_5319 Modifiable
+		FIELD field_25119 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_25120 registry Lnet/minecraft/class_2370;
+		METHOD <init> (Lnet/minecraft/class_2370;)V
+			ARG 1 registry
+		METHOD method_29119 add (Lnet/minecraft/class_5321;Lnet/minecraft/class_2874;)V
diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping
index e1a0ac4390..63c293dfae 100644
--- a/mappings/net/minecraft/world/dimension/DimensionType.mapping
+++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping
@@ -44,6 +44,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
 	METHOD method_27998 hasCeiling ()Z
 	METHOD method_27999 isUltrawarm ()Z
 	METHOD method_28514 getDefaultDimensionType ()Lnet/minecraft/class_2874;
+	METHOD method_28523 createTracker (Lnet/minecraft/class_5318$class_5319;)Lnet/minecraft/class_5318$class_5319;
 	METHOD method_28537 isNatural ()Z
 	METHOD method_28539 isShrunk ()Z
 	METHOD method_28540 hasEnderDragonFight ()Z