More 24w19a stuff

mappings/net/minecraft/class_9761.mapping

@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_9761
-	METHOD method_14005 getLevel ()I
-	METHOD method_17208 getCompletedLevel ()I

mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping

@@ -11,6 +11,7 @@ CLASS net/minecraft/class_359 net/minecraft/client/gui/hud/SubtitlesHud
 	CLASS class_360 SubtitleEntry
 		FIELD field_2188 text Lnet/minecraft/class_2561;
 		FIELD field_47673 range F
+		FIELD field_51913 sounds Ljava/util/List;
 		METHOD <init> (Lnet/minecraft/class_2561;FLnet/minecraft/class_243;)V
 			ARG 1 text
 			ARG 2 range
@@ -20,3 +21,15 @@ CLASS net/minecraft/class_359 net/minecraft/client/gui/hud/SubtitlesHud
 		METHOD method_1960 getText ()Lnet/minecraft/class_2561;
 		METHOD method_55589 canHearFrom (Lnet/minecraft/class_243;)Z
 			ARG 1 pos
+		METHOD method_60570 removeExpired (D)V
+			ARG 1 expiry
+		METHOD method_60571 (JDLnet/minecraft/class_359$class_9772;)Z
+			ARG 4 sound
+		METHOD method_60572 getNearestSound (Lnet/minecraft/class_243;)Lnet/minecraft/class_359$class_9772;
+			ARG 1 pos
+		METHOD method_60573 (Lnet/minecraft/class_243;Lnet/minecraft/class_359$class_9772;)Z
+			ARG 1 sound
+		METHOD method_60574 hasSounds ()Z
+		METHOD method_60575 (Lnet/minecraft/class_243;Lnet/minecraft/class_359$class_9772;)D
+			ARG 1 soundPos
+	CLASS class_9772 SoundEntry

mappings/net/minecraft/datafixer/Schemas.mapping

@@ -29,3 +29,5 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas
 		ARG 0 replacements
 	METHOD method_57076 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
 		ARG 1 string
+	METHOD method_60487 optimize (Ljava/util/Set;)Ljava/util/concurrent/CompletableFuture;
+		ARG 0 requiredTypes

mappings/net/minecraft/enchantment/EnchantmentHelper.mapping

@@ -231,6 +231,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper
 	METHOD method_60165 getEffect (Lnet/minecraft/class_1799;Lnet/minecraft/class_9331;)Ljava/util/Optional;
 		ARG 0 stack
 		ARG 1 componentType
+	METHOD method_60166 (Lnet/minecraft/class_47;Lorg/apache/commons/lang3/mutable/MutableFloat;ILnet/minecraft/class_5819;Lnet/minecraft/class_9710;)V
+		ARG 4 effect
 	METHOD method_60167 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;ILnet/minecraft/class_9699;)V
 		ARG 2 enchantment
 		ARG 3 level

mappings/net/minecraft/entity/Entity.mapping

@@ -891,7 +891,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT <p>Limits this entity's {@code fallDistance} if its downward velocity isn't fast enough
 		COMMENT in order to prevent unwarranted fall damage.
-	METHOD method_45319 addVelocity (Lnet/minecraft/class_243;)V
+	METHOD method_45319 addVelocityInternal (Lnet/minecraft/class_243;)V
 		ARG 1 velocity
 	METHOD method_45321 getLeashOffset (F)Lnet/minecraft/class_243;
 		ARG 1 tickDelta
@@ -2291,6 +2291,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 3 stepHeight
 	METHOD method_59922 getRandom ()Lnet/minecraft/class_5819;
 	METHOD method_6034 canMoveVoluntarily ()Z
+	METHOD method_60478 getParticleVelocity ()Lnet/minecraft/class_243;
+	METHOD method_60490 recalculateDimensions (Lnet/minecraft/class_4048;)Z
+		ARG 1 previous
+	METHOD method_60491 addVelocity (Lnet/minecraft/class_243;)V
+		ARG 1 velocity
 	METHOD method_7325 isSpectator ()Z
 		COMMENT {@return whether the entity is a spectator}
 		COMMENT

mappings/net/minecraft/entity/attribute/AttributeContainer.mapping

@@ -3,6 +3,7 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer
 	FIELD field_23709 custom Ljava/util/Map;
 	FIELD field_23711 fallback Lnet/minecraft/class_5132;
 	FIELD field_51889 tracked Ljava/util/Set;
+	FIELD field_51890 pendingUpdate Ljava/util/Set;
 	METHOD <init> (Lnet/minecraft/class_5132;)V
 		ARG 1 defaultAttributes
 	METHOD method_26845 updateTrackedStatus (Lnet/minecraft/class_1324;)V
@@ -48,3 +49,4 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer
 	METHOD method_59935 removeModifiers (Lcom/google/common/collect/Multimap;)V
 		ARG 1 modifiersMap
 	METHOD method_60497 getTracked ()Ljava/util/Set;
+	METHOD method_60498 getPendingUpdate ()Ljava/util/Set;

mappings/net/minecraft/entity/attribute/EntityAttribute.mapping

@@ -7,6 +7,7 @@ CLASS net/minecraft/class_1320 net/minecraft/entity/attribute/EntityAttribute
 	FIELD field_23698 tracked Z
 	FIELD field_23699 translationKey Ljava/lang/String;
 	FIELD field_51575 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_51884 category Lnet/minecraft/class_1320$class_9764;
 	METHOD <init> (Ljava/lang/String;D)V
 		ARG 1 translationKey
 		ARG 2 fallback
