From a8ff75718a20bf316c45ce14cd3e560b7d191b5b Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:29:45 +0900 Subject: [PATCH] 24w04a stuff (#3774) * 24w04a stuff * Update mappings/net/minecraft/world/updater/WorldUpdater.mapping Co-authored-by: Shnupbups --------- Co-authored-by: Shnupbups --- .../block/spawner/MobSpawnerEntry.mapping | 3 + .../minecraft/client/gui/hud/DebugHud.mapping | 1 + .../client/gui/hud/debug/DebugChart.mapping | 19 ++++++ .../ClientConfigurationNetworkHandler.mapping | 1 + .../network/ClientPlayNetworkHandler.mapping | 3 + .../client/network/ClientRegistries.mapping | 32 ++++++++++ .../RealmsSelectFileToUploadScreen.mapping | 2 +- .../minecraft/entity/SpawnRestriction.mapping | 4 ++ .../entity/passive/ArmadilloBrain.mapping | 2 + .../projectile/ProjectileEntity.mapping | 1 + .../minecraft/network/RegistryByteBuf.mapping | 2 +- .../network/codec/PacketCodec.mapping | 2 +- .../s2c/play/ChatMessageS2CPacket.mapping | 3 + .../s2c/play/ChunkDataS2CPacket.mapping | 2 +- .../s2c/play/CommonPlayerSpawnInfo.mapping | 4 ++ .../play/EntityAttributesS2CPacket.mapping | 4 ++ .../s2c/play/EntityDamageS2CPacket.mapping | 5 ++ .../packet/s2c/play/GameJoinS2CPacket.mapping | 3 + .../RemoveEntityStatusEffectS2CPacket.mapping | 2 + .../registry/MutableRegistry.mapping | 2 +- .../minecraft/registry/RegistryLoader.mapping | 48 ++++++++++++++- .../registry/SerializableRegistries.mapping | 22 +++++++ .../registry/tag/TagPacketSerializer.mapping | 3 + mappings/net/minecraft/server/Main.mapping | 1 + .../minecraft/server/MinecraftServer.mapping | 9 +++ .../dedicated/ServerPropertiesHandler.mapping | 1 + .../dedicated/command/TransferCommand.mapping | 2 +- .../ServerConfigurationNetworkHandler.mapping | 3 + .../util/collection/PriorityIterator.mapping | 8 +++ .../util/profiler/PerformanceLog.mapping | 8 +++ .../util/profiler/ServerTickType.mapping | 1 + .../world/gen/StructureAccessor.mapping | 2 + ...mapping => ChunkCompressionFormat.mapping} | 20 ++++++- .../storage/ChunkPosKeyedStorage.mapping | 23 ++++++++ .../storage/EntityChunkDataAccess.mapping | 5 ++ .../storage/RecreatedChunkStorage.mapping | 8 +++ .../world/storage/RecreationStorage.mapping | 10 ++++ .../world/storage/RegionFile.mapping | 7 ++- .../SerializingRegionBasedStorage.mapping | 11 +++- .../world/storage/StorageIoWorker.mapping | 2 + .../storage/VersionedChunkStorage.mapping | 2 + .../world/updater/WorldUpdater.mapping | 58 +++++++++++++++++++ 42 files changed, 339 insertions(+), 12 deletions(-) create mode 100644 mappings/net/minecraft/client/network/ClientRegistries.mapping create mode 100644 mappings/net/minecraft/util/profiler/ServerTickType.mapping rename mappings/net/minecraft/world/storage/{ChunkStreamVersion.mapping => ChunkCompressionFormat.mapping} (65%) create mode 100644 mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping create mode 100644 mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping create mode 100644 mappings/net/minecraft/world/storage/RecreationStorage.mapping diff --git a/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping b/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping index 7fabf5dab4..0e993ec413 100644 --- a/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping +++ b/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping @@ -35,3 +35,6 @@ CLASS net/minecraft/class_1952 net/minecraft/block/spawner/MobSpawnerEntry ARG 0 rules METHOD method_51719 createLightLimitCodec (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec; ARG 0 name + METHOD method_56563 canSpawn (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)Z + ARG 1 pos + ARG 2 world diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index e0543b0374..acf56bb19c 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -79,6 +79,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_53543 getPingLog ()Lnet/minecraft/class_8743; METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_8743; METHOD method_53545 clear ()V + METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_8743; CLASS class_7412 AllocationRateCalculator FIELD field_38986 INTERVAL I FIELD field_38987 GARBAGE_COLLECTORS Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping index 3fb038b0c4..da5855da96 100644 --- a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping +++ b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping @@ -9,7 +9,9 @@ CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart ARG 1 value METHOD method_53469 getColor (DDIDIDI)I ARG 1 value + ARG 3 min ARG 5 minColor + ARG 6 median ARG 8 medianColor ARG 9 max ARG 11 maxColor @@ -33,3 +35,20 @@ CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart ARG 4 y METHOD method_53475 getHeight (D)I ARG 1 value + METHOD method_56578 drawBar (Lnet/minecraft/class_332;III)V + ARG 1 context + ARG 2 y + ARG 3 x + ARG 4 index + METHOD method_56579 get (I)J + ARG 1 index + METHOD method_56580 drawTotalBar (Lnet/minecraft/class_332;III)V + ARG 1 context + ARG 2 y + ARG 3 x + ARG 4 index + METHOD method_56581 drawOverlayBar (Lnet/minecraft/class_332;III)V + ARG 1 context + ARG 2 y + ARG 3 x + ARG 4 index diff --git a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping index 77cd1a161e..430579abbd 100644 --- a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping @@ -3,5 +3,6 @@ CLASS net/minecraft/class_8674 net/minecraft/client/network/ClientConfigurationN FIELD field_45597 profile Lcom/mojang/authlib/GameProfile; FIELD field_45598 registryManager Lnet/minecraft/class_5455$class_6890; FIELD field_45599 enabledFeatures Lnet/minecraft/class_7699; + FIELD field_48766 clientRegistries Lnet/minecraft/class_9173; METHOD method_52797 handleCustomPayload (Lnet/minecraft/class_8710;)V ARG 1 payload diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index ccebfc71ed..0f8345a2dd 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -140,3 +140,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 2 world METHOD method_54134 clearWorld ()V METHOD method_55823 getScoreboard ()Lnet/minecraft/class_269; + METHOD method_56582 handleSynchronizedTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V + ARG 1 registryRef + ARG 2 tags diff --git a/mappings/net/minecraft/client/network/ClientRegistries.mapping b/mappings/net/minecraft/client/network/ClientRegistries.mapping new file mode 100644 index 0000000000..9a6b7917e9 --- /dev/null +++ b/mappings/net/minecraft/client/network/ClientRegistries.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries + FIELD field_48767 dynamicRegistries Lnet/minecraft/class_9173$class_9174; + FIELD field_48768 tags Lnet/minecraft/class_9173$class_9175; + METHOD method_56583 putDynamicRegistry (Lnet/minecraft/class_5321;Ljava/util/List;)V + ARG 1 registryRef + ARG 2 entries + METHOD method_56584 (Lnet/minecraft/class_5455$class_6892;)V + ARG 0 entry + METHOD method_56585 createRegistryManager (Lnet/minecraft/class_5455;Z)Lnet/minecraft/class_5455$class_6890; + ARG 1 precedingRegistryManager + ARG 2 local + METHOD method_56586 putTags (Ljava/util/Map;)V + ARG 1 tags + CLASS class_9174 DynamicRegistries + FIELD field_48769 dynamicRegistries Ljava/util/Map; + METHOD method_56587 (Lnet/minecraft/class_5321;)Ljava/util/List; + ARG 0 registries + METHOD method_56588 put (Lnet/minecraft/class_5321;Ljava/util/List;)V + ARG 1 registryRef + ARG 2 entries + METHOD method_56589 load (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455; + ARG 1 precedingRegistryManager + CLASS class_9175 Tags + FIELD field_48770 tagsByRegistry Ljava/util/Map; + METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V + ARG 1 registryRef + ARG 2 serialized + METHOD method_56591 load (Lnet/minecraft/class_5455;)V + ARG 1 registryManager + METHOD method_56592 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V + ARG 1 registryRef + ARG 2 serialized diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping index 614fc42582..5ff4d13ed6 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_20057 worldSelectionList Lnet/minecraft/class_4416$class_4418; FIELD field_20058 WORLD_LANG Lnet/minecraft/class_2561; FIELD field_26507 HARDCORE_TEXT Lnet/minecraft/class_2561; - FIELD field_26508 CHEATS_TEXT Lnet/minecraft/class_2561; + FIELD field_26508 COMMANDS_TEXT Lnet/minecraft/class_2561; FIELD field_44909 LOADING_ERROR_TEXT Lnet/minecraft/class_2561; FIELD field_46131 TITLE Lnet/minecraft/class_2561; FIELD field_48387 creationTask Lnet/minecraft/class_4445; diff --git a/mappings/net/minecraft/entity/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping index 37197a551b..ad80feca79 100644 --- a/mappings/net/minecraft/entity/SpawnRestriction.mapping +++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping @@ -11,6 +11,10 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_56558 isSpawnPosAllowed (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 0 type + ARG 1 world + ARG 2 pos METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_9168; ARG 0 type METHOD method_6160 getHeightmapType (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2902$class_2903; diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping index 9bbbb77ab1..1d50d2dad3 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping @@ -26,3 +26,5 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain ARG 0 brain CLASS class_9072 RollUpTask CLASS class_9073 UnrollAndFleeTask + METHOD method_56559 (Lnet/minecraft/class_1314;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 2cacd1b28f..4f5041548c 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity FIELD field_23740 leftOwner Z FIELD field_28646 shot Z FIELD field_33399 owner Lnet/minecraft/class_1297; + FIELD field_48746 deflected Z METHOD method_24919 setVelocity (Lnet/minecraft/class_1297;FFFFF)V COMMENT Sets velocity and updates rotation accordingly. ARG 1 shooter diff --git a/mappings/net/minecraft/network/RegistryByteBuf.mapping b/mappings/net/minecraft/network/RegistryByteBuf.mapping index 46fb88b7e0..1afd0d648c 100644 --- a/mappings/net/minecraft/network/RegistryByteBuf.mapping +++ b/mappings/net/minecraft/network/RegistryByteBuf.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_9129 net/minecraft/network/RegistryByteBuf COMMENT A packet byte buffer bound to a particular {@link DynamicRegistryManager} instance. COMMENT - COMMENT

This is used during the {@link NetworkStateType#PLAY} phase only. + COMMENT

This is used during the {@link NetworkPhase#PLAY} phase only. FIELD field_48538 registryManager Lnet/minecraft/class_5455; METHOD (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_5455;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index 6cbc3a5104..d227d0ed66 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -119,7 +119,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec COMMENT This method should be called on the codec for the "type" - like {@link COMMENT net.minecraft.stat.StatType}. An example: COMMENT - COMMENT 

{@code
+		COMMENT 
{@code
 		COMMENT public static final PacketCodec> PACKET_CODEC = PacketCodecs.registryValue(RegistryKeys.THING_TYPE).dispatch(Thing::getType, ThingType::getPacketCodec);
 		COMMENT }

 		ARG 1 type
diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping
index 4e2bf779da..044d542aa3 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping
@@ -21,5 +21,8 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage
 	COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onChatMessage
 	FIELD comp_943 serializedParameters Lnet/minecraft/class_2556$class_7602;
 	FIELD field_47949 CODEC Lnet/minecraft/class_9139;
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD comp_943 serializedParameters ()Lnet/minecraft/class_2556$class_7602;
 	METHOD method_55898 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping
index ad25ae7ecb..f8610f5986 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping
@@ -15,5 +15,5 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2
 	METHOD method_11524 getChunkZ ()I
 	METHOD method_38598 getChunkData ()Lnet/minecraft/class_6603;
 	METHOD method_38599 getLightData ()Lnet/minecraft/class_6606;
-	METHOD method_55883 (Lnet/minecraft/class_9129;)V
+	METHOD method_55883 write (Lnet/minecraft/class_9129;)V
 		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping
index a2ca21a81f..d1402580bb 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo.mapping
@@ -1,6 +1,10 @@
 CLASS net/minecraft/class_8589 net/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo
 	FIELD comp_1556 gameMode Lnet/minecraft/class_1934;
 	FIELD comp_1557 prevGameMode Lnet/minecraft/class_1934;
+	FIELD field_48708 DIMENSION_TYPE_PACKET_CODEC Lnet/minecraft/class_9139;
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD comp_1556 gameMode ()Lnet/minecraft/class_1934;
 	METHOD comp_1557 prevGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_52274 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping
index 6aabd59a7f..48f2046bdf 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping
@@ -16,3 +16,7 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri
 		METHOD  (Lnet/minecraft/class_6880;DLjava/util/Collection;)V
 			ARG 2 baseValue
 			ARG 4 modifiers
+		METHOD method_55953 (Ljava/util/UUID;Ljava/lang/Double;Lnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1322;
+			ARG 0 attribute
+			ARG 1 base
+			ARG 2 modifiers
diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping
index 76f2fb2a62..ad58c9c7f9 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket.mapping
@@ -1,9 +1,13 @@
 CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamageS2CPacket
 	FIELD field_47921 CODEC Lnet/minecraft/class_9139;
+	FIELD field_48707 DAMAGE_TYPE_PACKET_CODEC Lnet/minecraft/class_9139;
 	METHOD  (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V
 		ARG 1 entity
 		ARG 2 damageSource
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD method_49071 createDamageSource (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1282;
+		ARG 1 world
 	METHOD method_49072 writeOffsetVarInt (Lnet/minecraft/class_2540;I)V
 		ARG 0 buf
 		ARG 1 value
@@ -15,3 +19,4 @@ CLASS net/minecraft/class_8143 net/minecraft/network/packet/s2c/play/EntityDamag
 	METHOD method_49076 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_243;
 		ARG 0 pos
 	METHOD method_55873 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
index 4092d0ef45..2f36db6b16 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
@@ -9,6 +9,8 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	FIELD field_47937 CODEC Lnet/minecraft/class_9139;
 	METHOD  (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;Z)V
 		ARG 1 playerEntityId
+	METHOD  (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
 	METHOD comp_100 showDeathScreen ()Z
 	METHOD comp_88 playerEntityId ()I
 	METHOD comp_89 hardcore ()Z
@@ -19,3 +21,4 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	METHOD method_34135 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5321;
 		ARG 0 b
 	METHOD method_55887 write (Lnet/minecraft/class_9129;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping
index 330937a992..664a854e24 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping
@@ -4,3 +4,5 @@ CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntit
 		ARG 1 entityId
 	METHOD method_11767 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297;
 		ARG 1 world
+	METHOD method_55907 (Lnet/minecraft/class_2718;)Ljava/lang/Integer;
+		ARG 0 packet
diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping
index 061fae5b57..904aee6ece 100644
--- a/mappings/net/minecraft/registry/MutableRegistry.mapping
+++ b/mappings/net/minecraft/registry/MutableRegistry.mapping
@@ -5,7 +5,7 @@ CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry
 	COMMENT @see Registry
 	METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880$class_6883;
 		ARG 1 key
-		ARG 2 entry
+		ARG 2 value
 		ARG 3 lifecycle
 	METHOD method_35863 isEmpty ()Z
 		COMMENT {@return whether the registry is empty}
diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping
index 7e0142637e..2111871f06 100644
--- a/mappings/net/minecraft/registry/RegistryLoader.mapping
+++ b/mappings/net/minecraft/registry/RegistryLoader.mapping
@@ -2,12 +2,21 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 	FIELD field_39968 DYNAMIC_REGISTRIES Ljava/util/List;
 	FIELD field_39969 DIMENSION_REGISTRIES Ljava/util/List;
 	FIELD field_39970 LOGGER Lorg/slf4j/Logger;
+	FIELD field_48709 SYNCED_REGISTRIES Ljava/util/List;
 	METHOD method_45119 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String;
 		ARG 0 id
+	METHOD method_45120 (Lnet/minecraft/class_7655$class_7656;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_7655$class_9158;)V
+		ARG 2 loader
 	METHOD method_45121 load (Lnet/minecraft/class_7655$class_7656;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
+		ARG 0 loadable
 		ARG 1 baseRegistryManager
 		ARG 2 entries
-	METHOD method_45122 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
+	METHOD method_45122 loadFromResource (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
+		ARG 0 resourceManager
+		ARG 1 infoGetter
+		ARG 2 registry
+		ARG 3 elementDecoder
+		ARG 4 errors
 	METHOD method_45123 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V
 		ARG 1 entry
 	METHOD method_45124 (Ljava/lang/String;)V
@@ -18,6 +27,8 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		ARG 0 exceptions
 	METHOD method_45127 (Ljava/util/Map;Lnet/minecraft/class_7655$class_7657;)Lnet/minecraft/class_7655$class_9158;
 		ARG 1 entry
+	METHOD method_45128 (Ljava/util/Map;Lnet/minecraft/class_7655$class_9158;)V
+		ARG 1 loader
 	METHOD method_45129 (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V
 		ARG 1 elementEntry
 	METHOD method_45130 (Ljava/util/Map$Entry;)Lnet/minecraft/class_2960;
@@ -29,11 +40,46 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader
 		ARG 1 additionalRegistries
 	METHOD method_46620 createInfo (Lnet/minecraft/class_2385;)Lnet/minecraft/class_6903$class_7862;
 		ARG 0 registry
+	METHOD method_46621 (Ljava/util/Map;Lnet/minecraft/class_7655$class_9158;)V
+		ARG 1 loader
 	METHOD method_46622 (Ljava/util/Map;Lnet/minecraft/class_5455$class_6892;)V
 		ARG 1 entry
+	METHOD method_56514 (Lnet/minecraft/class_3300;Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
+		ARG 1 loader
+		ARG 2 infoGetter
+	METHOD method_56515 loadFromResource (Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
+		ARG 0 resourceManager
+		ARG 1 registryManager
+		ARG 2 entries
+	METHOD method_56516 (Ljava/lang/String;)V
+		ARG 0 error
+	METHOD method_56517 (Ljava/util/Map;Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
+		ARG 1 loader
+		ARG 2 infoGetter
+	METHOD method_56518 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V
+		ARG 0 data
+		ARG 1 infoGetter
+		ARG 2 registry
+		ARG 3 elementDecoder
+		ARG 4 errors
+	METHOD method_56519 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890;
+		ARG 0 data
+		ARG 1 registryManager
+		ARG 2 entries
 	CLASS class_7656 RegistryLoadable
+		METHOD apply (Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V
+			ARG 1 loader
+			ARG 2 infoGetter
 	CLASS class_7657 Entry
 		METHOD method_45131 getLoader (Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/class_7655$class_9158;
 			ARG 1 lifecycle
+			ARG 2 errors
 		METHOD method_54920 addToCloner (Ljava/util/function/BiConsumer;)V
 			ARG 1 callback
+	CLASS class_9158 Loader
+		METHOD method_56520 loadFromResource (Lnet/minecraft/class_3300;Lnet/minecraft/class_6903$class_7863;)V
+			ARG 1 resourceManager
+			ARG 2 infoGetter
+		METHOD method_56521 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_6903$class_7863;)V
+			ARG 1 data
+			ARG 2 infoGetter
diff --git a/mappings/net/minecraft/registry/SerializableRegistries.mapping b/mappings/net/minecraft/registry/SerializableRegistries.mapping
index cf196d5a57..844649b391 100644
--- a/mappings/net/minecraft/registry/SerializableRegistries.mapping
+++ b/mappings/net/minecraft/registry/SerializableRegistries.mapping
@@ -1,7 +1,29 @@
 CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries
+	FIELD field_48771 SYNCED_REGISTRIES Ljava/util/Set;
 	METHOD method_45953 streamRegistryManagerEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream;
 		ARG 0 combinedRegistries
 	METHOD method_45956 stream (Lnet/minecraft/class_5455;)Ljava/util/stream/Stream;
 		ARG 0 dynamicRegistryManager
 	METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream;
 		ARG 0 combinedRegistries
+	METHOD method_56595 (Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/List;Lnet/minecraft/class_6880$class_6883;)V
+		ARG 3 registryEntry
+	METHOD method_56596 (Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2378;)V
+		ARG 3 registry
+	METHOD method_56597 serialize (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;)V
+		ARG 0 nbtOps
+		ARG 1 entry
+		ARG 2 registryManager
+		ARG 3 callback
+	METHOD method_56598 forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;)V
+		ARG 0 nbtOps
+		ARG 1 registryManager
+		ARG 2 callback
+	METHOD method_56599 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/function/BiConsumer;Lnet/minecraft/class_7655$class_7657;)V
+		ARG 3 entry
+	METHOD method_56600 (Lnet/minecraft/class_6880$class_6883;Ljava/lang/String;)Ljava/lang/IllegalArgumentException;
+		ARG 1 error
+	METHOD method_56601 (Lnet/minecraft/class_5455$class_6892;)Z
+		ARG 0 registry
+	CLASS class_9176 SerializedRegistryEntry
+		FIELD field_48772 PACKET_CODEC Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
index 2c622bf89e..72ae960d22 100644
--- a/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
+++ b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
@@ -31,6 +31,9 @@ CLASS net/minecraft/class_6864 net/minecraft/registry/tag/TagPacketSerializer
 			ARG 1 buf
 		METHOD method_33160 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6864$class_5748;
 			ARG 0 buf
+		METHOD method_56531 size ()I
+		METHOD method_56532 loadTo (Lnet/minecraft/class_2378;)V
+			ARG 1 registry
 	CLASS class_6865 Loader
 		METHOD accept (Lnet/minecraft/class_6862;Ljava/util/List;)V
 			ARG 1 tag
diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping
index 381128cb46..490bdd20e9 100644
--- a/mappings/net/minecraft/server/Main.mapping
+++ b/mappings/net/minecraft/server/Main.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/server/Main
 		ARG 2 eraseCache
 		ARG 3 continueCheck
 		ARG 4 dimensionOptionsRegistry
+		ARG 5 recreateRegionFiles
 	METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lnet/minecraft/class_7497;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176;
 		ARG 11 thread
 	METHOD method_43612 (Lnet/minecraft/class_7237$class_6906;Lcom/mojang/serialization/Dynamic;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Lnet/minecraft/class_3807;Ljoptsimple/OptionSpec;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index 363e4ddb92..eadbc30998 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -83,6 +83,9 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_47145 OVERLOAD_WARNING_INTERVAL_NANOS J
 	FIELD field_47147 PLAYER_SAMPLE_UPDATE_INTERVAL_NANOS J
 	FIELD field_47148 PREPARE_START_REGION_TICK_DELAY_NANOS J
+	FIELD field_48773 prevFullTickLogTime J
+	FIELD field_48774 tasksStartTime J
+	FIELD field_48775 waitTime J
 	METHOD  (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/net/Proxy;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7497;Lnet/minecraft/class_3950;)V
 		ARG 1 serverThread
 		ARG 2 session
@@ -449,6 +452,12 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_54835 getTickTimes ()[J
 	METHOD method_54837 getAutosaveInterval ()I
 	METHOD method_56040 acceptsTransfers ()Z
+	METHOD method_56593 getPerformanceLog ()Lnet/minecraft/class_8743;
+	METHOD method_56602 pushTickLog (J)V
+		ARG 1 tickStartTime
+	METHOD method_56603 pushFullTickLog ()V
+	METHOD method_56604 startTaskPerformanceLog ()V
+	METHOD method_56605 pushPerformanceLogs ()V
 	CLASS class_6414 DebugStart
 		FIELD field_33980 time J
 		FIELD field_33981 tick I
diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
index 8396a31dda..562fedf9ac 100644
--- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
+++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping
@@ -55,6 +55,7 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
 	FIELD field_39983 worldGenProperties Lnet/minecraft/class_3806$class_7044;
 	FIELD field_44985 logIps Z
 	FIELD field_48270 acceptsTransfers Z
+	FIELD field_48711 regionFileCompression Ljava/lang/String;
 	METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806;
 		ARG 0 path
 	METHOD method_16715 (Ljava/lang/Integer;)Ljava/lang/Integer;
diff --git a/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping b/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping
index ef4820419b..ab5bd75cd1 100644
--- a/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping
+++ b/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping
@@ -6,7 +6,7 @@ CLASS net/minecraft/class_9159 net/minecraft/server/dedicated/command/TransferCo
 		ARG 0 context
 	METHOD method_56524 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
-	METHOD method_56525 transfer (Lnet/minecraft/class_2168;Ljava/lang/String;ILjava/util/Collection;)I
+	METHOD method_56525 executeTransfer (Lnet/minecraft/class_2168;Ljava/lang/String;ILjava/util/Collection;)I
 		ARG 0 source
 		ARG 1 host
 		ARG 2 port
diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
index 22743d8862..e2e1f4515f 100644
--- a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
+++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping
@@ -13,3 +13,6 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN
 	METHOD method_52410 endConfiguration ()V
 	METHOD method_52411 queueSendResourcePackTask ()V
 	METHOD method_52412 pollTask ()V
+	METHOD method_56530 (Lnet/minecraft/class_5321;Ljava/util/List;)V
+		ARG 1 registryRef
+		ARG 2 entries
diff --git a/mappings/net/minecraft/util/collection/PriorityIterator.mapping b/mappings/net/minecraft/util/collection/PriorityIterator.mapping
index bcc4af8b13..9fea0bf3e8 100644
--- a/mappings/net/minecraft/util/collection/PriorityIterator.mapping
+++ b/mappings/net/minecraft/util/collection/PriorityIterator.mapping
@@ -1,6 +1,14 @@
 CLASS net/minecraft/class_8917 net/minecraft/util/collection/PriorityIterator
+	COMMENT A queue-like iterator that orders its values by the priority, or the insertion order
+	COMMENT if the priorities equal.
+	FIELD field_48714 LOWEST_PRIORITY I
+	FIELD field_48715 maxPriorityQueue Ljava/util/Deque;
+	FIELD field_48716 maxPriority I
+	FIELD field_48717 queuesByPriority Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	METHOD method_54723 (I)Ljava/util/Deque;
 		ARG 0 p
 	METHOD method_54726 enqueue (Ljava/lang/Object;I)V
+		COMMENT Adds {@code value} with the priority {@code priority}.
 		ARG 1 value
 		ARG 2 priority
+	METHOD method_56533 refreshMaxPriority ()V
diff --git a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
index 7d4decd7fa..74c20a6bfa 100644
--- a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
+++ b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog
 	FIELD field_45720 data [[J
 	FIELD field_45721 currentIndex I
 	FIELD field_45722 maxIndex I
+	METHOD  (I)V
+		ARG 1 columns
 	METHOD method_53064 size ()I
 	METHOD method_53065 get (I)J
 		ARG 1 index
@@ -12,3 +14,9 @@ CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog
 	METHOD method_53068 wrap (I)I
 		ARG 1 index
 	METHOD method_53069 reset ()V
+	METHOD method_56534 get (II)J
+		ARG 1 index
+		ARG 2 column
+	METHOD method_56535 push (JI)V
+		ARG 1 value
+		ARG 3 column
diff --git a/mappings/net/minecraft/util/profiler/ServerTickType.mapping b/mappings/net/minecraft/util/profiler/ServerTickType.mapping
new file mode 100644
index 0000000000..dd2203c870
--- /dev/null
+++ b/mappings/net/minecraft/util/profiler/ServerTickType.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9160 net/minecraft/util/profiler/ServerTickType
diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping
index 9fff8bc5a5..a590b41e91 100644
--- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping
+++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping
@@ -43,6 +43,8 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor
 	METHOD method_39783 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Lnet/minecraft/class_6874;Z)Lnet/minecraft/class_6833;
 		ARG 1 chunkPos
 		ARG 2 structure
+		ARG 3 placement
+		ARG 4 skipReferencedStructures
 	METHOD method_39784 incrementReferences (Lnet/minecraft/class_3449;)V
 		ARG 1 structureStart
 	METHOD method_41032 acceptStructureStarts (Lnet/minecraft/class_3195;Lit/unimi/dsi/fastutil/longs/LongSet;Ljava/util/function/Consumer;)V
diff --git a/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping b/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping
similarity index 65%
rename from mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping
rename to mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping
index cda10fa13c..e1348c7e02 100644
--- a/mappings/net/minecraft/world/storage/ChunkStreamVersion.mapping
+++ b/mappings/net/minecraft/world/storage/ChunkCompressionFormat.mapping
@@ -1,13 +1,22 @@
-CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkStreamVersion
+CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkCompressionFormat
 	FIELD field_20442 GZIP Lnet/minecraft/class_4486;
 	FIELD field_20443 DEFLATE Lnet/minecraft/class_4486;
 	FIELD field_20444 UNCOMPRESSED Lnet/minecraft/class_4486;
-	FIELD field_20445 VERSIONS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	FIELD field_20445 FORMATS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD field_20446 id I
 	FIELD field_20447 inputStreamWrapper Lnet/minecraft/class_4486$class_4487;
 	FIELD field_20448 outputStreamWrapper Lnet/minecraft/class_4486$class_4487;
+	FIELD field_48753 LZ4 Lnet/minecraft/class_4486;
+	FIELD field_48754 DEFAULT_FORMAT Lnet/minecraft/class_4486;
+	FIELD field_48755 LOGGER Lorg/slf4j/Logger;
+	FIELD field_48756 FORMAT_BY_NAME Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	FIELD field_48757 currentFormat Lnet/minecraft/class_4486;
+	FIELD field_48758 name Ljava/lang/String;
 	METHOD  (ILjava/lang/String;Lnet/minecraft/class_4486$class_4487;Lnet/minecraft/class_4486$class_4487;)V
 		ARG 1 id
+		ARG 2 name
+		ARG 3 inputStreamWrapper
+		ARG 4 outputStreamWrapper
 	METHOD method_21882 getId ()I
 	METHOD method_21883 get (I)Lnet/minecraft/class_4486;
 		ARG 0 id
@@ -31,6 +40,13 @@ CLASS net/minecraft/class_4486 net/minecraft/world/storage/ChunkStreamVersion
 		ARG 0 stream
 	METHOD method_39806 (Ljava/io/OutputStream;)Ljava/io/OutputStream;
 		ARG 0 stream
+	METHOD method_56567 getCurrentFormat ()Lnet/minecraft/class_4486;
+	METHOD method_56568 setCurrentFormat (Ljava/lang/String;)V
+		ARG 0 name
+	METHOD method_56569 (Ljava/io/InputStream;)Ljava/io/InputStream;
+		ARG 0 stream
+	METHOD method_56570 (Ljava/io/OutputStream;)Ljava/io/OutputStream;
+		ARG 0 stream
 	CLASS class_4487 Wrapper
 		METHOD wrap (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 object
diff --git a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
new file mode 100644
index 0000000000..e2ec92f403
--- /dev/null
+++ b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping
@@ -0,0 +1,23 @@
+CLASS net/minecraft/class_9172 net/minecraft/world/storage/ChunkPosKeyedStorage
+	FIELD field_48760 worker Lnet/minecraft/class_4698;
+	FIELD field_48761 dataFixer Lcom/mojang/datafixers/DataFixer;
+	FIELD field_48762 dataFixTypes Lnet/minecraft/class_4284;
+	METHOD  (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/lang/String;Lnet/minecraft/class_4284;)V
+		ARG 1 directory
+		ARG 2 dataFixer
+		ARG 3 dsync
+		ARG 4 name
+		ARG 5 dataFixTypes
+	METHOD method_56565 set (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 pos
+		ARG 2 nbt
+	METHOD method_56571 update (Lcom/mojang/serialization/Dynamic;I)Lcom/mojang/serialization/Dynamic;
+		ARG 1 nbt
+		ARG 2 oldVersion
+	METHOD method_56572 read (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 pos
+	METHOD method_56573 update (Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487;
+		ARG 1 nbt
+		ARG 2 oldVersion
+	METHOD method_56574 completeAll (Z)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 sync
diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
index fad2699158..059d4486b5 100644
--- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
+++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
@@ -5,6 +5,11 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess
 	FIELD field_31414 ENTITIES_KEY Ljava/lang/String;
 	FIELD field_31415 POSITION_KEY Ljava/lang/String;
 	FIELD field_34056 taskExecutor Lnet/minecraft/class_3846;
+	FIELD field_48747 storage Lnet/minecraft/class_9172;
+	METHOD  (Lnet/minecraft/class_9172;Lnet/minecraft/class_3218;Ljava/util/concurrent/Executor;)V
+		ARG 1 storage
+		ARG 2 world
+		ARG 3 executor
 	METHOD method_31730 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Void;
 		ARG 1 ex
 	METHOD method_31731 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lnet/minecraft/class_5566;
diff --git a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
new file mode 100644
index 0000000000..a679f9da05
--- /dev/null
+++ b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_9170 net/minecraft/world/storage/RecreatedChunkStorage
+	FIELD field_48748 recreationWorker Lnet/minecraft/class_4698;
+	FIELD field_48749 outputDirectory Ljava/nio/file/Path;
+	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V
+		ARG 1 directory
+		ARG 2 outputDirectory
+		ARG 3 dataFixer
+		ARG 4 dsync
diff --git a/mappings/net/minecraft/world/storage/RecreationStorage.mapping b/mappings/net/minecraft/world/storage/RecreationStorage.mapping
new file mode 100644
index 0000000000..7e8689b8ea
--- /dev/null
+++ b/mappings/net/minecraft/world/storage/RecreationStorage.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9171 net/minecraft/world/storage/RecreationStorage
+	FIELD field_48750 recreationWorker Lnet/minecraft/class_4698;
+	FIELD field_48751 outputDirectory Ljava/nio/file/Path;
+	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/lang/String;Lnet/minecraft/class_4284;)V
+		ARG 1 directory
+		ARG 2 outputDirectory
+		ARG 3 dataFixer
+		ARG 4 dsync
+		ARG 5 name
+		ARG 6 dataFixTypes
diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping
index c572dbb7ae..c1442faa6e 100644
--- a/mappings/net/minecraft/world/storage/RegionFile.mapping
+++ b/mappings/net/minecraft/world/storage/RegionFile.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	FIELD field_20434 LOGGER Lorg/slf4j/Logger;
 	FIELD field_20435 ZERO Ljava/nio/ByteBuffer;
 	FIELD field_20436 channel Ljava/nio/channels/FileChannel;
-	FIELD field_20437 outputChunkStreamVersion Lnet/minecraft/class_4486;
+	FIELD field_20437 compressionFormat Lnet/minecraft/class_4486;
 	FIELD field_20438 header Ljava/nio/ByteBuffer;
 	FIELD field_20439 sectorData Ljava/nio/IntBuffer;
 	FIELD field_20440 saveTimes Ljava/nio/IntBuffer;
@@ -10,9 +10,11 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	FIELD field_20657 directory Ljava/nio/file/Path;
 	FIELD field_31417 SECTOR_DATA_LIMIT I
 	FIELD field_31421 FILE_EXTENSION Ljava/lang/String;
+	FIELD field_48752 path Ljava/nio/file/Path;
 	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V
-		ARG 1 file
+		ARG 1 path
 		ARG 2 directory
+		ARG 3 compressionFormat
 		ARG 4 dsync
 	METHOD  (Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V
 		ARG 1 file
@@ -68,6 +70,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
 	METHOD method_31739 getEpochTimeSeconds ()I
 	METHOD method_31740 delete (Lnet/minecraft/class_1923;)V
 		ARG 1 pos
+	METHOD method_56566 getPath ()Ljava/nio/file/Path;
 	CLASS class_2862 ChunkBuffer
 		FIELD field_17656 pos Lnet/minecraft/class_1923;
 		METHOD  (Lnet/minecraft/class_2861;Lnet/minecraft/class_1923;)V
diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
index 910935218a..8a7126cfd8 100644
--- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
+++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
@@ -6,7 +6,14 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 	FIELD field_24750 codecFactory Ljava/util/function/Function;
 	FIELD field_27240 world Lnet/minecraft/class_5539;
 	FIELD field_31427 SECTIONS_KEY Ljava/lang/String;
-	FIELD field_39315 dynamicRegistryManager Lnet/minecraft/class_5455;
+	FIELD field_39315 registryManager Lnet/minecraft/class_5455;
+	FIELD field_48759 storageAccess Lnet/minecraft/class_9172;
+	METHOD  (Lnet/minecraft/class_9172;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V
+		ARG 1 storageAccess
+		ARG 2 codecFactory
+		ARG 3 factory
+		ARG 4 registryManager
+		ARG 5 world
 	METHOD method_19288 onUpdate (J)V
 		ARG 1 pos
 	METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V
@@ -30,6 +37,8 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 		ARG 2 ops
 	METHOD method_20368 update (Lnet/minecraft/class_1923;Lnet/minecraft/class_6903;Lnet/minecraft/class_2487;)V
 		ARG 1 pos
+		ARG 2 ops
+		ARG 3 nbt
 	METHOD method_20369 getDataVersion (Lcom/mojang/serialization/Dynamic;)I
 		ARG 0 dynamic
 	METHOD method_20370 save (Lnet/minecraft/class_1923;)V
diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
index 398694b8c8..db979f08d0 100644
--- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
+++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
@@ -18,6 +18,8 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker
 	METHOD method_23703 setResult (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 pos
 		ARG 2 nbt
+	METHOD method_23705 (Lnet/minecraft/class_4698$class_4699;)Ljava/util/concurrent/CompletableFuture;
+		ARG 0 result
 	METHOD method_23709 run (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 task
 	METHOD method_23711 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)Lnet/minecraft/class_4698$class_4699;
diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
index ae8e6373f2..5ddd3e1c0d 100644
--- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
+++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping
@@ -33,3 +33,5 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage
 	METHOD method_43411 getFeatureUpdater (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_3360;
 		ARG 1 worldKey
 		ARG 2 stateManagerGetter
+	METHOD method_56564 markFeatureUpdateResolved (Lnet/minecraft/class_1923;)V
+		ARG 1 chunkPos
diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
index 11179311d1..7a80de090f 100644
--- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping
+++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
@@ -5,6 +5,15 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	FIELD field_24084 dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD field_40113 dimensionOptionsRegistry Lnet/minecraft/class_2378;
 	FIELD field_40114 worldKeys Ljava/util/Set;
+	FIELD field_48723 NEW_PREFIX Ljava/lang/String;
+	FIELD field_48724 UPGRADING_POI_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48725 FINISHED_POI_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48726 UPGRADING_ENTITIES_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48727 FINISHED_ENTITIES_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48728 UPGRADING_CHUNKS_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48729 FINISHED_CHUNKS_TEXT Lnet/minecraft/class_5250;
+	FIELD field_48730 recreateRegionFiles Z
+	FIELD field_48731 totalRegionCount I
 	FIELD field_5755 persistentStateManager Lnet/minecraft/class_26;
 	FIELD field_5756 LOGGER Lorg/slf4j/Logger;
 	FIELD field_5757 UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory;
@@ -22,6 +31,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 		ARG 2 dataFixer
 		ARG 3 dimensionOptionsRegistry
 		ARG 4 eraseCache
+		ARG 5 recreateRegionFiles
 	METHOD method_28304 getWorlds ()Ljava/util/Set;
 	METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F
 		ARG 1 world
@@ -36,3 +46,51 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater
 	METHOD method_5402 cancel ()V
 	METHOD method_5403 isDone ()Z
 	METHOD method_5404 updateWorld ()V
+	CLASS class_9161 Update
+		FIELD field_48732 pendingUpdateFuture Ljava/util/concurrent/CompletableFuture;
+		FIELD field_48733 dataFixTypes Lnet/minecraft/class_4284;
+		FIELD field_48735 upgradingText Lnet/minecraft/class_5250;
+		FIELD field_48736 finishedText Lnet/minecraft/class_5250;
+		FIELD field_48737 targetName Ljava/lang/String;
+		METHOD  (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V
+			ARG 2 dataFixTypes
+			ARG 3 targetName
+			ARG 4 upgradingText
+			ARG 5 finishedText
+		METHOD method_56537 update ()V
+		METHOD method_56538 update (Lnet/minecraft/class_5321;Ljava/lang/AutoCloseable;Lnet/minecraft/class_1923;)Z
+			ARG 1 worldKey
+			ARG 2 storage
+			ARG 3 chunkPos
+		METHOD method_56539 listRegions (Lnet/minecraft/class_5321;Ljava/lang/String;)Ljava/util/List;
+			ARG 1 worldKey
+			ARG 2 targetName
+		METHOD method_56540 (Lnet/minecraft/class_1257$class_9165;)I
+			ARG 0 region
+		METHOD method_56541 recreate (Lnet/minecraft/class_2861;)V
+			ARG 1 regionFile
+		METHOD method_56542 (Ljava/io/File;Ljava/lang/String;)Z
+			ARG 0 file
+			ARG 1 name
+		METHOD method_56543 update (Ljava/lang/AutoCloseable;Lnet/minecraft/class_1923;Lnet/minecraft/class_5321;)Z
+			ARG 1 storage
+			ARG 2 chunkPos
+			ARG 3 worldKey
+		METHOD method_56544 listWoldData (Ljava/lang/String;)Ljava/util/List;
+			ARG 1 targetName
+		METHOD method_56545 enumerateRegions (Ljava/lang/String;Lnet/minecraft/class_5321;)Ljava/util/ListIterator;
+			ARG 1 targetName
+			ARG 2 worldKey
+		METHOD method_56546 openStorage (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable;
+			ARG 1 targetName
+			ARG 2 worldDirectory
+			ARG 3 targetDirectory
+	CLASS class_9162 RegionUpdate
+	CLASS class_9163 WorldData
+	CLASS class_9164 EntitiesUpdate
+	CLASS class_9165 Region
+	CLASS class_9166 PoiUpdate
+	CLASS class_9167 ChunkPosKeyedStorageUpdate
+		METHOD method_56550 updateNbt (Lnet/minecraft/class_9172;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
+			ARG 1 storage
+			ARG 2 nbt