diff --git a/mappings/net/minecraft/client/font/FreeTypeUtil.mapping b/mappings/net/minecraft/client/font/FreeTypeUtil.mapping
index 8c5e1843ff..4268fff540 100644
--- a/mappings/net/minecraft/client/font/FreeTypeUtil.mapping
+++ b/mappings/net/minecraft/client/font/FreeTypeUtil.mapping
@@ -1,5 +1,7 @@
 CLASS net/minecraft/class_9111 net/minecraft/client/font/FreeTypeUtil
 	FIELD field_48394 freeType J
+	FIELD field_51483 LOCK Ljava/lang/Object;
+	FIELD field_51484 LOGGER Lorg/slf4j/Logger;
 	METHOD method_56143 initialize ()J
 	METHOD method_56144 getErrorMessage (I)Ljava/lang/String;
 		ARG 0 code
@@ -13,3 +15,6 @@ CLASS net/minecraft/class_9111 net/minecraft/client/font/FreeTypeUtil
 		ARG 1 x
 		ARG 2 y
 	METHOD method_56148 release ()V
+	METHOD method_59837 checkFatalError (ILjava/lang/String;)V
+		ARG 0 code
+		ARG 1 description
diff --git a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping
index e621b35688..167f0d59a0 100644
--- a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping
@@ -7,4 +7,6 @@ CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOption
 		ARG 2 gameOptions
 		ARG 3 title
 	METHOD method_31387 initFooter ()V
+	METHOD method_57731 (Lnet/minecraft/class_4185;)V
+		ARG 1 button
 	METHOD method_57732 initHeader ()V
diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping
index 867383ef99..21d721b551 100644
--- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping
@@ -116,6 +116,8 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 		ARG 1 resourcePackManager
 	METHOD method_49629 (Ljava/util/function/Consumer;Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object;
 		ARG 3 throwable
+	METHOD method_59841 (Lnet/minecraft/class_7193;)Lnet/minecraft/class_7193;
+		ARG 0 generatorOptionsHolder
 	CLASS class_7749 WorldCreationSettings
 	CLASS class_8093 GameTab
 		FIELD field_42175 GAME_TAB_TITLE_TEXT Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping
index a0fe0436bf..da0f57a9da 100644
--- a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping
@@ -9,6 +9,7 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH
 	FIELD field_45595 queuedPackets Ljava/util/List;
 	FIELD field_45944 LOGGER Lorg/slf4j/Logger;
 	FIELD field_48399 serverCookies Ljava/util/Map;
+	FIELD field_51516 transferring Z
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
 		ARG 1 client
 		ARG 2 connection
diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index df4d66f9cc..fa859bfa90 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -139,6 +139,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	METHOD method_54133 startWorldLoading (Lnet/minecraft/class_746;Lnet/minecraft/class_638;Lnet/minecraft/class_434$class_9678;)V
 		ARG 1 player
 		ARG 2 world
+		ARG 3 worldEntryReason
 	METHOD method_54134 clearWorld ()V
 	METHOD method_55823 getScoreboard ()Lnet/minecraft/class_269;
 	METHOD method_59754 getBrewingRecipeRegistry ()Lnet/minecraft/class_1845;
diff --git a/mappings/net/minecraft/client/option/SimpleOption.mapping b/mappings/net/minecraft/client/option/SimpleOption.mapping
index f840722692..d1459513b4 100644
--- a/mappings/net/minecraft/client/option/SimpleOption.mapping
+++ b/mappings/net/minecraft/client/option/SimpleOption.mapping
@@ -190,7 +190,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption
 		FIELD field_37874 tooltipFactory Lnet/minecraft/class_7172$class_7277;
 		FIELD field_41334 changeCallback Ljava/util/function/Consumer;
 		FIELD field_51513 timeToApply Ljava/lang/Long;
-		FIELD field_51514 applyValueImmediately Z
+		FIELD field_51514 shouldApplyImmediately Z
 		METHOD <init> (Lnet/minecraft/class_315;IIIILnet/minecraft/class_7172;Lnet/minecraft/class_7172$class_7176;Lnet/minecraft/class_7172$class_7277;Ljava/util/function/Consumer;Z)V
 			ARG 1 options
 			ARG 2 x
@@ -201,7 +201,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption
 			ARG 7 callbacks
 			ARG 8 tooltipFactory
 			ARG 9 changeCallback
-			ARG 10 applyValueImmediately
+			ARG 10 shouldApplyImmediately
 		METHOD method_59868 applyPendingValue ()V
 	CLASS class_7176 SliderCallbacks
 		COMMENT A set of callbacks for slider options.
diff --git a/mappings/net/minecraft/component/DataComponentType.mapping b/mappings/net/minecraft/component/DataComponentType.mapping
index 74ec0a7827..9725f35b4c 100644
--- a/mappings/net/minecraft/component/DataComponentType.mapping
+++ b/mappings/net/minecraft/component/DataComponentType.mapping
@@ -15,13 +15,13 @@ CLASS net/minecraft/class_9331 net/minecraft/component/DataComponentType
 	CLASS class_9332 Builder
 		FIELD field_49602 codec Lcom/mojang/serialization/Codec;
 		FIELD field_49603 packetCodec Lnet/minecraft/class_9139;
-		FIELD field_51517 cacheCodec Z
+		FIELD field_51517 cache Z
 		METHOD method_57880 build ()Lnet/minecraft/class_9331;
 		METHOD method_57881 codec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9331$class_9332;
 			ARG 1 codec
 		METHOD method_57882 packetCodec (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9331$class_9332;
 			ARG 1 packetCodec
-		METHOD method_59871 cacheCodec ()Lnet/minecraft/class_9331$class_9332;
+		METHOD method_59871 cache ()Lnet/minecraft/class_9331$class_9332;
 		CLASS class_9333 SimpleDataComponentType
 			FIELD field_49604 codec Lcom/mojang/serialization/Codec;
 			FIELD field_49605 packetCodec Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/component/DataComponentTypes.mapping b/mappings/net/minecraft/component/DataComponentTypes.mapping
index 16bd93d41a..883f894cea 100644
--- a/mappings/net/minecraft/component/DataComponentTypes.mapping
+++ b/mappings/net/minecraft/component/DataComponentTypes.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes
 	FIELD field_49627 DEFAULT_ITEM_COMPONENTS Lnet/minecraft/class_9323;
-	FIELD field_51518 CODEC_CACHE Lnet/minecraft/class_9684;
+	FIELD field_51518 CACHE Lnet/minecraft/class_9684;
 	METHOD method_57884 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
 		ARG 0 builder
 	METHOD method_57885 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
diff --git a/mappings/net/minecraft/entity/ProjectileDeflection.mapping b/mappings/net/minecraft/entity/ProjectileDeflection.mapping
index 4e7535f3c9..0a5018a57a 100644
--- a/mappings/net/minecraft/entity/ProjectileDeflection.mapping
+++ b/mappings/net/minecraft/entity/ProjectileDeflection.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_9109 net/minecraft/entity/ProjectileDeflection
 	FIELD field_48347 NONE Lnet/minecraft/class_9109;
 	FIELD field_48348 SIMPLE Lnet/minecraft/class_9109;
 	FIELD field_51509 REDIRECTED Lnet/minecraft/class_9109;
-	FIELD field_51510 MOMENTUM_REDIRECTED Lnet/minecraft/class_9109;
+	FIELD field_51510 TRANSFER_VELOCITY_DIRECTION Lnet/minecraft/class_9109;
 	METHOD deflect (Lnet/minecraft/class_1676;Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)V
 		ARG 1 projectile
 		ARG 2 hitEntity
diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping
index 29797ac0f6..d9e52163b5 100644
--- a/mappings/net/minecraft/nbt/NbtOps.mapping
+++ b/mappings/net/minecraft/nbt/NbtOps.mapping
@@ -83,6 +83,9 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps
 		ARG 1 map
 		ARG 2 key
 		ARG 3 value
+	METHOD mergeToMap (Ljava/lang/Object;Ljava/util/Map;)Lcom/mojang/serialization/DataResult;
+		ARG 1 nbt
+		ARG 2 map
 	METHOD method_10667 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520;
 		ARG 0 nbt
 	METHOD method_29147 (Ljava/util/List;Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V
@@ -109,6 +112,8 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps
 		METHOD get (Ljava/lang/String;)Ljava/lang/Object;
 			ARG 1 key
 	CLASS class_5320 MapBuilder
+		METHOD <init> (Lnet/minecraft/class_2509;)V
+			ARG 1 ops
 		METHOD append (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 key
 			ARG 2 value
diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping
index fd83ff986b..bf6b481462 100644
--- a/mappings/net/minecraft/network/ClientConnection.mapping
+++ b/mappings/net/minecraft/network/ClientConnection.mapping
@@ -119,6 +119,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
 	METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;ZLnet/minecraft/class_8762;)V
 		ARG 0 pipeline
 		ARG 1 side
+		ARG 2 local
 		ARG 3 packetSizeLogger
 	METHOD method_52271 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_2535;)Lio/netty/channel/ChannelFuture;
 		ARG 0 address
@@ -151,7 +152,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
 		ARG 3 connection
 	METHOD method_52909 getAddressAsString (Z)Ljava/lang/String;
 		ARG 1 logIps
-	METHOD method_52911 addValidator (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V
+	METHOD method_52911 addLocalValidator (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V
 		ARG 0 pipeline
 		ARG 1 side
 	METHOD method_52912 setInitialPacketListener (Lnet/minecraft/class_2547;)V
@@ -192,8 +193,13 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
 		ARG 0 sendingSide
 	METHOD method_56334 getInboundHandlerName (Z)Ljava/lang/String;
 		ARG 0 receivingSide
-	METHOD method_59852 (Lnet/minecraft/class_8762;Z)Lio/netty/channel/ChannelInboundHandler;
+	METHOD method_59851 syncUninterruptibly (Lio/netty/channel/ChannelFuture;)V
+		ARG 0 future
+	METHOD method_59852 getSplitter (Lnet/minecraft/class_8762;Z)Lio/netty/channel/ChannelInboundHandler;
 		ARG 0 packetSizeLogger
+		ARG 1 local
+	METHOD method_59853 getPrepender (Z)Lio/netty/channel/ChannelOutboundHandler;
+		ARG 0 local
 	CLASS 1
 		METHOD initChannel (Lio/netty/channel/Channel;)V
 			ARG 1 channel
diff --git a/mappings/net/minecraft/network/handler/NoopInboundHandler.mapping b/mappings/net/minecraft/network/handler/NoopInboundHandler.mapping
new file mode 100644
index 0000000000..44c19c667b
--- /dev/null
+++ b/mappings/net/minecraft/network/handler/NoopInboundHandler.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9681 net/minecraft/network/handler/NoopInboundHandler
diff --git a/mappings/net/minecraft/network/handler/NoopOutboundHandler.mapping b/mappings/net/minecraft/network/handler/NoopOutboundHandler.mapping
new file mode 100644
index 0000000000..8549a52ac2
--- /dev/null
+++ b/mappings/net/minecraft/network/handler/NoopOutboundHandler.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9682 net/minecraft/network/handler/NoopOutboundHandler
diff --git a/mappings/net/minecraft/network/handler/PacketSizeLogHandler.mapping b/mappings/net/minecraft/network/handler/PacketSizeLogHandler.mapping
new file mode 100644
index 0000000000..57e99b79a1
--- /dev/null
+++ b/mappings/net/minecraft/network/handler/PacketSizeLogHandler.mapping
@@ -0,0 +1,7 @@
+CLASS net/minecraft/class_9680 net/minecraft/network/handler/PacketSizeLogHandler
+	FIELD field_51500 logger Lnet/minecraft/class_8762;
+	METHOD <init> (Lnet/minecraft/class_8762;)V
+		ARG 1 logger
+	METHOD channelRead (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V
+		ARG 1 context
+		ARG 2 value
diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping
index cc29cf7b16..a8d59a7167 100644
--- a/mappings/net/minecraft/recipe/RecipeManager.mapping
+++ b/mappings/net/minecraft/recipe/RecipeManager.mapping
@@ -84,6 +84,7 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager
 			COMMENT the type of the desired recipe
 		ARG 2 id
 			COMMENT the ID of the desired recipe
+	METHOD method_59822 sortedValues ()Ljava/util/Collection;
 	METHOD method_8126 values ()Ljava/util/Collection;
 		COMMENT {@return all recipes in this manager}
 		COMMENT
diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping
index 4949c32ab8..60de925b9c 100644
--- a/mappings/net/minecraft/registry/RegistryOps.mapping
+++ b/mappings/net/minecraft/registry/RegistryOps.mapping
@@ -44,12 +44,12 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps
 	CLASS class_7863 RegistryInfoGetter
 		METHOD method_46623 getRegistryInfo (Lnet/minecraft/class_5321;)Ljava/util/Optional;
 			ARG 1 registryRef
-	CLASS class_9683 RegistryInfoLookup
-		FIELD field_51501 wrapperLookup Lnet/minecraft/class_7225$class_7874;
-		FIELD field_51502 registryInfos Ljava/util/Map;
+	CLASS class_9683 CachedRegistryInfoGetter
+		FIELD field_51501 registriesLookup Lnet/minecraft/class_7225$class_7874;
+		FIELD field_51502 cache Ljava/util/Map;
 		METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
-			ARG 1 wrapperLookup
+			ARG 1 registriesLookup
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
-		METHOD method_59855 computeRegistryInfo (Lnet/minecraft/class_5321;)Ljava/util/Optional;
+		METHOD method_59855 compute (Lnet/minecraft/class_5321;)Ljava/util/Optional;
 			ARG 1 registryRef
diff --git a/mappings/net/minecraft/util/dynamic/CodecCache.mapping b/mappings/net/minecraft/util/dynamic/CodecCache.mapping
index c70de45e10..5b4a237b97 100644
--- a/mappings/net/minecraft/util/dynamic/CodecCache.mapping
+++ b/mappings/net/minecraft/util/dynamic/CodecCache.mapping
@@ -18,4 +18,4 @@ CLASS net/minecraft/class_9684 net/minecraft/util/dynamic/CodecCache
 	CLASS class_9685 Key
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
-		METHOD method_59858 load ()Lcom/mojang/serialization/DataResult;
+		METHOD method_59858 encode ()Lcom/mojang/serialization/DataResult;
diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping
index 8cf2fcc585..ee1534e8f8 100644
--- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping
+++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping
@@ -190,3 +190,4 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 1 structureSetRegistry
 		ARG 2 noiseConfig
 		ARG 3 seed
+	METHOD method_59825 initializeIndexedFeaturesList ()V
diff --git a/mappings/net/minecraft/world/gen/structure/Structure.mapping b/mappings/net/minecraft/world/gen/structure/Structure.mapping
index bbd7cc9902..fdec0f18a3 100644
--- a/mappings/net/minecraft/world/gen/structure/Structure.mapping
+++ b/mappings/net/minecraft/world/gen/structure/Structure.mapping
@@ -70,6 +70,12 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/Structure
 		ARG 1 position
 	METHOD method_47932 getValidStructurePosition (Lnet/minecraft/class_3195$class_7149;)Ljava/util/Optional;
 		ARG 1 context
+	METHOD method_59863 getAverageCornerHeights (Lnet/minecraft/class_3195$class_7149;IIII)I
+		ARG 0 context
+		ARG 1 x
+		ARG 2 width
+		ARG 3 z
+		ARG 4 height
 	CLASS class_7149 Context
 		FIELD comp_561 dynamicRegistryManager Lnet/minecraft/class_5455;
 		FIELD comp_564 noiseConfig Lnet/minecraft/class_7138;