@@ -14,8 +15,15 @@ CLASS net/minecraft/class_1320 net/minecraft/entity/attribute/EntityAttribute
 		COMMENT Sets all instances of this attribute to synchronize their values to clients.
 		ARG 1 tracked
 	METHOD method_26830 getTranslationKey ()Ljava/lang/String;
+	METHOD method_60493 setCategory (Lnet/minecraft/class_1320$class_9764;)Lnet/minecraft/class_1320;
+		ARG 1 category
+	METHOD method_60494 getFormatting (Z)Lnet/minecraft/class_124;
+		ARG 1 addition
 	METHOD method_6165 clamp (D)D
 		ARG 1 value
 	METHOD method_6168 isTracked ()Z
 		COMMENT Checks if instances of this attribute should synchronize values to clients.
 	METHOD method_6169 getDefaultValue ()D
+	CLASS class_9764 Category
+		METHOD method_60496 getFormatting (Z)Lnet/minecraft/class_124;
+			ARG 1 addition

mappings/net/minecraft/entity/projectile/thrown/EggEntity.mapping

@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_1681 net/minecraft/entity/projectile/thrown/EggEntity
+	FIELD field_51894 EMPTY_DIMENSIONS Lnet/minecraft/class_4048;
 	METHOD <init> (Lnet/minecraft/class_1937;DDD)V
 		ARG 1 world
 		ARG 2 x

mappings/net/minecraft/item/ItemStack.mapping

@@ -349,6 +349,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 	METHOD method_59979 postDamageEntity (Lnet/minecraft/class_1309;Lnet/minecraft/class_1657;)V
 		ARG 1 target
 		ARG 2 player
+	METHOD method_60503 withItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_1799;
+		ARG 1 item
 	METHOD method_60504 splitUnlessCreative (ILnet/minecraft/class_1309;)Lnet/minecraft/class_1799;
 		ARG 1 amount
 		ARG 2 entity

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -87,6 +87,7 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_48774 tasksStartTime J
 	FIELD field_48775 waitTime J
 	FIELD field_51466 brewingRecipeRegistry Lnet/minecraft/class_1845;
+	FIELD field_51917 WORLD_GEN_EXCEPTION Ljava/util/concurrent/atomic/AtomicReference;
 	METHOD <init> (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
@@ -475,6 +476,9 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 1 enabledProfiles
 		ARG 2 enabledFeatures
 		ARG 3 allowEnabling
+	METHOD method_60582 setWorldGenException (Ljava/lang/RuntimeException;)V
+		ARG 0 exception
+	METHOD method_60584 checkWorldGenException ()Z
 	CLASS class_6414 DebugStart
 		FIELD field_33980 time J
 		FIELD field_33981 tick I

mappings/net/minecraft/server/network/ServerPlayerEntity.mapping

@@ -56,6 +56,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 	FIELD field_47710 CREATIVE_ENTITY_INTERACTION_RANGE_MODIFIER_UUID Lnet/minecraft/class_1322;
 	FIELD field_49776 spawnExtraParticlesOnFall Z
 	FIELD field_50088 startRaidPos Lnet/minecraft/class_2338;
+	FIELD field_51875 particleVelocity Lnet/minecraft/class_243;
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_8791;)V
 		ARG 1 server
 		ARG 2 world

mappings/net/minecraft/server/world/ChunkHolder.mapping

@@ -21,7 +21,9 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder
 		COMMENT <p>
 		COMMENT Entries for a section are null if the section has no positions marked for update.
 	FIELD field_26929 world Lnet/minecraft/class_5539;
+	FIELD field_26930 levelIncreaseFuture Ljava/util/concurrent/CompletableFuture;
 	FIELD field_46085 postProcessingFuture Ljava/util/concurrent/CompletableFuture;
+	FIELD field_51858 savingFuture Ljava/util/concurrent/CompletableFuture;
 	METHOD <init> (Lnet/minecraft/class_1923;ILnet/minecraft/class_5539;Lnet/minecraft/class_3568;Lnet/minecraft/class_3193$class_3896;Lnet/minecraft/class_3193$class_3897;)V
 		ARG 1 pos
 		ARG 2 level
@@ -70,13 +72,27 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder
 	METHOD method_30312 (Ljava/util/List;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 3 pos
 		ARG 4 state
+	METHOD method_31408 decreaseLevel (Lnet/minecraft/class_3898;Lnet/minecraft/class_3194;)V
+		ARG 1 chunkLoadingManager
+		ARG 2 target
+	METHOD method_31409 increaseLevel (Lnet/minecraft/class_3898;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3194;)V
+		ARG 1 chunkLoadingManager
+		ARG 2 chunkFuture
+		ARG 3 executor
+		ARG 4 target
+	METHOD method_31410 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2818;)V
+		ARG 1 chunk
 	METHOD method_39966 (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 		ARG 1 thenResult
 	METHOD method_39967 combineSavingFuture (Ljava/util/concurrent/CompletableFuture;)V
+		ARG 1 savingFuture
 	METHOD method_53680 combinePostProcessingFuture (Ljava/util/concurrent/CompletableFuture;)V
 		ARG 1 postProcessingFuture
 	METHOD method_53681 getPostProcessingFuture ()Ljava/util/concurrent/CompletableFuture;
 	METHOD method_53682 getPostProcessedChunk ()Lnet/minecraft/class_2818;
+	METHOD method_57117 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_9259;)V
+		ARG 1 optionalChunk
+	METHOD method_60436 isSavable ()Z
 	CLASS class_3896 LevelUpdateListener
 		METHOD method_17209 updateLevel (Lnet/minecraft/class_1923;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V
 			ARG 1 pos

mappings/net/minecraft/server/world/ChunkLevels.mapping

@@ -3,6 +3,8 @@ CLASS net/minecraft/class_8563 net/minecraft/server/world/ChunkLevels
 	FIELD field_44850 FULL I
 	FIELD field_44851 BLOCK_TICKING I
 	FIELD field_44852 ENTITY_TICKING I
+	FIELD field_51859 FULL_GENERATION_REQUIRED_LEVEL I
+	FIELD field_51860 FULL_GENERATION_STEP Lnet/minecraft/class_9770;
 	METHOD method_51827 getStatus (I)Lnet/minecraft/class_2806;
 		ARG 0 level
 	METHOD method_51828 getLevelFromType (Lnet/minecraft/class_3194;)I
@@ -17,3 +19,8 @@ CLASS net/minecraft/class_8563 net/minecraft/server/world/ChunkLevels
 		ARG 0 level
 	METHOD method_51833 isAccessible (I)Z
 		ARG 0 level
+	METHOD method_60437 getStatusForAdditionalLevel (ILnet/minecraft/class_2806;)Lnet/minecraft/class_2806;
+		ARG 0 additionalLevel
+		ARG 1 emptyStatus
+	METHOD method_60438 getStatusForAdditionalLevel (I)Lnet/minecraft/class_2806;
+		ARG 0 level

mappings/net/minecraft/server/world/ChunkTicketManager.mapping

@@ -59,6 +59,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager
 		COMMENT <li>Update the expected loading states of chunks depending on their new levels.</li>
 		COMMENT <li>Special updates of chunks with PLAYER tickets added recently.</li>
 		COMMENT </ul>
+		ARG 1 chunkLoadingManager
 	METHOD method_17290 addTicketWithLevel (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V
 		ARG 1 type
 		ARG 2 pos
@@ -103,6 +104,8 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager
 	METHOD method_38633 getPlayerSimulationLevel ()I
 	METHOD method_39995 removePersistentTickets ()V
 	METHOD method_39996 shouldDelayShutdown ()Z
+	METHOD method_60451 (Lnet/minecraft/class_3898;Lnet/minecraft/class_3193;)V
+		ARG 1 holder
 	CLASS class_3205 DistanceFromNearestPlayerTracker
 		FIELD field_13896 distanceFromNearestPlayer Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
 		FIELD field_17461 maxDistance I

mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping

@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStorage
+CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingManager
 	FIELD field_17212 LOGGER Lorg/slf4j/Logger;
 	FIELD field_17213 currentChunkHolders Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
 	FIELD field_17214 world Lnet/minecraft/class_3218;
@@ -30,6 +30,10 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 	FIELD field_36383 chunkToNextSaveTimeMs Lit/unimi/dsi/fastutil/longs/Long2LongMap;
 	FIELD field_37278 noiseConfig Lnet/minecraft/class_7138;
 	FIELD field_40856 structurePlacementCalculator Lnet/minecraft/class_7869;
+	FIELD field_51861 generationContext Lnet/minecraft/class_9312;
+	FIELD field_51862 UNLOADED_CHUNKS Lnet/minecraft/class_9259;
+	FIELD field_51863 UNLOADED_CHUNKS_FUTURE Ljava/util/concurrent/CompletableFuture;
+	FIELD field_51864 loaders Ljava/util/List;
 	METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;IZ)V
 		ARG 1 world
 		ARG 2 session
@@ -61,6 +65,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 		ARG 3 distanceToStatus
 	METHOD method_17228 save (Lnet/minecraft/class_2791;)Z
 		ARG 1 chunk
+	METHOD method_17230 (Lnet/minecraft/class_9259;)Lnet/minecraft/class_9259;
+		ARG 0 chunk
 	METHOD method_17232 (Ljava/util/List;)Lnet/minecraft/class_2818;
 		ARG 0 chunks
 	METHOD method_17233 tick (Ljava/util/function/BooleanSupplier;)V
@@ -75,7 +81,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 	METHOD method_17245 (I)Lnet/minecraft/class_2806;
 		ARG 0 distance
 	METHOD method_17247 makeChunkEntitiesTickable (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 chunk
+		ARG 1 holder
 	METHOD method_17253 getTotalChunksLoadedCount ()I
 	METHOD method_17254 (I)Lnet/minecraft/class_2806;
 		ARG 0 distance
@@ -123,12 +129,16 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 	METHOD method_20458 tryUnloadChunk (JLnet/minecraft/class_3193;)V
 		ARG 1 pos
 		ARG 3 holder
+	METHOD method_20577 (Lnet/minecraft/class_9259;)Lnet/minecraft/class_9259;
+		ARG 0 optionalChunks
 	METHOD method_20578 (Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/class_2791;)V
 		ARG 1 chunk
 	METHOD method_20579 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V
 		ARG 2 task
 	METHOD method_20582 (Lnet/minecraft/class_2791;)Z
 		ARG 0 chunk
+	METHOD method_20584 (Lnet/minecraft/class_3193;)Lnet/minecraft/class_2791;
+		ARG 1 holder
 	METHOD method_20604 (Lnet/minecraft/class_3193;Ljava/lang/Void;Ljava/lang/Throwable;)V
 		ARG 1 void_
 		ARG 2 throwable
@@ -196,6 +206,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 		ARG 2 pair
 	METHOD method_41234 (Ljava/util/List;)Lnet/minecraft/class_2818;
 		ARG 0 cs
+	METHOD method_41235 (Lnet/minecraft/class_9259;)Lnet/minecraft/class_9259;
+		ARG 0 optionalChunks
 	METHOD method_41247 getNoiseConfig ()Lnet/minecraft/class_7138;
 	METHOD method_43374 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Lnet/minecraft/class_2791;
 		ARG 2 throwable
@@ -227,6 +239,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 	METHOD method_49422 (Lnet/minecraft/class_3222;)Ljava/util/List;
 		ARG 0 player
 	METHOD method_51834 (Lnet/minecraft/class_9259;Ljava/lang/Throwable;)Ljava/lang/Object;
+		ARG 1 chunk
 		ARG 2 throwable
 	METHOD method_52345 isTracked (Lnet/minecraft/class_3222;II)Z
 		ARG 1 player
@@ -254,6 +267,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 		ARG 1 chunkPos
 	METHOD method_52355 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V
 		ARG 2 chunkPos
+	METHOD method_53683 (Lnet/minecraft/class_3193;Lnet/minecraft/class_9259;)Lnet/minecraft/class_9259;
+		ARG 2 optionalChunk
 	METHOD method_53684 (Lnet/minecraft/class_3193;Lnet/minecraft/class_2818;)V
 		ARG 2 chunk
 	METHOD method_53685 forceLighting (Lnet/minecraft/class_1923;I)V
@@ -267,6 +282,10 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 		ARG 1 pos
 	METHOD method_53689 (Lnet/minecraft/class_1923;)V
 		ARG 1 pos
+	METHOD method_57120 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Void;
+		ARG 2 throwable
+	METHOD method_60439 schedule (Lnet/minecraft/class_9759;)V
+		ARG 1 chunkLoader
 	CLASS class_3208 EntityTracker
 		COMMENT An entity tracker governs which players' clients can see an entity. Each
 		COMMENT tracker corresponds to one entity in a server world and is mapped from the

mappings/net/minecraft/server/world/ServerChunkManager.mapping

@@ -47,6 +47,8 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
 		ARG 4 create
 	METHOD method_14144 applyViewDistance (I)V
 		ARG 1 watchDistance
+	METHOD method_14159 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage;
+		ARG 0 future
 	METHOD method_14161 tickChunks ()V
 	METHOD method_16155 updateChunks ()Z
 		COMMENT Update expected chunk loading states by updating {@code PLAYER} tickets and {@code Future}s.

mappings/net/minecraft/structure/PoolStructurePiece.mapping

@@ -32,3 +32,5 @@ CLASS net/minecraft/class_3790 net/minecraft/structure/PoolStructurePiece
 		ARG 5 boundingBox
 		ARG 6 pivot
 		ARG 7 keepJigsaws
+	METHOD method_35448 (Ljava/lang/String;)Ljava/lang/IllegalStateException;
+		ARG 0 error

mappings/net/minecraft/structure/StructurePiece.mapping

@@ -213,6 +213,8 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 	METHOD method_35457 getRandomHorizontalDirection (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2350;
 		ARG 0 random
 	METHOD method_35458 getCenter ()Lnet/minecraft/class_2338;
+	METHOD method_35459 (Ljava/lang/String;)Ljava/lang/IllegalArgumentException;
+		ARG 0 error
 	METHOD method_35460 getMirror ()Lnet/minecraft/class_2415;
 	METHOD method_38702 firstIntersecting (Ljava/util/List;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3443;
 		ARG 0 pieces

mappings/net/minecraft/structure/pool/StructurePool.mapping

@@ -15,6 +15,7 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool
 		ARG 2 elementCountsByGetters
 		ARG 3 projection
 	METHOD method_16631 getRandomElement (Lnet/minecraft/class_5819;)Lnet/minecraft/class_3784;
+		ARG 1 random
 	METHOD method_16632 getElementCount ()I
 	METHOD method_16633 getElementIndicesInRandomOrder (Lnet/minecraft/class_5819;)Ljava/util/List;
 		ARG 1 random

mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping

@@ -24,6 +24,8 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe
 		ARG 7 maxDistanceFromCenter
 		ARG 8 aliasLookup
 		ARG 9 dimensionPadding
+	METHOD method_39824 (Lnet/minecraft/class_3790;IIIILnet/minecraft/class_5539;IILnet/minecraft/class_3341;Lnet/minecraft/class_3195$class_7149;ZLnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_2919;Lnet/minecraft/class_2378;Lnet/minecraft/class_8891;Lnet/minecraft/class_6626;)V
+		ARG 16 collector
 	METHOD method_43566 findStartingJigsawPos (Lnet/minecraft/class_3784;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3485;Lnet/minecraft/class_2919;)Ljava/util/Optional;
 		ARG 0 pool
 		ARG 1 id
@@ -42,6 +44,8 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe
 		ARG 0 biome
 	METHOD method_45548 (Lnet/minecraft/class_5321;)Ljava/lang/String;
 		ARG 0 key
+	METHOD method_55604 (Lnet/minecraft/class_2378;Lnet/minecraft/class_8891;Lnet/minecraft/class_5321;)Ljava/util/Optional;
+		ARG 2 key
 	CLASS class_4181 ShapedPoolStructurePiece
 		FIELD comp_2018 pieceShape Lorg/apache/commons/lang3/mutable/MutableObject;
 		FIELD comp_2019 currentSize I

mappings/net/minecraft/text/MutableText.mapping

@@ -24,6 +24,7 @@ CLASS net/minecraft/class_5250 net/minecraft/text/MutableText
 			COMMENT a formatting
 	METHOD method_27693 append (Ljava/lang/String;)Lnet/minecraft/class_5250;
 		COMMENT Appends a literal text with content {@code text} to this text's siblings.
+		ARG 1 text
 	METHOD method_27694 styled (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_5250;
 		COMMENT Updates the style of this text.
 		COMMENT

mappings/net/minecraft/util/collection/BoundedRegionArray.mapping

@@ -0,0 +1,32 @@
+CLASS net/minecraft/class_9762 net/minecraft/util/collection/BoundedRegionArray
+	FIELD field_51878 minX I
+	FIELD field_51879 minZ I
+	FIELD field_51880 maxX I
+	FIELD field_51881 maxZ I
+	FIELD field_51882 array [Ljava/lang/Object;
+	METHOD <init> (IIIILnet/minecraft/class_9762$class_9763;)V
+		ARG 1 minX
+		ARG 2 minZ
+		ARG 3 maxX
+		ARG 4 maxZ
+		ARG 5 getter
+	METHOD method_60482 get (II)Ljava/lang/Object;
+		ARG 1 x
+		ARG 2 z
+	METHOD method_60483 create (IIILnet/minecraft/class_9762$class_9763;)Lnet/minecraft/class_9762;
+		ARG 0 centerX
+		ARG 1 centerZ
+		ARG 2 radius
+		ARG 3 getter
+	METHOD method_60484 forEach (Ljava/util/function/Consumer;)V
+		ARG 1 callback
+	METHOD method_60485 isWithinBounds (II)Z
+		ARG 1 x
+		ARG 2 z
+	METHOD method_60486 toIndex (II)I
+		ARG 1 x
+		ARG 2 z
+	CLASS class_9763 Getter
+		METHOD get (II)Ljava/lang/Object;
+			ARG 1 x
+			ARG 2 z

mappings/net/minecraft/util/function/Finishable.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_6613 net/minecraft/util/function/Finishable

mappings/net/minecraft/util/math/ChunkPos.mapping

@@ -63,6 +63,9 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos
 	METHOD method_52568 getSquaredDistance (II)I
 		ARG 1 x
 		ARG 2 z
+	METHOD method_60510 getChebyshevDistance (II)I
+		ARG 1 x
+		ARG 2 z
 	METHOD method_8323 getStartPos ()Lnet/minecraft/class_2338;
 	METHOD method_8324 toLong ()J
 		COMMENT {@return the chunk position serialized as {@code long}}

mappings/net/minecraft/util/profiling/jfr/Finishable.mapping

@@ -1 +0,0 @@
-CLASS net/minecraft/class_6613 net/minecraft/util/profiling/jfr/Finishable

mappings/net/minecraft/world/ChunkLoadingManager.mapping

@@ -0,0 +1,13 @@
+CLASS net/minecraft/class_9760 net/minecraft/world/ChunkLoadingManager
+	METHOD method_60441 release (Lnet/minecraft/class_9761;)V
+		ARG 1 chunkHolder
+	METHOD method_60442 generate (Lnet/minecraft/class_9761;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 chunkHolder
+		ARG 2 step
+		ARG 3 chunks
+	METHOD method_60443 createLoader (Lnet/minecraft/class_2806;Lnet/minecraft/class_1923;)Lnet/minecraft/class_9759;
+		ARG 1 requestedStatus
+		ARG 2 pos
+	METHOD method_60448 acquire (J)Lnet/minecraft/class_9761;
+		ARG 1 pos
+	METHOD method_60450 updateChunks ()V

mappings/net/minecraft/world/ChunkRegion.mapping

@@ -13,8 +13,12 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion
 	FIELD field_33756 currentlyGeneratingStructureName Ljava/util/function/Supplier;
 	FIELD field_35442 tickOrder Ljava/util/concurrent/atomic/AtomicLong;
 	FIELD field_38683 WORLDGEN_REGION_RANDOM_ID Lnet/minecraft/class_2960;
+	FIELD field_51876 generationStep Lnet/minecraft/class_9770;
 	METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_9762;Lnet/minecraft/class_9770;Lnet/minecraft/class_2791;)V
 		ARG 1 world
+		ARG 2 chunks
+		ARG 3 generationStep
+		ARG 4 centerPos
 	METHOD method_14337 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6763;
 		ARG 1 pos
 	METHOD method_14338 markBlockForPostProcessing (Lnet/minecraft/class_2338;)V

mappings/net/minecraft/world/chunk/AbstractChunkHolder.mapping

@@ -0,0 +1,71 @@
+CLASS net/minecraft/class_9761 net/minecraft/world/chunk/AbstractChunkHolder
+	FIELD field_51865 STATUSES Ljava/util/List;
+	FIELD field_51866 UNLOADED Lnet/minecraft/class_9259;
+	FIELD field_51867 UNLOADED_FUTURE Ljava/util/concurrent/CompletableFuture;
+	FIELD field_51868 pos Lnet/minecraft/class_1923;
+	FIELD field_51869 NOT_DONE Lnet/minecraft/class_9259;
+	FIELD field_51870 status Lnet/minecraft/class_2806;
+	FIELD field_51871 currentStatus Ljava/util/concurrent/atomic/AtomicReference;
+	FIELD field_51872 chunkFuturesByStatus Ljava/util/concurrent/atomic/AtomicReferenceArray;
+	FIELD field_51873 chunkLoader Ljava/util/concurrent/atomic/AtomicReference;
+	FIELD field_51874 refCount Ljava/util/concurrent/atomic/AtomicInteger;
+	METHOD <init> (Lnet/minecraft/class_1923;)V
+		ARG 1 pos
+	METHOD method_14005 getLevel ()I
+	METHOD method_17208 getCompletedLevel ()I
+	METHOD method_60452 unload (ILjava/util/concurrent/CompletableFuture;)V
+		ARG 1 statusIndex
+		ARG 2 previousFuture
+	METHOD method_60453 clearLoader (Lnet/minecraft/class_9759;)V
+		ARG 1 loader
+	METHOD method_60454 updateStatus (Lnet/minecraft/class_3898;)V
+		ARG 1 chunkLoadingManager
+	METHOD method_60455 createLoader (Lnet/minecraft/class_3898;Lnet/minecraft/class_2806;)V
+		ARG 1 chunkLoadingManager
+		ARG 2 requestedStatus
+	METHOD method_60456 replaceWith (Lnet/minecraft/class_2821;)V
+		ARG 1 chunk
+	METHOD method_60457 getUncheckedOrNull (Lnet/minecraft/class_2806;)Lnet/minecraft/class_2791;
+		ARG 1 requestedStatus
+	METHOD method_60458 load (Lnet/minecraft/class_2806;Lnet/minecraft/class_3898;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 requestedStatus
+		ARG 2 chunkLoadingManager
+	METHOD method_60459 completeChunkFuture (Lnet/minecraft/class_2806;Lnet/minecraft/class_2791;)V
+		ARG 1 status
+		ARG 2 chunk
+	METHOD method_60460 unload (Lnet/minecraft/class_2806;Lnet/minecraft/class_2806;)V
+		ARG 1 from
+		ARG 2 to
+	METHOD method_60461 generate (Lnet/minecraft/class_9770;Lnet/minecraft/class_9760;Lnet/minecraft/class_9762;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 step
+		ARG 2 chunkLoadingManager
+		ARG 3 chunks
+	METHOD method_60462 (Lnet/minecraft/class_9770;Lnet/minecraft/class_2791;Ljava/lang/Throwable;)Lnet/minecraft/class_9259;
+		ARG 2 chunk
+		ARG 3 throwable
+	METHOD method_60463 getOrNull (Lnet/minecraft/class_2806;)Lnet/minecraft/class_2791;
+		ARG 1 requestedStatus
+	METHOD method_60464 getOrCreateFuture (Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 status
+	METHOD method_60465 getMaxPendingStatus (Lnet/minecraft/class_2806;)Lnet/minecraft/class_2806;
+		ARG 1 checkUpperBound
+	METHOD method_60466 progressStatus (Lnet/minecraft/class_2806;)Z
+		COMMENT Progresses to {@code nextStatus} if that is actually the next status
+		COMMENT for the current status. Does nothing if {@code nextStatus} is the same as the
+		COMMENT current status (or earlier).
+		COMMENT
+		COMMENT @return whether the progress was made
+		COMMENT @throws IllegalStateException when skipping intermediate statuses between the
+		COMMENT current and {@code nextStatus}
+		ARG 1 nextStatus
+	METHOD method_60467 cannotBeLoaded (Lnet/minecraft/class_2806;)Z
+		ARG 1 status
+	METHOD method_60468 incrementRefCount ()V
+	METHOD method_60469 decrementRefCount ()V
+	METHOD method_60470 getRefCount ()I
+	METHOD method_60471 getLatest ()Lnet/minecraft/class_2791;
+	METHOD method_60472 getActualStatus ()Lnet/minecraft/class_2806;
+	METHOD method_60473 getPos ()Lnet/minecraft/class_1923;
+	METHOD method_60474 getLevelType ()Lnet/minecraft/class_3194;
+	METHOD method_60475 enumerateFutures ()Ljava/util/List;
+	METHOD method_60476 getLatestStatus ()Lnet/minecraft/class_2806;

mappings/net/minecraft/world/chunk/Chunk.mapping

@@ -125,4 +125,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk
 	METHOD method_51525 forEachBlockMatchingPredicate (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V
 		ARG 1 predicate
 		ARG 2 consumer
+	METHOD method_51526 getMaxStatus ()Lnet/minecraft/class_2806;
+		COMMENT {@retutn the chunk status or the target status for the retrogen, whichever is later}
 	CLASS class_6745 TickSchedulers

mappings/net/minecraft/world/chunk/ChunkGenerating.mapping

@@ -1,30 +1,73 @@
 CLASS net/minecraft/class_9310 net/minecraft/world/chunk/ChunkGenerating
 	METHOD method_57594 initializeLight (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
+		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
 	METHOD method_57595 isLightOn (Lnet/minecraft/class_2791;)Z
 		ARG 0 chunk
 	METHOD method_57596 noop (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
-		ARG 2 fullChunkConverter
+		ARG 1 step
+		ARG 2 chunks
 		ARG 3 chunk
 	METHOD method_57599 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791;
 		ARG 0 populated
 	METHOD method_57600 loadStructures (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
-		ARG 2 fullChunkConverter
+		ARG 1 step
+		ARG 2 chunks
 		ARG 3 chunk
 	METHOD method_57601 generateStructures (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
 	METHOD method_57603 generateStructureReferences (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
 	METHOD method_57605 populateBiomes (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
 	METHOD method_57607 populateNoise (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
 	METHOD method_57608 buildSurface (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
 	METHOD method_57609 carve (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
 	METHOD method_57610 generateFeatures (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
 	METHOD method_57613 generateEntities (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
+	METHOD method_60552 addEntities (Lnet/minecraft/class_3218;Ljava/util/List;)V
+		ARG 0 world
+		ARG 1 entities
+	METHOD method_60555 light (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
+		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk
+	METHOD method_60556 convertToFullChunk (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
+		ARG 0 context
+		ARG 1 step
+		ARG 2 chunks
+		ARG 3 chunk

mappings/net/minecraft/world/chunk/ChunkGenerationStep.mapping

@@ -0,0 +1,33 @@
+CLASS net/minecraft/class_9770 net/minecraft/world/chunk/ChunkGenerationStep
+	METHOD method_60557 (Lnet/minecraft/class_6613;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791;
+		ARG 2 generated
+	METHOD method_60558 finalizeGeneration (Lnet/minecraft/class_2791;Lnet/minecraft/class_6613;)Lnet/minecraft/class_2791;
+		ARG 1 chunk
+		ARG 2 finishCallback
+	METHOD method_60559 getAdditionalLevel (Lnet/minecraft/class_2806;)I
+		ARG 1 status
+	METHOD method_60560 run (Lnet/minecraft/class_9312;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 context
+		ARG 3 chunk
+	CLASS class_9771 Builder
+		FIELD field_51905 targetStatus Lnet/minecraft/class_2806;
+		FIELD field_51906 previousStep Lnet/minecraft/class_9770;
+		FIELD field_51907 directDependencies [Lnet/minecraft/class_2806;
+		FIELD field_51908 blockStateWriteRadius I
+		FIELD field_51909 task Lnet/minecraft/class_2807;
+		METHOD <init> (Lnet/minecraft/class_2806;)V
+			ARG 1 targetStatus
+		METHOD <init> (Lnet/minecraft/class_2806;Lnet/minecraft/class_9770;)V
+			ARG 1 blockStateWriteRadius
+			ARG 2 previousStep
+		METHOD method_60561 build ()Lnet/minecraft/class_9770;
+		METHOD method_60562 blockStateWriteRadius (I)Lnet/minecraft/class_9770$class_9771;
+			ARG 1 blockStateWriteRadius
+		METHOD method_60563 getParentStatus (Lnet/minecraft/class_2806;)I
+			ARG 1 status
+		METHOD method_60564 dependsOn (Lnet/minecraft/class_2806;I)Lnet/minecraft/class_9770$class_9771;
+			ARG 1 status
+			ARG 2 level
+		METHOD method_60565 task (Lnet/minecraft/class_2807;)Lnet/minecraft/class_9770$class_9771;
+			ARG 1 task
+		METHOD method_60566 accumulateDependencies ()[Lnet/minecraft/class_2806;

mappings/net/minecraft/world/chunk/ChunkGenerationSteps.mapping

@@ -0,0 +1,59 @@
+CLASS net/minecraft/class_9768 net/minecraft/world/chunk/ChunkGenerationSteps
+	FIELD field_51900 GENERATION Lnet/minecraft/class_9768;
+	FIELD field_51901 LOADING Lnet/minecraft/class_9768;
+	METHOD method_60518 get (Lnet/minecraft/class_2806;)Lnet/minecraft/class_9770;
+		ARG 1 status
+	METHOD method_60519 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60520 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60521 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60522 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60523 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60524 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60525 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60526 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60527 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60528 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60529 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60530 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60531 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60532 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60533 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60534 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60535 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60536 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60537 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60538 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60539 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60540 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60541 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	METHOD method_60542 (Lnet/minecraft/class_9770$class_9771;)Lnet/minecraft/class_9770$class_9771;
+		ARG 0 builder
+	CLASS class_9769 Builder
+		FIELD field_51902 steps Ljava/util/List;
+		METHOD method_60543 build ()Lnet/minecraft/class_9768;
+		METHOD method_60544 then (Lnet/minecraft/class_2806;Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_9768$class_9769;
+			ARG 1 status
+			ARG 2 stepFactory

mappings/net/minecraft/world/chunk/ChunkLoader.mapping

@@ -0,0 +1,38 @@
+CLASS net/minecraft/class_9759 net/minecraft/world/chunk/ChunkLoader
+	FIELD field_51850 targetStatus Lnet/minecraft/class_2806;
+	FIELD field_51851 chunkLoadingManager Lnet/minecraft/class_9760;
+	FIELD field_51852 pos Lnet/minecraft/class_1923;
+	FIELD field_51853 currentlyLoadingStatus Lnet/minecraft/class_2806;
+	FIELD field_51854 pendingDisposal Z
+	FIELD field_51855 futures Ljava/util/List;
+	FIELD field_51856 chunks Lnet/minecraft/class_9762;
+	FIELD field_51857 allowGeneration Z
+	METHOD <init> (Lnet/minecraft/class_9760;Lnet/minecraft/class_2806;Lnet/minecraft/class_1923;Lnet/minecraft/class_9762;)V
+		ARG 1 chunkLoadingManager
+		ARG 2 targetStatus
+		ARG 3 pos
+		ARG 4 chunks
+	METHOD method_60424 run ()Ljava/util/concurrent/CompletableFuture;
+	METHOD method_60425 (Lnet/minecraft/class_9760;II)Lnet/minecraft/class_9761;
+		ARG 1 x
+		ARG 2 z
+	METHOD method_60426 create (Lnet/minecraft/class_9760;Lnet/minecraft/class_2806;Lnet/minecraft/class_1923;)Lnet/minecraft/class_9759;
+		ARG 0 chunkLoadingManager
+		ARG 1 targetStatus
+		ARG 2 pos
+	METHOD method_60427 loadAll (Lnet/minecraft/class_2806;Z)V
+		ARG 1 targetStatus
+		ARG 2 allowGeneration
+	METHOD method_60428 load (Lnet/minecraft/class_2806;ZLnet/minecraft/class_9761;)Z
+		ARG 1 targetStatus
+		ARG 2 allowGeneration
+		ARG 3 chunkHolder
+	METHOD method_60429 markPendingDisposal ()V
+	METHOD method_60430 getAdditionalLevel (Lnet/minecraft/class_2806;Z)I
+		ARG 1 status
+		ARG 2 generate
+	METHOD method_60431 getHolder ()Lnet/minecraft/class_9761;
+	METHOD method_60432 loadNextStatus ()V
+	METHOD method_60433 dispose ()V
+	METHOD method_60434 isGenerationUnnecessary ()Z
+	METHOD method_60435 getLatestPendingFuture ()Ljava/util/concurrent/CompletableFuture;

mappings/net/minecraft/world/chunk/ChunkStatus.mapping

@@ -3,14 +3,33 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus
 	FIELD field_12793 heightMapTypes Ljava/util/EnumSet;
 	FIELD field_16646 index I
 	FIELD field_16647 previous Lnet/minecraft/class_2806;
+	FIELD field_51903 NORMAL_HEIGHTMAP_TYPES Ljava/util/EnumSet;
+	FIELD field_51904 WORLD_GEN_HEIGHTMAP_TYPES Ljava/util/EnumSet;
 	METHOD <init> (Lnet/minecraft/class_2806;Ljava/util/EnumSet;Lnet/minecraft/class_2808;)V
 		ARG 1 previous
+		ARG 2 heightMapTypes
+		ARG 3 chunkType
 	METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet;
 	METHOD method_12164 getChunkType ()Lnet/minecraft/class_2808;
 	METHOD method_12165 isAtLeast (Lnet/minecraft/class_2806;)Z
-		ARG 1 chunkStatus
+		ARG 1 other
 	METHOD method_12168 byId (Ljava/lang/String;)Lnet/minecraft/class_2806;
 		ARG 0 id
 	METHOD method_16558 createOrderedList ()Ljava/util/List;
 	METHOD method_16559 getIndex ()I
 	METHOD method_16560 getPrevious ()Lnet/minecraft/class_2806;
+	METHOD method_60545 max (Lnet/minecraft/class_2806;Lnet/minecraft/class_2806;)Lnet/minecraft/class_2806;
+		ARG 0 a
+		ARG 1 b
+	METHOD method_60546 register (Ljava/lang/String;Lnet/minecraft/class_2806;Ljava/util/EnumSet;Lnet/minecraft/class_2808;)Lnet/minecraft/class_2806;
+		ARG 0 id
+		ARG 1 previous
+		ARG 2 heightMapTypes
+		ARG 3 chunkType
+	METHOD method_60547 isLaterThan (Lnet/minecraft/class_2806;)Z
+		ARG 1 other
+	METHOD method_60548 isAtMost (Lnet/minecraft/class_2806;)Z
+		ARG 1 other
+	METHOD method_60549 isEarlierThan (Lnet/minecraft/class_2806;)Z
+		ARG 1 other
+	METHOD method_60550 getId ()Ljava/lang/String;

mappings/net/minecraft/world/chunk/GenerationDependencies.mapping

@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_9767 net/minecraft/world/chunk/GenerationDependencies
+	FIELD field_51898 dependencies Lcom/google/common/collect/ImmutableList;
+	FIELD field_51899 additionalLevelsByStatus [I
+	METHOD <init> (Lcom/google/common/collect/ImmutableList;)V
+		ARG 1 dependencies
+	METHOD method_60513 getDependencies ()Lcom/google/common/collect/ImmutableList;
+	METHOD method_60514 get (I)Lnet/minecraft/class_2806;
+		ARG 1 index
+	METHOD method_60515 getAdditionalLevel (Lnet/minecraft/class_2806;)I
+		ARG 1 status
+	METHOD method_60516 size ()I
+	METHOD method_60517 getMaxLevel ()I

mappings/net/minecraft/world/chunk/GenerationTask.mapping

@@ -2,3 +2,5 @@ CLASS net/minecraft/class_2807 net/minecraft/world/chunk/GenerationTask
 	COMMENT A task called when a chunk needs to be generated.
 	METHOD doWork (Lnet/minecraft/class_9312;Lnet/minecraft/class_9770;Lnet/minecraft/class_9762;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
+		ARG 2 step
+		ARG 4 chunk

mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping

@@ -13,6 +13,10 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 2 generationSettingsGetter
 	METHOD method_12088 populateNoise (Lnet/minecraft/class_6748;Lnet/minecraft/class_7138;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
 		COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config.
+		ARG 1 blender
+		ARG 2 noiseConfig
+		ARG 3 structureAccessor
+		ARG 4 chunk
 	METHOD method_12098 getBiomeSource ()Lnet/minecraft/class_1966;
 	METHOD method_12100 getSpawnHeight (Lnet/minecraft/class_5539;)I
 		ARG 1 world
@@ -110,13 +114,17 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
 	METHOD method_38268 (Lnet/minecraft/class_3195;)Ljava/lang/Integer;
 		ARG 0 structureType
 	METHOD method_38275 populateBiomes (Lnet/minecraft/class_7138;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 noiseConfig
+		ARG 2 blender
+		ARG 3 structureAccessor
+		ARG 4 chunk
 	METHOD method_39301 getCodecKey ()Ljava/util/Optional;
 	METHOD method_39462 getBlockBoxForChunk (Lnet/minecraft/class_2791;)Lnet/minecraft/class_3341;
 		ARG 0 chunk
 	METHOD method_39787 (Lnet/minecraft/class_5281;Ljava/util/Set;Lnet/minecraft/class_1923;)V
-		ARG 0 pos
+		ARG 2 pos
 	METHOD method_39788 (Lit/unimi/dsi/fastutil/ints/IntSet;Lnet/minecraft/class_7510$class_6827;Lnet/minecraft/class_6796;)V
-		ARG 0 feature
+		ARG 2 feature
 	METHOD method_40146 locateRandomSpreadStructure (Ljava/util/Set;Lnet/minecraft/class_4538;Lnet/minecraft/class_5138;IIIZJLnet/minecraft/class_6872;)Lcom/mojang/datafixers/util/Pair;
 		ARG 0 structures
 		ARG 1 world