Merge branch 'pull/454' into 19w06a

# Conflicts:
#	mappings/net/minecraft/client/render/WorldRenderer.mapping
#	mappings/net/minecraft/server/world/ServerWorld.mapping

mappings/cck.mapping

@@ -1,5 +0,0 @@
-CLASS cck
-	METHOD a (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream;
-		ARG 1 world
-		ARG 2 generator
-		ARG 3 random

mappings/cgx.mapping

@@ -1,2 +0,0 @@
-CLASS cgx
-	FIELD a INSTANCE Lcgx;

mappings/cgy.mapping

@@ -1,3 +0,0 @@
-CLASS cgy
-	FIELD a INSTANCE Lcgy;
-	FIELD b MUSHROOM_FIELDS_ID I

mappings/chj.mapping

@@ -1,2 +0,0 @@
-CLASS chj
-	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;

mappings/chm.mapping

@@ -1,3 +0,0 @@
-CLASS chm
-	FIELD a INSTANCE Lchm;
-	FIELD b RIVER_ID I

mappings/chy.mapping

@@ -1,2 +0,0 @@
-CLASS chy
-	METHOD a sample (Lcgs;I)I

mappings/chz.mapping

@@ -1,8 +0,0 @@
-CLASS chz
-	METHOD a sample (Lcgs;IIIII)I
-		ARG 1 context
-		ARG 2 up
-		ARG 3 right
-		ARG 4 down
-		ARG 5 left
-		ARG 6 self

mappings/cmq.mapping

@@ -1,2 +0,0 @@
-CLASS cmq
-	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;

mappings/cmr.mapping

@@ -1,5 +0,0 @@
-CLASS cmr
-	CLASS cmr$a
-		FIELD a trigerTime J
-		FIELD c name Ljava/lang/String;
-	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;

mappings/net/minecraft/block/Block.mapping

@@ -195,6 +195,8 @@ CLASS bhv net/minecraft/block/Block
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
+		ARG 4 type
+		ARG 5 data
 	METHOD a onEntityCollision (Lbqs;Lbcu;Let;Lahi;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/BlockState.mapping

@@ -43,6 +43,8 @@ CLASS bqs net/minecraft/block/BlockState
 	METHOD a onBlockAction (Lbcu;Let;II)Z
 		ARG 1 world
 		ARG 2 pos
+		ARG 3 type
+		ARG 4 data
 	METHOD a onEntityCollision (Lbcu;Let;Lahi;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -136,6 +136,7 @@ CLASS cqg net/minecraft/client/MinecraftClient
 	METHOD aB drawProfilerResults ()V
 	METHOD aC doAttack ()V
 	METHOD aD doItemUse ()V
+	METHOD aE handleInputEvents ()V
 	METHOD aF doItemPick ()V
 	METHOD aG getCurrentAction ()Ljava/lang/String;
 	METHOD aa getMetricsData ()Lyx;

mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping

@@ -8,6 +8,7 @@ CLASS ctu net/minecraft/client/gui/menu/CustomizeFlatLevelScreen
 		METHOD e (IIII)V
 			ARG 1 y
 	FIELD a parent Lcxx;
+	FIELD f config Lcas;
 	FIELD g titleText Ljava/lang/String;
 	FIELD h tileText Ljava/lang/String;
 	FIELD i heightText Ljava/lang/String;

mappings/net/minecraft/client/network/packet/BlockActionS2CPacket.mapping

@@ -1,13 +1,14 @@
 CLASS ke net/minecraft/client/network/packet/BlockActionS2CPacket
 	FIELD a pos Let;
-	FIELD b arg1 I
+	FIELD b type I
-	FIELD c arg2 I
+	FIELD c data I
 	FIELD d block Lbhv;
 	METHOD <init> (Let;Lbhv;II)V
 		ARG 1 pos
 		ARG 2 block
-		ARG 3 arg1
+		ARG 3 type
+		ARG 4 data
 	METHOD b getPos ()Let;
-	METHOD c getArgumentFirst ()I
+	METHOD c getType ()I
-	METHOD d getArgumentSecond ()I
+	METHOD d getData ()I
 	METHOD e getBlock ()Lbhv;

mappings/net/minecraft/client/render/WorldRenderer.mapping

@@ -62,7 +62,9 @@ CLASS dfo net/minecraft/client/render/WorldRenderer
 		ARG 1 tickDelta
 	METHOD a renderClouds (FDDD)V
 		ARG 1 tickDelta
+	METHOD a scheduleBlockRender (IIIIII)V
 	METHOD a scheduleChunkRender (IIIZ)V
+	METHOD a playGlobalEvent (ILet;I)V
 	METHOD a updateChunks (J)V
 	METHOD a renderWorldBorder (Lahi;F)V
 		ARG 1 camera
@@ -77,6 +79,11 @@ CLASS dfo net/minecraft/client/render/WorldRenderer
 	METHOD a renderEntities (Lahi;Ldim;F)V
 		ARG 1 cameraEntity
 		ARG 3 tickDelta
+	METHOD a playLevelEvent (Lars;ILet;I)V
+		ARG 1 source
+		ARG 2 type
+		ARG 3 pos
+		ARG 4 data
 	METHOD a renderLayer (Lbcg;)V
 		ARG 1 layer
 	METHOD a renderLayer (Lbcg;DLahi;)I
@@ -127,6 +134,25 @@ CLASS dfo net/minecraft/client/render/WorldRenderer
 		ARG 8 velocityX
 		ARG 10 velocityY
 		ARG 12 velocityZ
+	METHOD a addParticle (Lft;ZDDDDDD)V
+		ARG 1 parameters
+		ARG 2 shouldAlwaysSpawn
+		ARG 3 x
+		ARG 5 y
+		ARG 7 z
+		ARG 9 velocityX
+		ARG 11 velocityY
+		ARG 13 velocityZ
+	METHOD a addParticle (Lft;ZZDDDDDD)V
+		ARG 1 parameters
+		ARG 2 shouldAlwaysSpawn
+		ARG 3 isImportant
+		ARG 4 x
+		ARG 6 y
+		ARG 8 z
+		ARG 10 velocityX
+		ARG 12 velocityY
+		ARG 14 velocityY
 	METHOD a getRandomParticleSpawnChance (Z)I
 		ARG 1 canSpawnOnMinimal
 	METHOD b drawEntityOutlinesFramebuffer ()V
@@ -141,6 +167,7 @@ CLASS dfo net/minecraft/client/render/WorldRenderer
 		ARG 13 green
 		ARG 14 blue
 		ARG 15 alpha
+	METHOD b setBlockBreakingProgress (ILet;I)V
 	METHOD b drawBox (Lcmu;FFFF)V
 		ARG 0 box
 		ARG 1 red

mappings/net/minecraft/client/world/ClientWorld.mapping

@@ -1,7 +1,11 @@
 CLASS dcm net/minecraft/client/world/ClientWorld
 	FIELD B ticksSinceLightingClient I
 	FIELD C scoreboard Lcnz;
+	FIELD D mapStates Ljava/util/Map;
+	FIELD a globalEntities Ljava/util/List;
+	FIELD b regularEntities Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD w netHandler Ldcj;
+	FIELD x worldRenderer Ldfo;
 	FIELD y client Lcqg;
 	METHOD <init> (Ldcj;Lbcy;Lbtl;Lagb;Lafj;Ldfo;)V
 		ARG 1 netHandler
@@ -26,4 +30,5 @@ CLASS dcm net/minecraft/client/world/ClientWorld
 		ARG 4 volume
 		ARG 5 pitch
 		ARG 6 useDistance
+	METHOD b getEntities ()Ljava/lang/Iterable;
 	METHOD l getChunkProvider ()Ldch;

mappings/net/minecraft/entity/Entity.mapping

@@ -329,6 +329,7 @@ CLASS ahi net/minecraft/entity/Entity
 	METHOD q canAddPassenger (Lahi;)Z
 	METHOD r isTeammate (Lahi;)Z
 	METHOD s isPartOf (Lahi;)Z
+	METHOD t isSpectator ()Z
 	METHOD u setPositionAndAngles (Lahi;)V
 	METHOD u_ initDataTracker ()V
 	METHOD w hasPassenger (Lahi;)Z

mappings/net/minecraft/entity/player/PlayerEntity.mapping

@@ -79,6 +79,7 @@ CLASS ars net/minecraft/entity/player/PlayerEntity
 	METHOD a resetStat (Lyc;)V
 	METHOD a incrementStat (Lyc;I)V
 		ARG 1 stat
+	METHOD a wakeUp (ZZZ)V
 	METHOD a unlockRecipes ([Lqd;)V
 		ARG 1 ids
 	METHOD b addEnchantedHitParticles (Lahi;)V
@@ -107,8 +108,10 @@ CLASS ars net/minecraft/entity/player/PlayerEntity
 	METHOD dR getLuck ()F
 	METHOD dp updateSize ()V
 	METHOD dq getScore ()I
+	METHOD ds getWornArmorRatio ()F
 	METHOD du requestRespawn ()V
 	METHOD dw getGameProfile ()Lcom/mojang/authlib/GameProfile;
+	METHOD dy isSleepingLongEnough ()Z
 	METHOD dz getSleepTimer ()I
 	METHOD f attack (Lahi;)V
 	METHOD g createCooldownManager ()Laxi;

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

@@ -1,4 +1,16 @@
 CLASS bce net/minecraft/server/world/BlockAction
+	FIELD a pos Let;
+	FIELD b block Lbhv;
+	FIELD c type I
+	FIELD d data I
+	METHOD <init> (Let;Lbhv;II)V
+		ARG 1 pos
+		ARG 2 block
+		ARG 3 type
+		ARG 4 data
 	METHOD a getPos ()Let;
+	METHOD b getBlock ()Lbhv;
+	METHOD c getType ()I
+	METHOD d getData ()I
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o

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

@@ -7,7 +7,7 @@ CLASS uq net/minecraft/server/world/ServerChunkManager
 	FIELD f world Lur;
 	FIELD g serverThread Ljava/lang/Thread;
 	FIELD h lightProvider Luu;
-	FIELD i genQueue Ljava/util/Queue;
+	FIELD i taskQueue Ljava/util/Queue;
 	FIELD j players Luo;
 	FIELD k threadedAnvilChunkStorage Luf;
 	FIELD l persistentStateManager Lcje;
@@ -62,6 +62,7 @@ CLASS uq net/minecraft/server/world/ServerChunkManager
 		ARG 4 create
 	METHOD c updateChunkWatchingForPlayer (Lus;)V
 		ARG 1 playerEntity
+	METHOD d executeQueuedTask ()Z
 	METHOD d doesNotGenerateChunks (Lus;)Z
 		ARG 1 player
 	METHOD g getLoadedChunkCount ()I

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

@@ -1,30 +1,61 @@
 CLASS ur net/minecraft/server/world/ServerWorld
+	FIELD A blockEntitiesToUnload Ljava/util/List;
 	FIELD B server Lnet/minecraft/server/MinecraftServer;
+	FIELD C worldSaveHandler Lcjg;
 	FIELD D entityTracker Lum;
 	FIELD E entitiesByUuid Ljava/util/Map;
+	FIELD F allPlayersSleeping Z
 	FIELD G idleTimeout I
 	FIELD H portalForcer Lbdf;
 	FIELD I blockTickScheduler Lbdh;
 	FIELD J fluidTickScheduler Lbdh;
 	FIELD L pendingBlockActions Lit/unimi/dsi/fastutil/objects/ObjectLinkedOpenHashSet;
+	FIELD M insideTick Z
 	FIELD a savingDisabled Z
 	FIELD v LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD w globalEntities Ljava/util/List;
+	FIELD x regularEntities Ljava/util/List;
+	FIELD y entitiesById Lzb;
+	FIELD z entitiesToUnload Ljava/util/List;
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lcjg;Lcjf;Lbtl;Lafj;Lvb;)V
 		ARG 1 server
+		ARG 3 worldSaveHandler
+		ARG 4 properties
+		ARG 5 dimensionType
+		ARG 6 profiler
+		ARG 7 worldGenerationProgressListener
+	METHOD A checkSessionLock ()V
+	METHOD B getSaveHandler ()Lcjg;
 	METHOD C getPersistentStateManager ()Lcje;
 	METHOD E getForcedChunks ()Lit/unimi/dsi/fastutil/longs/LongSet;
+	METHOD a getChunkSyncIfServerThread (IIZ)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 x
+		ARG 2 z
+		ARG 3 create
+	METHOD a addLightning (Lapj;)Z
 	METHOD a init (Lbcy;)V
 		ARG 1 levelInfo
+	METHOD a unloadBlockEntity (Lbow;)V
+	METHOD a unloadEntities (Ljava/util/Collection;)V
 	METHOD a save (Lzg;ZZ)V
 		ARG 1 progressListener
+	METHOD ag resetWeather ()V
 	METHOD ai shouldSpawnNpcs ()Z
 	METHOD aj shouldSpawnAnimals ()Z
 	METHOD ak sendBlockActions ()V
+	METHOD b isInsideTick ()Z
 	METHOD b setChunkForced (IIZ)Z
 		ARG 1 x
 		ARG 2 z
-		ARG 3 force
+		ARG 3 forced
 	METHOD d getScoreboard ()Lqs;
+	METHOD e onSkippedToMorning ()V
+	METHOD f shouldSkipToMorning ()Z
+	METHOD i_ updatePlayersSleeping ()V
+	METHOD j resetIdleTimeout ()V
+	METHOD j removeEntityIfInvalid (Lahi;)Z
+		ARG 1 entity
+	METHOD k_ tickEntities ()V
 	METHOD l placeBonusChest ()V
 	METHOD m_ tickScheduledTicks ()V
 	METHOD n saveLevel ()V

mappings/net/minecraft/util/EightWayDirection.mapping

@@ -1,4 +1,4 @@
-CLASS ez
+CLASS ez net/minecraft/util/EightWayDirection
 	FIELD i NORTHWEST_BIT I
 	FIELD j WEST_BIT I
 	FIELD k SOUTHWEST_BIT I

mappings/net/minecraft/util/IntHashMap.mapping

@@ -3,19 +3,42 @@ CLASS zb net/minecraft/util/IntHashMap
 		FIELD a key I
 		FIELD b value Ljava/lang/Object;
 		FIELD c next Lzb$a;
+		METHOD <init> (IILjava/lang/Object;Lzb$a;)V
+			ARG 2 key
+			ARG 3 value
+			ARG 4 next
 		METHOD a getKey ()I
 		METHOD b getValue ()Ljava/lang/Object;
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
-	FIELD a entries [Lzb$a;
+	FIELD a buckets [Lzb$a;
+	FIELD b size I
+	FIELD c threshold I
+	FIELD d loadFactor F
 	METHOD a get (I)Ljava/lang/Object;
-	METHOD a modulo2 (II)I
+		ARG 1 key
-		ARG 0 value
+	METHOD a getBucketIndex (II)I
+		ARG 0 key
+		ARG 1 bucketCount
+	METHOD a addEntry (IILjava/lang/Object;I)V
+		ARG 1 hashCode
+		ARG 2 key
+		ARG 3 value
+		ARG 4 index
 	METHOD a put (ILjava/lang/Object;)V
 		ARG 1 key
+		ARG 2 value
 	METHOD a copyEntriesTo ([Lzb$a;)V
+		ARG 1 entries
 	METHOD b containsKey (I)Z
+		ARG 1 key
 	METHOD c clear ()V
 	METHOD c getEntry (I)Lzb$a;
+		ARG 1 key
+	METHOD d remove (I)Ljava/lang/Object;
+	METHOD e removeAndGetEntry (I)Lzb$a;
+		ARG 1 key
 	METHOD g hash (I)I
+		ARG 0 key
 	METHOD h resize (I)V
+		ARG 1 minimumCapacity

mappings/net/minecraft/util/MaterialPredicate.mapping

@@ -0,0 +1,5 @@
+CLASS bra net/minecraft/util/MaterialPredicate
+	FIELD a IS_AIR Lbra;
+	FIELD b material Lcgi;
+	METHOD a create (Lcgi;)Lbra;
+		ARG 0 material

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

@@ -27,9 +27,9 @@ CLASS et net/minecraft/util/math/BlockPos
 			ARG 6 endZ
 		METHOD a step ()Z
 	CLASS et$b Mutable
-		FIELD b xMut I
+		FIELD b x I
-		FIELD c yMut I
+		FIELD c y I
-		FIELD d zMut I
+		FIELD d z I
 		METHOD <init> (III)V
 			ARG 1 y
 			ARG 2 z
@@ -38,6 +38,9 @@ CLASS et net/minecraft/util/math/BlockPos
 		METHOD c setOffset (Ley;)Let$b;
 		METHOD c setOffset (Ley;I)Let$b;
 		METHOD d set (III)Let$b;
+			ARG 1 x
+			ARG 2 y
+			ARG 3 z
 		METHOD e setOffset (III)Let$b;
 		METHOD g set (Lfn;)Let$b;
 		METHOD i setFromLong (J)Let$b;

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

@@ -1,5 +0,0 @@
-CLASS cic net/minecraft/util/math/CoordinateTransformer
-	METHOD a transformX (I)I
-		ARG 1 x
-	METHOD b transformY (I)I
-		ARG 1 y

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

@@ -46,6 +46,7 @@ CLASS ey net/minecraft/util/math/Direction
 	FIELD m vector Lfn;
 	FIELD n ALL [Ley;
 	FIELD o NAME_MAP Ljava/util/Map;
+	FIELD p ID_TO_DIRECTION [Ley;
 	FIELD q HORIZONTAL [Ley;
 	METHOD <init> (Ljava/lang/String;IIIILjava/lang/String;Ley$b;Ley$a;Lfn;)V
 		ARG 3 id

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

@@ -1 +0,0 @@
-CLASS cib net/minecraft/util/math/NorthWestCoordinateTransformer

mappings/net/minecraft/world/Difficulty.mapping

@@ -3,12 +3,15 @@ CLASS agb net/minecraft/world/Difficulty
 	FIELD b EASY Lagb;
 	FIELD c NORMAL Lagb;
 	FIELD d HARD Lagb;
-	FIELD e difficultyId [Lagb;
+	FIELD e DIFFICULTIES [Lagb;
 	FIELD f id I
 	FIELD g translationKey Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
 		ARG 3 id
 	METHOD a getId ()I
-	METHOD a byId (I)Lagb;
+	METHOD a getDifficulty (I)Lagb;
-		ARG 0 id
+		ARG 0 difficulty
+	METHOD a getDifficulty (Ljava/lang/String;)Lagb;
+		ARG 0 translationKey
+	METHOD b toTextComponent ()Ljc;
 	METHOD c getTranslationKey ()Ljava/lang/String;

mappings/net/minecraft/world/EntityView.mapping

@@ -3,4 +3,7 @@ CLASS bcm net/minecraft/world/EntityView
 	METHOD a getEntities (Lahi;Lcmu;Ljava/util/function/Predicate;)Ljava/util/List;
 		ARG 1 entity
 		ARG 2 boundingBox
+	METHOD a (Lahi;Lcnt;)Z
+		ARG 1 entity
+		ARG 2 shape
 	METHOD a getCollidingEntityBoundingBoxesForEntity (Lahi;Lcnt;Ljava/util/Set;)Ljava/util/stream/Stream;

mappings/net/minecraft/world/IdCountsState.mapping

@@ -0,0 +1,3 @@
+CLASS ciz net/minecraft/world/IdCountsState
+	FIELD a idCounts Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	METHOD a getNextMapId ()I

mappings/net/minecraft/world/PersistentStateManager.mapping

@@ -1,6 +1,17 @@
 CLASS cje net/minecraft/world/PersistentStateManager
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD b keyToState Ljava/util/Map;
+	FIELD b loadedStates Ljava/util/Map;
+	FIELD c dataFixer Lcom/mojang/datafixers/DataFixer;
+	FIELD d directory Ljava/io/File;
+	METHOD <init> (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V
+		ARG 1 directory
+		ARG 2 dataFixer
 	METHOD a save ()V
 	METHOD a set (Lciv;)V
+	METHOD a getFile (Ljava/lang/String;)Ljava/io/File;
+		ARG 1 id
+	METHOD a getOrCreate (Ljava/util/function/Supplier;Ljava/lang/String;)Lciv;
+		ARG 1 factory
 	METHOD b get (Ljava/util/function/Supplier;Ljava/lang/String;)Lciv;
+		ARG 1 factory
+		ARG 2 id

mappings/net/minecraft/world/WanderingTraderManager.mapping

@@ -0,0 +1,3 @@
+CLASS arn net/minecraft/world/WanderingTraderManager
+	FIELD a random Ljava/util/Random;
+	FIELD b world Lbcu;

mappings/net/minecraft/world/World.mapping

@@ -1,5 +1,6 @@
 CLASS bcu net/minecraft/world/World
-	FIELD a FACING_VALUES [Ley;
+	FIELD A wanderingTraderManager Larn;
+	FIELD a DIRECTIONS [Ley;
 	FIELD b unusedWhite J
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD d blockEntities Ljava/util/List;
@@ -22,9 +23,16 @@ CLASS bcu net/minecraft/world/World
 	FIELD u iteratingTickingBlockEntities Z
 	FIELD v thread Ljava/lang/Thread;
 	FIELD w ambientDarkness I
-	FIELD x ticksSinceLightningClient I
+	FIELD x ticksSinceLightning I
 	FIELD y profiler Lafj;
 	FIELD z border Lbse;
+	METHOD <init> (Lcjf;Lbtl;Ljava/util/function/BiFunction;Lafj;Z)V
+		ARG 1 levelProperties
+		ARG 2 dimensionType
+		ARG 3 chunkManagerProvider
+		ARG 4 profiler
+		ARG 5 isClient
+	METHOD D getNextMapId ()I
 	METHOD D getPendingBlockEntity (Let;)Lbow;
 	METHOD F getScoreboard ()Lcnz;
 	METHOD L isDaylight ()Z
@@ -32,13 +40,16 @@ CLASS bcu net/minecraft/world/World
 	METHOD N updateAmbientDarkness ()V
 	METHOD O initWeatherGradients ()V
 	METHOD P getGeneratorType ()Lbdb;
+	METHOD Q getRandomPlayer ()Lars;
+	METHOD R disconnect ()V
 	METHOD S getTime ()J
 	METHOD T getTimeOfDay ()J
 	METHOD U getGameRules ()Lbcq;
 	METHOD V isThundering ()Z
 	METHOD W isRaining ()Z
 	METHOD X getEffectiveHeight ()I
-	METHOD Z getTicksSinceLightningClient ()I
+	METHOD Y getHorizonHeight ()D
+	METHOD Z getTicksSinceLightning ()I
 	METHOD a tickTime ()V
 	METHOD a findClosestVisiblePlayer (DDD)Lars;
 		ARG 1 x
@@ -53,10 +64,14 @@ CLASS bcu net/minecraft/world/World
 		ARG 9 velocityY
 		ARG 11 velocityZ
 		ARG 13 tag
-	METHOD a (DDDDDLjava/util/function/Function;Ljava/util/function/Predicate;)Lars;
+	METHOD a findMobAttackTarget (DDDDDLjava/util/function/Function;Ljava/util/function/Predicate;)Lars;
 		ARG 1 x
 		ARG 3 y
 		ARG 5 z
+		ARG 7 baseHorizontalDistanceLimit
+		ARG 9 yDistanceLimit
+		ARG 11 horizontalDistanceLimitMultiplierProvider
+		ARG 12 predicate
 	METHOD a playSound (DDDLxv;Lxx;FFZ)V
 		ARG 1 x
 		ARG 3 y
@@ -70,14 +85,20 @@ CLASS bcu net/minecraft/world/World
 		ARG 3 z
 	METHOD a setBlockBreakingProgress (ILet;I)V
 	METHOD a setTime (J)V
+	METHOD a tickEntity (Lahi;)V
 	METHOD a summonParticle (Lahi;B)V
-	METHOD a (Lahi;DD)Lars;
+	METHOD a findMobAttackTarget (Lahi;DD)Lars;
 		ARG 1 entity
+		ARG 2 baseHorizontalDistanceLimit
+		ARG 4 yDistanceLimit
 	METHOD a createExplosion (Lahi;DDDFZ)Lbcn;
 		ARG 1 entity
 		ARG 2 x
 		ARG 4 y
 	METHOD a createExplosion (Lahi;DDDFZZ)Lbcn;
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
 	METHOD a getSkyColor (Lahi;F)Lcmz;
 		ARG 1 entity
 	METHOD a createExplosion (Lahi;Lags;DDDFZZ)Lbcn;
@@ -90,19 +111,34 @@ CLASS bcu net/minecraft/world/World
 		ARG 2 x
 		ARG 4 y
 		ARG 6 z
-	METHOD a fireWorldEvent (Lars;ILet;I)V
+	METHOD a playEvent (Lars;ILet;I)V
+		ARG 1 source
+		ARG 2 type
+		ARG 3 pos
+		ARG 4 data
 	METHOD a playSoundFromEntity (Lars;Lahi;Lxv;Lxx;FF)V
 	METHOD a canPlayerModifyAt (Lars;Let;)Z
 		ARG 1 player
 	METHOD a addDetailsToCrashReport (Lb;)Lc;
 		ARG 1 report
+	METHOD a putMapState (Lcja;)V
+		ARG 1 mapState
 	METHOD a isAreaNotEmpty (Lcmu;)Z
-	METHOD a (Let;DD)Lars;
+	METHOD a getBlockState (Lcmu;Lbhv;)Lbqs;
+		ARG 1 area
+		ARG 2 block
+	METHOD a containsBlockWithMaterial (Lcmu;Lcgi;)Z
+		ARG 1 area
+		ARG 2 material
+	METHOD a findMobAttackTarget (Let;DD)Lars;
 		ARG 1 pos
+		ARG 2 baseHorizontalDistanceLimit
+		ARG 4 yDistanceLimit
 	METHOD a addBlockAction (Let;Lbhv;II)V
 		ARG 1 pos
 		ARG 2 block
-		ARG 3 first
+		ARG 3 type
+		ARG 4 data
 	METHOD a updateNeighbor (Let;Lbhv;Let;)V
 		ARG 1 pos
 		ARG 2 sourceBlock
@@ -126,6 +162,8 @@ CLASS bcu net/minecraft/world/World
 	METHOD a getClosestVisibleEntityTo (Ljava/lang/Class;Lcmu;Lahi;)Lahi;
 		ARG 1 clazz
 		ARG 2 area
+	METHOD a getMapState (Ljava/lang/String;)Lcja;
+		ARG 1 id
 	METHOD a locateStructure (Ljava/lang/String;Let;IZ)Let;
 		ARG 1 id
 		ARG 2 center
@@ -133,6 +171,7 @@ CLASS bcu net/minecraft/world/World
 		ARG 4 skipExistingChunks
 	METHOD a tick (Ljava/util/function/BooleanSupplier;)V
 	METHOD a sendPacket (Ljq;)V
+		ARG 1 packet
 	METHOD a setMobSpawnOptions (ZZ)V
 		ARG 1 spawnMonsters
 		ARG 2 spawnAnimals
@@ -147,8 +186,13 @@ CLASS bcu net/minecraft/world/World
 		ARG 1 delta
 	METHOD b isHeightInvalid (I)Z
 		ARG 0 y
-	METHOD b fireGlobalWorldEvent (ILet;I)V
+	METHOD b playGlobalEvent (ILet;I)V
+		ARG 1 type
+		ARG 2 pos
+		ARG 3 data
 	METHOD b setTimeOfDay (J)V
+	METHOD b updateChunkEntities (Lahi;)V
+		ARG 1 entity
 	METHOD b addBlockEntity (Lbow;)Z
 	METHOD b doesAreaContainFireSource (Lcmu;)Z
 	METHOD b updateNeighborsAlways (Let;Lbhv;)V
@@ -183,15 +227,17 @@ CLASS bcu net/minecraft/world/World
 	METHOD c getWorldChunk (II)Lbss;
 		ARG 1 chunkX
 		ARG 2 chunkZ
-	METHOD c fireWorldEvent (ILet;I)V
+	METHOD c playEvent (ILet;I)V
-		ARG 1 eventId
+		ARG 1 type
 		ARG 2 pos
+		ARG 3 data
 	METHOD c updateHorizontalAdjacent (Let;Lbhv;)V
 		ARG 1 pos
 	METHOD c getEmittedRedstonePower (Let;Ley;)I
 		ARG 1 pos
 	METHOD d getCloudColor (F)Lcmz;
-	METHOD d setTicksSinceLightningClient (I)V
+	METHOD d setTicksSinceLightning (I)V
+		ARG 1 ticksSinceLightning
 	METHOD e getFogColor (F)Lcmz;
 	METHOD f getStarsBrightness (F)F
 	METHOD g getThunderGradient (F)F

mappings/net/minecraft/world/WorldSaveHandler.mapping

@@ -1,9 +1,16 @@
-CLASS cjg net/minecraft/world/OldWorldSaveHandler
+CLASS cjg net/minecraft/world/WorldSaveHandler
+	FIELD a dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c worldDir Ljava/io/File;
 	FIELD d playerDataDir Ljava/io/File;
 	FIELD e saveStartTime J
 	FIELD f worldName Ljava/lang/String;
+	FIELD g structureManager Lcej;
+	METHOD <init> (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/server/MinecraftServer;Lcom/mojang/datafixers/DataFixer;)V
+		ARG 1 worldsDirectory
+		ARG 2 worldName
+		ARG 3 server
+		ARG 4 dataFixer
 	METHOD a getWorldDir ()Ljava/io/File;
 	METHOD a saveWorld (Lcjf;)V
 	METHOD a saveWorld (Lcjf;Lhr;)V

mappings/net/minecraft/world/biome/BiomeGroupToBiomeLayer.mapping

@@ -0,0 +1,24 @@
+CLASS chb net/minecraft/world/biome/BiomeGroupToBiomeLayer
+	FIELD a BIRCH_FOREST_ID I
+	FIELD b DESERT_ID I
+	FIELD c MOUNTAINS_ID I
+	FIELD d FOREST_ID I
+	FIELD e SNOWY_TUNDRA_ID I
+	FIELD f JUNGLE_ID I
+	FIELD g BADLANDS_PLATEAU_ID I
+	FIELD h WOODED_BADLANDS_PLATEAU_ID I
+	FIELD i MUSHROOM_FIELDS_ID I
+	FIELD j PLAINS_ID I
+	FIELD k GIANT_TREE_TAIGA_ID I
+	FIELD l DARK_FOREST_ID I
+	FIELD m SAVANNA_ID I
+	FIELD n SWAMP_ID I
+	FIELD o TAIGA_ID I
+	FIELD p SNOWY_TAIGA_ID I
+	FIELD q OLD_GROUP_1 [I
+	FIELD r GROUP_1 [I
+	FIELD s GROUP_2 [I
+	FIELD t GROUP_3 [I
+	FIELD u GROUP_4 [I
+	FIELD v config Lbuc;
+	FIELD w chosenGroup1 [I

mappings/net/minecraft/world/biome/Biomes.mapping

@@ -1,5 +1,6 @@
 CLASS bdw net/minecraft/world/biome/Biomes
 	FIELD b DEFAULT Lbdr;
+	FIELD c biome Lbdr;
 	METHOD a register (ILjava/lang/String;Lbdr;)Lbdr;
 		ARG 0 rawId
 		ARG 1 id

mappings/net/minecraft/world/biome/layer/AddBambooJungleLayer.mapping

@@ -1,4 +1,4 @@
-CLASS chh net/minecraft/world/biome/layer/BambooJungleReplaceLayer
+CLASS chh net/minecraft/world/biome/layer/AddBambooJungleLayer
 	FIELD a INSTANCE Lchh;
 	FIELD b JUNGLE_ID I
 	FIELD c BAMBOO_JUNGLE_ID I

mappings/net/minecraft/world/biome/layer/AddDeepOceanLayer.mapping

@@ -0,0 +1 @@
+CLASS cgv net/minecraft/world/biome/layer/AddDeepOceanLayer

mappings/net/minecraft/world/biome/layer/AddEdgeBiomesLayer.mapping

@@ -1,4 +1,4 @@
-CLASS cho
+CLASS cho net/minecraft/world/biome/layer/AddEdgeBiomesLayer
 	FIELD a INSTANCE Lcho;
 	FIELD b BEACH_ID I
 	FIELD c SNOWY_BEACH_ID I

mappings/net/minecraft/world/biome/layer/AddHillsLayer.mapping

@@ -0,0 +1,28 @@
+CLASS chj net/minecraft/world/biome/layer/AddHillsLayer
+	FIELD A SNOWY_TAIGA_HILLS_ID I
+	FIELD B TAIGA_HILLS_ID I
+	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD c BIRCH_FOREST_ID I
+	FIELD d BIRCH_FOREST_HILLS_ID I
+	FIELD e DESERT_ID I
+	FIELD f DESERT_HILLS_ID I
+	FIELD g MOUNTAINS_ID I
+	FIELD h WOODED_MOUNTAINS_ID I
+	FIELD i FOREST_ID I
+	FIELD j WOODED_HILLS_ID I
+	FIELD k SNOWY_TUNDRA_ID I
+	FIELD l SNOWY_MOUNTAINS_ID I
+	FIELD m JUNGLE_ID I
+	FIELD n JUNGLE_HILLS_ID I
+	FIELD o BAMBOO_JUNGLE_ID I
+	FIELD p BAMBOO_JUNGLE_HILLS_ID I
+	FIELD q BADLANDS_ID I
+	FIELD r WOODED_BADLANDS_PLATEAU_ID I
+	FIELD s PLAINS_ID I
+	FIELD t GIANT_TREE_TAIGA_ID I
+	FIELD u GIANT_TREE_TAIGA_HILLS_ID I
+	FIELD v DARK_FOREST_ID I
+	FIELD w SAVANNA_ID I
+	FIELD x SAVANNA_PLATEAU_ID I
+	FIELD y TAIGA_ID I
+	FIELD z SNOWY_TAIGA_ID I

mappings/net/minecraft/world/biome/layer/AddMushroomIslandLayer.mapping

@@ -0,0 +1,3 @@
+CLASS cgy net/minecraft/world/biome/layer/AddMushroomIslandLayer
+	FIELD a INSTANCE Lcgy;
+	FIELD b MUSHROOM_FIELDS_ID I

mappings/net/minecraft/world/biome/layer/AddRiversLayer.mapping

@@ -0,0 +1,6 @@
+CLASS chn net/minecraft/world/biome/layer/AddRiversLayer
+	FIELD b FROZEN_RIVER_ID I
+	FIELD c SNOWY_TUNDRA_ID I
+	FIELD d MUSHROOM_FIELDS_ID I
+	FIELD e MUSHROOM_FIELD_SHORE_ID I
+	FIELD f RIVER_ID I

mappings/net/minecraft/world/biome/layer/AddSunflowerPlainsLayer.mapping

@@ -1,4 +1,4 @@
-CLASS chi net/minecraft/world/biome/layer/SunflowerPlainsReplaceLayer
+CLASS chi net/minecraft/world/biome/layer/AddSunflowerPlainsLayer
 	FIELD a INSTANCE Lchi;
 	FIELD b PLAINS_ID I
 	FIELD c SUNFLOWER_PLAINS I

mappings/net/minecraft/world/biome/layer/BiomeGroupLayer.mapping

@@ -0,0 +1,4 @@
+CLASS cgw net/minecraft/world/biome/layer/BiomeGroupLayer
+	CLASS cgw$a AddGroup2Layer
+	CLASS cgw$b AddGroup3Layer
+	CLASS cgw$c AddSpecialBiomesLayer

mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping

@@ -3,4 +3,6 @@ CLASS cgt net/minecraft/world/biome/layer/CachingLayerContext
 	FIELD c cache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap;
 	FIELD e worldSeed J
 	FIELD f localSeed J
+	METHOD <init> (IJJ)V
+		ARG 2 seed
 	METHOD a initWorldSeed (J)V

mappings/net/minecraft/world/biome/layer/CoordinateTransformer.mapping

@@ -0,0 +1,5 @@
+CLASS cic net/minecraft/world/biome/layer/CoordinateTransformer
+	METHOD a transformX (I)I
+		ARG 1 x
+	METHOD b transformZ (I)I
+		ARG 1 y

mappings/net/minecraft/world/biome/layer/CrossSamplingLayer.mapping

@@ -0,0 +1,8 @@
+CLASS chz net/minecraft/world/biome/layer/CrossSamplingLayer
+	METHOD a sample (Lcgs;IIIII)I
+		ARG 1 context
+		ARG 2 n
+		ARG 3 e
+		ARG 4 s
+		ARG 5 w
+		ARG 6 center

mappings/net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer.mapping

@@ -0,0 +1,8 @@
+CLASS chw net/minecraft/world/biome/layer/DiagonalCrossSamplingLayer
+	METHOD a sample (Lcgs;IIIII)I
+		ARG 1 context
+		ARG 2 sw
+		ARG 3 se
+		ARG 4 ne
+		ARG 5 nw
+		ARG 6 center

mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping

@@ -1,4 +1,4 @@
-CLASS cha net/minecraft/world/biome/layer/BiomeEdgeEaseLayer
+CLASS cha net/minecraft/world/biome/layer/EaseBiomeEdgeLayer
 	FIELD a INSTANCE Lcha;
 	FIELD b DESERT_ID I
 	FIELD c MOUNTAINS_ID I

mappings/net/minecraft/world/biome/layer/IdentityCoordinateTransformer.mapping

@@ -0,0 +1 @@
+CLASS cia net/minecraft/world/biome/layer/IdentityCoordinateTransformer

mappings/net/minecraft/world/biome/layer/IdentitySamplingLayer.mapping

@@ -0,0 +1,4 @@
+CLASS chx net/minecraft/world/biome/layer/IdentitySamplingLayer
+	METHOD a sample (Lcgs;I)I
+		ARG 1 context
+		ARG 2 value

mappings/net/minecraft/world/biome/layer/IncreaseEdgeCurvatureLayer.mapping

@@ -0,0 +1,2 @@
+CLASS cgx net/minecraft/world/biome/layer/IncreaseEdgeCurvatureLayer
+	FIELD a INSTANCE Lcgx;

mappings/net/minecraft/world/biome/layer/LayerOperator.mapping

@@ -1,4 +1,4 @@
 CLASS cid net/minecraft/world/biome/layer/LayerOperator
 	METHOD apply (II)I
 		ARG 1 x
-		ARG 2 y
+		ARG 2 z

mappings/net/minecraft/world/biome/layer/LayerRandomnessSource.mapping

@@ -1,4 +1,4 @@
-CLASS cgs
+CLASS cgs net/minecraft/world/biome/layer/LayerRandomnessSource
 	METHOD a getNoiseSampler ()Lcfh;
 	METHOD a nextInt (I)I
 		ARG 1 bound

mappings/net/minecraft/world/biome/layer/LayerSampleContext.mapping

@@ -1,6 +1,12 @@
 CLASS cgr net/minecraft/world/biome/layer/LayerSampleContext
 	METHOD a choose (II)I
+		ARG 1 a
+		ARG 2 b
 	METHOD a choose (IIII)I
+		ARG 1 a
+		ARG 2 b
+		ARG 3 c
+		ARG 4 d
 	METHOD a initSeed (JJ)V
 		ARG 1 x
 		ARG 3 y

mappings/net/minecraft/world/biome/layer/LayerSampler.mapping

@@ -1,4 +1,4 @@
 CLASS cgn net/minecraft/world/biome/layer/LayerSampler
 	METHOD a sample (II)I
 		ARG 1 x
-		ARG 2 y
+		ARG 2 z

mappings/net/minecraft/world/biome/layer/MergingLayer.mapping

@@ -1,7 +1,11 @@
 CLASS chv net/minecraft/world/biome/layer/MergingLayer
 	METHOD a create (Lcgr;Lcgo;Lcgo;)Lcgo;
 		ARG 1 context
+		ARG 2 layer1
+		ARG 3 layer2
 	METHOD a sample (Lcgs;Lcgn;Lcgn;II)I
-		ARG 2 parent1
+		ARG 1 context
+		ARG 2 sampler1
+		ARG 3 sampler2
 		ARG 4 x
-		ARG 5 y
+		ARG 5 z

mappings/net/minecraft/world/biome/layer/NoiseToRiverLayer.mapping

@@ -0,0 +1,5 @@
+CLASS chm net/minecraft/world/biome/layer/NoiseToRiverLayer
+	FIELD a INSTANCE Lchm;
+	FIELD b RIVER_ID I
+	METHOD c isValidForRiver (I)I
+		ARG 0 value

mappings/net/minecraft/world/biome/layer/NorthWestCoordinateTransformer.mapping

@@ -0,0 +1 @@
+CLASS cib net/minecraft/world/biome/layer/NorthWestCoordinateTransformer

mappings/net/minecraft/world/biome/layer/ParentedLayer.mapping

@@ -3,7 +3,7 @@ CLASS chu net/minecraft/world/biome/layer/ParentedLayer
 		ARG 1 context
 		ARG 2 parent
 		ARG 3 x
-		ARG 4 y
+		ARG 4 z
 	METHOD a create (Lcgr;Lcgo;)Lcgo;
 		ARG 1 context
 		ARG 2 parent

mappings/net/minecraft/world/biome/layer/SimpleLandNoiseLayer.mapping

@@ -0,0 +1 @@
+CLASS chl net/minecraft/world/biome/layer/SimpleLandNoiseLayer

mappings/net/minecraft/world/biome/layer/SmoothenShorelineLayer.mapping

@@ -0,0 +1 @@
+CLASS chp net/minecraft/world/biome/layer/SmoothenShorelineLayer

mappings/net/minecraft/world/biome/layer/SouthEastSamplingLayer.mapping

@@ -0,0 +1,4 @@
+CLASS chy net/minecraft/world/biome/layer/SouthEastSamplingLayer
+	METHOD a sample (Lcgs;I)I
+		ARG 1 context
+		ARG 2 se

mappings/net/minecraft/world/biome/layer/VoidCoordinateTransformer.mapping

@@ -1 +0,0 @@
-CLASS cia net/minecraft/world/biome/layer/VoidCoordinateTransformer

mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping

@@ -1 +1,3 @@
 CLASS bdz net/minecraft/world/biome/source/CheckerboardBiomeSource
+	FIELD c biomes [Lbdr;
+	FIELD d gridSize I

mappings/net/minecraft/world/biome/source/CheckerboardBiomeSourceConfig.mapping

@@ -1 +1,5 @@
 CLASS bea net/minecraft/world/biome/source/CheckerboardBiomeSourceConfig
+	FIELD a biomes [Lbdr;
+	FIELD b size I
+	METHOD a getBiomes ()[Lbdr;
+	METHOD b getSize ()I

mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping

@@ -1 +1,2 @@
 CLASS beq net/minecraft/world/biome/source/FixedBiomeSource
+	FIELD c biome Lbdr;

mappings/net/minecraft/world/biome/source/FixedBiomeSourceConfig.mapping

@@ -1 +1,5 @@
 CLASS ber net/minecraft/world/biome/source/FixedBiomeSourceConfig
+	FIELD a biome Lbdr;
+	METHOD a getBiome ()Lbdr;
+	METHOD a setBiome (Lbdr;)Lber;
+		ARG 1 biome

mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping

@@ -1 +1,4 @@
 CLASS bgq net/minecraft/world/biome/source/TheEndBiomeSource
+	FIELD c noise Lcfk;
+	FIELD d random Lbui;
+	FIELD e biomes [Lbdr;

mappings/net/minecraft/world/border/WorldBorder.mapping

@@ -5,6 +5,7 @@ CLASS bse net/minecraft/world/border/WorldBorder
 		METHOD c getBoundNorth ()D
 		METHOD d getBoundSouth ()D
 		METHOD e getSize ()D
+		METHOD f getShrinkingSpeed ()D
 		METHOD g getTargetRemainingTime ()J
 		METHOD h getTargetSize ()D
 		METHOD i getStage ()Lbsd;
@@ -38,13 +39,17 @@ CLASS bse net/minecraft/world/border/WorldBorder
 	METHOD a asVoxelShape ()Lcnt;
 	METHOD a setSize (D)V
 		ARG 1 size
-	METHOD a (DDJ)V
+	METHOD a interpolateSize (DDJ)V
-		ARG 1 oldSize
+		ARG 1 fromSize
+		ARG 3 toSize
+		ARG 5 time
 	METHOD a setMaxWorldBorderRadius (I)V
 	METHOD a contains (Lahi;)D
 	METHOD a contains (Lbch;)Z
 	METHOD a addListener (Lbsc;)V
 		ARG 1 listener
+	METHOD a save (Lcjf;)V
+		ARG 1 levelProperties
 	METHOD a contains (Lcmu;)Z
 	METHOD a contains (Let;)Z
 	METHOD b getStage ()Lbsd;
@@ -53,6 +58,8 @@ CLASS bse net/minecraft/world/border/WorldBorder
 	METHOD b contains (DD)D
 	METHOD b setWarningTime (I)V
 		ARG 1 warningTime
+	METHOD b load (Lcjf;)V
+		ARG 1 levelProperties
 	METHOD c getBoundWest ()D
 	METHOD c setDamagePerBlock (D)V
 		ARG 1 damagePerBlock
@@ -73,6 +80,7 @@ CLASS bse net/minecraft/world/border/WorldBorder
 	METHOD m getMaxWorldBorderRadius ()I
 	METHOD n getSafeZone ()D
 	METHOD o getDamagePerBlock ()D
+	METHOD p getShrinkingSpeed ()D
 	METHOD q getWarningTime ()I
 	METHOD r getWarningBlocks ()I
 	METHOD s update ()V

mappings/net/minecraft/world/border/WorldBorderListener.mapping

@@ -1,8 +1,17 @@
 CLASS bsc net/minecraft/world/border/WorldBorderListener
+	CLASS bsc$a WorldBorderSyncer
+		FIELD a border Lbse;
+		METHOD <init> (Lbse;)V
+			ARG 1 border
 	METHOD a onSizeChange (Lbse;D)V
 	METHOD a onCenterChanged (Lbse;DD)V
 		ARG 1 centerX
 		ARG 2 centerZ
+	METHOD a onInterpolateSize (Lbse;DDJ)V
+		ARG 1 border
+		ARG 2 fromSize
+		ARG 4 toSize
+		ARG 6 time
 	METHOD a onWarningTimeChanged (Lbse;I)V
 		ARG 1 warningTime
 	METHOD b onDamagePerBlockChanged (Lbse;D)V

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

@@ -1,4 +1,5 @@
 CLASS bsg net/minecraft/world/chunk/Chunk
+	METHOD a getHighestNonEmptySection ()Lbst;
 	METHOD a setLastSaveTime (J)V
 		ARG 1 lastSaveTime
 	METHOD a addEntity (Lahi;)V
@@ -16,6 +17,10 @@ CLASS bsg net/minecraft/world/chunk/Chunk
 		ARG 1 lightingProvider
 	METHOD a getBiome (Let;)Lbdr;
 		ARG 1 pos
+	METHOD a getLightLevel (Let;IZ)I
+		ARG 1 pos
+		ARG 2 darkness
+		ARG 3 includeSkyLight
 	METHOD a setBlockEntity (Let;Lbow;)V
 		ARG 1 pos
 		ARG 2 blockEntity
@@ -29,9 +34,10 @@ CLASS bsg net/minecraft/world/chunk/Chunk
 		ARG 1 shouldSave
 	METHOD a setBiomeArray ([Lbdr;)V
 		ARG 1 biomeArray
-	METHOD a getListFromArray ([Lit/unimi/dsi/fastutil/shorts/ShortList;I)Lit/unimi/dsi/fastutil/shorts/ShortList;
+	METHOD a getList ([Lit/unimi/dsi/fastutil/shorts/ShortList;I)Lit/unimi/dsi/fastutil/shorts/ShortList;
 		ARG 0 lists
 		ARG 1 index
+	METHOD b getHighestNonEmptySectionYOffset ()I
 	METHOD b setInhabitedTime (J)V
 		ARG 1 inhabitedTime
 	METHOD b getHeightmap (Lbty$a;)Lbty;
@@ -52,6 +58,7 @@ CLASS bsg net/minecraft/world/chunk/Chunk
 	METHOD j needsSaving ()Z
 	METHOD k getStatus ()Lbsl;
 	METHOD l getPostProcessingLists ()[Lit/unimi/dsi/fastutil/shorts/ShortList;
+	METHOD m getLightSourcesStream ()Ljava/util/stream/Stream;
 	METHOD n getBlockTickScheduler ()Lbdj;
 	METHOD o getFluidTickScheduler ()Lbdj;
 	METHOD p getUpgradeData ()Lbtc;

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

@@ -2,6 +2,7 @@ CLASS bdg net/minecraft/world/chunk/ChunkCache
 	FIELD a minX I
 	FIELD b minZ I
 	FIELD c chunks [[Lbss;
+	FIELD d empty Z
 	FIELD e world Lbcu;
 	METHOD <init> (Lbcu;Let;Let;I)V
 		ARG 1 world

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

@@ -1,10 +1,26 @@
 CLASS bsm net/minecraft/world/chunk/ChunkNibbleArray
 	FIELD a byteArray [B
 	METHOD a asByteArray ()[B
+	METHOD a get (I)I
+	METHOD a set (II)V
+		ARG 1 index
+		ARG 2 value
+	METHOD a get (III)I
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
 	METHOD a set (IIII)V
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
 		ARG 4 value
+	METHOD b copy ()Lbsm;
+	METHOD b isEven (I)Z
+		ARG 1 n
 	METHOD b getIndex (III)I
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
 	METHOD c isUninitialized ()Z
+	METHOD c divideByTwo (I)I
+		ARG 1 n

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

@@ -21,12 +21,12 @@ CLASS bch net/minecraft/world/chunk/ChunkPos
 		ARG 0 pos
 	METHOD b getPackedZ (J)I
 		ARG 0 pos
-	METHOD d getXStart ()I
+	METHOD d getStartX ()I
-	METHOD e getZStart ()I
+	METHOD e getStartZ ()I
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
-	METHOD f getXEnd ()I
+	METHOD f getEndX ()I
-	METHOD g getZEnd ()I
+	METHOD g getEndZ ()I
 	METHOD h getRegionX ()I
 	METHOD i getRegionZ ()I
 	METHOD j getRegionRelativeX ()I

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

@@ -28,6 +28,8 @@ CLASS bst net/minecraft/world/chunk/ChunkSection
 		ARG 3 z
 		ARG 4 state
 		ARG 5 lock
+	METHOD a isEmpty (Lbst;)Z
+		ARG 0 section
 	METHOD a fromPacket (Lis;)V
 	METHOD b unlock ()V
 	METHOD b getFluidState (III)Lcge;

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

@@ -41,6 +41,7 @@ CLASS bta net/minecraft/world/chunk/ProtoChunk
 		ARG 0 pos
 	METHOD s getBlockTickScheduler ()Lbtb;
 	METHOD t getFluidTickScheduler ()Lbtb;
+	METHOD v getLightSourcesBySection ()[Lit/unimi/dsi/fastutil/shorts/ShortList;
 	METHOD x getBlockEntities ()Ljava/util/Map;
 	METHOD y getEntities ()Ljava/util/List;
 	METHOD z getBlockEntityTags ()Ljava/util/Map;

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

@@ -2,4 +2,6 @@ CLASS bsr net/minecraft/world/chunk/ReadOnlyChunk
 	FIELD a wrapped Lbss;
 	METHOD <init> (Lbss;)V
 		ARG 1 wrapped
+	METHOD d transformHeightmapType (Lbty$a;)Lbty$a;
+		ARG 1 type
 	METHOD u getWrappedChunk ()Lbss;

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

@@ -1,4 +1,8 @@
 CLASS btc net/minecraft/world/chunk/UpgradeData
 	FIELD a NO_UPGRADE_DATA Lbtc;
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD d sides Ljava/util/EnumSet;
+	FIELD e indices [[I
+	METHOD <init> (Lhr;)V
+		ARG 1 tag
 	METHOD b toTag ()Lhr;

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

@@ -19,14 +19,19 @@ CLASS bss net/minecraft/world/chunk/WorldChunk
 	FIELD o blockTickScheduler Lbdj;
 	FIELD p fluidTickScheduler Lbdj;
 	FIELD r lastSaveTime J
-	FIELD s dirty Z
+	FIELD s shouldSave Z
 	FIELD t inhabitedTime J
+	FIELD u levelTypeProvider Ljava/util/function/Supplier;
+	FIELD v loadToWorldConsumer Ljava/util/function/Consumer;
 	FIELD w pos Lbch;
 	FIELD x isLightOn Z
 	METHOD <init> (Lbcu;Lbta;)V
 		ARG 1 world
 	METHOD A getEntitySectionArray ()[Lys;
 	METHOD B runPostProcessing ()V
+	METHOD a areSectionsEmpty (II)Z
+		ARG 1 minY
+		ARG 2 maxY
 	METHOD a getFluidState (III)Lcge;
 		ARG 1 x
 		ARG 2 y
@@ -51,12 +56,15 @@ CLASS bss net/minecraft/world/chunk/WorldChunk
 		ARG 1 entityClass
 		ARG 2 box
 		ARG 3 entityList
+	METHOD a setLevelTypeProvider (Ljava/util/function/Supplier;)V
+		ARG 1 levelTypeProvider
 	METHOD b remove (Lahi;)V
 	METHOD c setLoadedToWorld (Z)V
 	METHOD j createBlockEntity (Let;)Lbow;
 	METHOD s loadToWorld ()V
 	METHOD t markDirty ()V
 	METHOD u isEmpty ()Z
+	METHOD v getLevelType ()Lue$b;
 	METHOD x isLoadedToWorld ()Z
 	METHOD y getWorld ()Lbcu;
 	METHOD z getBlockEntityMap ()Ljava/util/Map;

mappings/net/minecraft/world/chunk/storage/RegionFile.mapping

@@ -13,6 +13,8 @@ CLASS bth net/minecraft/world/chunk/storage/RegionFile
 		ARG 1 pos
 	METHOD a setOffset (Lbch;I)V
 	METHOD a write (Lbch;[BI)V
+	METHOD b isChunkPresent (Lbch;)Z
+		ARG 1 pos
 	METHOD b setTimestamp (Lbch;I)V
 	METHOD c getChunkDataOutputStream (Lbch;)Ljava/io/DataOutputStream;
 	METHOD d hasChunk (Lbch;)Z

mappings/net/minecraft/world/dimension/Dimension.mapping

@@ -3,11 +3,13 @@ CLASS btk net/minecraft/world/dimension/Dimension
 	FIELD b world Lbcu;
 	FIELD c waterVaporizes Z
 	FIELD d isNether Z
+	FIELD e lightLevelToBrightness [F
 	FIELD f type Lbtl;
 	FIELD g backgroundColor [F
 	METHOD <init> (Lbcu;Lbtl;)V
 		ARG 1 world
 		ARG 2 type
+	METHOD a initializeLightLevelToBrightness ()V
 	METHOD a getBackgroundColor (FF)[F
 		ARG 1 skyAngle
 		ARG 2 tickDelta
@@ -26,6 +28,7 @@ CLASS btk net/minecraft/world/dimension/Dimension
 	METHOD a getSpawningBlockInChunk (Lbch;Z)Let;
 		ARG 1 chunkPos
 		ARG 2 checkMobSpawnValidity
+	METHOD b getCloudHeight ()F
 	METHOD b getFogColor (FF)Lcmz;
 		ARG 1 skyAngle
 		ARG 2 tickDelta
@@ -34,6 +37,7 @@ CLASS btk net/minecraft/world/dimension/Dimension
 	METHOD f doesWaterVaporize ()Z
 	METHOD g hasSkyLight ()Z
 	METHOD h isNether ()Z
+	METHOD i getLightLevelToBrightness ()[F
 	METHOD j createWorldBorder ()Lbse;
 	METHOD k saveWorldData ()V
 	METHOD l update ()V

mappings/net/minecraft/world/gen/ChunkRandom.mapping

@@ -20,7 +20,7 @@ CLASS bui net/minecraft/world/gen/ChunkRandom
 		ARG 1 worldSeed
 		ARG 3 x
 		ARG 4 z
-		ARG 5 localSeed
+		ARG 5 seedModifier
 	METHOD b setFeatureSeed (JII)J
 		ARG 1 worldSeed
 		ARG 3 index

mappings/net/minecraft/world/gen/PhantomSpawner.mapping

@@ -1,4 +1,5 @@
 CLASS buf net/minecraft/world/gen/PhantomSpawner
+	FIELD a ticksUntilNextSpawn I
 	METHOD a spawn (Lbcu;ZZ)I
 		ARG 2 spawnMonsters
 		ARG 3 spawnAnimals

mappings/net/minecraft/world/gen/PillagerSpawner.mapping

@@ -4,6 +4,11 @@ CLASS bue net/minecraft/world/gen/PillagerSpawner
 		METHOD <init> (Lahm;I)V
 			ARG 2 weight
 	FIELD a SPAWN_ENTRIES Ljava/util/List;
+	FIELD b ticksUntilNextSpawn I
+	METHOD a spawnOneEntity (Lbcu;Let;Ljava/util/Random;Z)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 random
 	METHOD a spawn (Lbcu;ZZ)I
 		ARG 2 spawnMonsters
 		ARG 3 spawnAnimals

mappings/net/minecraft/world/gen/carver/Carver.mapping

@@ -8,12 +8,87 @@ CLASS bur net/minecraft/world/gen/carver/Carver
 	FIELD g CAVE_AIR Lbqs;
 	FIELD h WATER Lcge;
 	FIELD i LAVA Lcge;
+	FIELD j alwaysCarvableBlocks Ljava/util/Set;
+	FIELD k carvableFluids Ljava/util/Set;
+	FIELD l heightLimit I
+	FIELD m configDeserializer Ljava/util/function/Function;
+	METHOD <init> (Ljava/util/function/Function;I)V
+		ARG 1 configDeserializer
+		ARG 2 heightLimit
+	METHOD a isPositionExcluded (DDDI)Z
+		ARG 1 scaledRelativeX
+		ARG 3 scaledRelativeY
+		ARG 5 scaledRelativeZ
+		ARG 7 y
+	METHOD a canCarveBranch (IIDDIIF)Z
+		ARG 1 mainChunkX
+		ARG 2 mainChunkZ
+		ARG 3 relativeX
+		ARG 5 relativeZ
+		ARG 7 branch
+		ARG 8 branchCount
+		ARG 9 baseWidth
+	METHOD a isOnBoundary (IIIIII)Z
+		ARG 1 minX
+		ARG 2 maxX
+		ARG 3 minZ
+		ARG 4 maxZ
+		ARG 5 x
+		ARG 6 z
+	METHOD a canAlwaysCarveBlock (Lbqs;)Z
+		ARG 1 state
+	METHOD a canCarveBlock (Lbqs;Lbqs;)Z
+		ARG 1 state
+		ARG 2 stateAbove
+	METHOD a isRegionUncarvable (Lbsg;IIIIIIII)Z
+		ARG 2 mainChunkX
+		ARG 3 mainChunkZ
+		ARG 4 relMinX
+		ARG 5 relMaxX
+		ARG 6 minY
+		ARG 7 maxY
+		ARG 8 relMinZ
+		ARG 9 relMaxZ
+	METHOD a carveRegion (Lbsg;JIIIDDDDDLjava/util/BitSet;)Z
+		ARG 2 seed
+		ARG 4 seaLevel
+		ARG 5 mainChunkX
+		ARG 6 mainChunkZ
+		ARG 7 centerX
+		ARG 9 centerY
+		ARG 11 centerZ
+		ARG 13 xzSize
+		ARG 15 ySize
+		ARG 17 mask
+	METHOD a carveAtPoint (Lbsg;Ljava/util/BitSet;Ljava/util/Random;Let$b;Let$b;Let$b;IIIIIIIILjava/util/concurrent/atomic/AtomicBoolean;)Z
+		ARG 1 chunk
+		ARG 2 mask
+		ARG 3 random
+		ARG 4 pos1
+		ARG 5 pos2
+		ARG 6 pos3
+		ARG 7 seaLevel
+		ARG 8 mainChunkX
+		ARG 9 mainChunkZ
+		ARG 10 x
+		ARG 11 z
+		ARG 12 relativeX
+		ARG 13 y
+		ARG 14 relativeZ
 	METHOD a carve (Lbsg;Ljava/util/Random;IIIIILjava/util/BitSet;Lbuk;)Z
 		ARG 1 chunk
-		ARG 8 carvingMask
+		ARG 2 random
+		ARG 3 seaLevel
+		ARG 4 chunkX
+		ARG 5 chunkZ
+		ARG 6 mainChunkX
+		ARG 7 mainChunkZ
+		ARG 8 mask
 		ARG 9 config
 	METHOD a register (Ljava/lang/String;Lbur;)Lbur;
 	METHOD a shouldCarve (Ljava/util/Random;IILbuk;)Z
+		ARG 1 random
 		ARG 2 chunkX
 		ARG 3 chunkZ
 		ARG 4 config
+	METHOD c getBranchFactor ()I

mappings/net/minecraft/world/gen/carver/CaveCarver.mapping

@@ -1 +1,37 @@
 CLASS bul net/minecraft/world/gen/carver/CaveCarver
+	METHOD <init> (Ljava/util/function/Function;I)V
+		ARG 1 configDeserializer
+		ARG 2 heightLimit
+	METHOD a getMaxCaveCount ()I
+	METHOD a carveCave (Lbsg;JIIIDDDFDLjava/util/BitSet;)V
+		ARG 1 chunk
+		ARG 2 seed
+		ARG 4 seaLevel
+		ARG 5 mainChunkX
+		ARG 6 mainChunkZ
+		ARG 7 x
+		ARG 9 y
+		ARG 11 z
+		ARG 13 width
+		ARG 14 heightWidthRatio
+		ARG 16 mask
+	METHOD a carveTunnels (Lbsg;JIIIDDDFFFIIDLjava/util/BitSet;)V
+		ARG 1 chunk
+		ARG 2 seed
+		ARG 4 seaLevel
+		ARG 5 mainChunkX
+		ARG 6 mainChunkZ
+		ARG 7 x
+		ARG 9 y
+		ARG 11 z
+		ARG 13 baseWidth
+		ARG 14 xzAngle
+		ARG 15 yAngle
+		ARG 16 currentBranch
+		ARG 17 height
+		ARG 18 heightWidthRatio
+		ARG 20 mask
+	METHOD a getTunnelSystemWidth (Ljava/util/Random;)F
+	METHOD b getTunnelSystemHeightWidthRatio ()D
+	METHOD b getCaveY (Ljava/util/Random;)I
+		ARG 1 random

mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping

@@ -5,9 +5,12 @@ CLASS bum net/minecraft/world/gen/carver/ConfiguredCarver
 		ARG 1 carver
 		ARG 2 config
 	METHOD a carve (Lbsg;Ljava/util/Random;IIIIILjava/util/BitSet;)Z
+		ARG 3 seaLevel
 		ARG 4 chunkX
 		ARG 5 chunkZ
-		ARG 8 carvingMask
+		ARG 6 mainChunkX
+		ARG 7 mainChunkY
+		ARG 8 mask
 	METHOD a shouldCarve (Ljava/util/Random;II)Z
 		ARG 2 chunkX
 		ARG 3 chunkZ

mappings/net/minecraft/world/gen/carver/RavineCarver.mapping

@@ -1 +1,18 @@
 CLASS buj net/minecraft/world/gen/carver/RavineCarver
+	FIELD m heightToHorizontalStretchFactor [F
+	METHOD a carveRavine (Lbsg;JIIIDDDFFFIIDLjava/util/BitSet;)V
+		ARG 1 chunk
+		ARG 2 seed
+		ARG 4 seaLevel
+		ARG 5 mainChunkX
+		ARG 6 mainChunkZ
+		ARG 7 x
+		ARG 9 y
+		ARG 11 z
+		ARG 13 baseWidth
+		ARG 14 xzAngle
+		ARG 15 yAngle
+		ARG 16 branch
+		ARG 17 branchCount
+		ARG 18 heightWidthRatio
+		ARG 20 mask

mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping

@@ -1 +1,15 @@
 CLASS buq net/minecraft/world/gen/carver/UnderwaterCaveCarver
+	METHOD a carveAtPoint (Lbur;Lbsg;Ljava/util/BitSet;Ljava/util/Random;Let$b;IIIIIIII)Z
+		ARG 0 carver
+		ARG 1 chunk
+		ARG 2 mask
+		ARG 3 random
+		ARG 4 pos
+		ARG 5 seaLevel
+		ARG 6 mainChunkX
+		ARG 7 mainChunkZ
+		ARG 8 x
+		ARG 9 z
+		ARG 10 relativeX
+		ARG 11 y
+		ARG 12 relativeZ

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

@@ -8,10 +8,10 @@ CLASS bsh net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 2 biomeSource
 		ARG 3 config
 	METHOD a getConfig ()Lbtt;
-	METHOD a produceHeight (IILbty$a;)I
+	METHOD a getHeightOnGround (IILbty$a;)I
 		ARG 1 x
 		ARG 2 z
-		ARG 3 type
+		ARG 3 heightmapType
 	METHOD a getEntitySpawnList (Laht;Let;)Ljava/util/List;
 	METHOD a locateStructure (Lbcu;Ljava/lang/String;Let;IZ)Let;
 		ARG 1 world
@@ -36,6 +36,10 @@ CLASS bsh net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 2 chunkX
 		ARG 3 chunkZ
 	METHOD b getSpawnHeight ()I
+	METHOD b getHeightInGround (IILbty$a;)I
+		ARG 1 x
+		ARG 2 z
+		ARG 3 heightmapType
 	METHOD b populateNoise (Lbcv;Lbsg;)V
 		ARG 1 world
 		ARG 2 chunk
@@ -47,3 +51,4 @@ CLASS bsh net/minecraft/world/gen/chunk/ChunkGenerator
 		ARG 1 chunk
 	METHOD d getSeed ()J
 	METHOD e getMaxY ()I
+	METHOD f getSeaLevel ()I

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

@@ -1,26 +1,44 @@
 CLASS btt net/minecraft/world/gen/chunk/ChunkGeneratorConfig
 	FIELD a villageDistance I
+	FIELD b villageSeparation I
 	FIELD c oceanMonumentSpacing I
 	FIELD d oceanMonumentSeparation I
 	FIELD e strongholdDistance I
 	FIELD f strongholdCount I
 	FIELD g strongholdSpread I
 	FIELD h templeDistance I
+	FIELD i templeSeparation I
+	FIELD j shipwreckSpacing I
+	FIELD k shipwreckSeparation I
 	FIELD l endCityDistance I
+	FIELD m endCitySeparation I
+	FIELD n oceanRuinSpacing I
+	FIELD o oceanRuinSeparation I
 	FIELD p mansionDistance I
+	FIELD q mansionSeparation I
 	FIELD r defaultBlock Lbqs;
 	FIELD s defaultFluid Lbqs;
 	METHOD a getVillageDistance ()I
 	METHOD a setDefaultBlock (Lbqs;)V
+		ARG 1 state
+	METHOD b getVillageSeparation ()I
 	METHOD b setDefaultFluid (Lbqs;)V
+		ARG 1 state
 	METHOD c getOceanMonumentSpacing ()I
 	METHOD d getOceanMonumentSeparation ()I
 	METHOD e getStrongholdDistance ()I
 	METHOD f getStrongholdCount ()I
 	METHOD g getStrongholdSpread ()I
 	METHOD h getTempleDistance ()I
+	METHOD i getTempleSeparation ()I
+	METHOD j getShipwreckSpacing ()I
+	METHOD k getShipwreckSeparation ()I
+	METHOD l getOceanRuinSpacing ()I
+	METHOD m getOceanRuinSeparation ()I
 	METHOD n getEndCityDistance ()I
+	METHOD o getEndCitySeparation ()I
 	METHOD p getMansionDistance ()I
+	METHOD q getMansionSeparation ()I
 	METHOD r getDefaultBlock ()Lbqs;
 	METHOD s getDefaultFluid ()Lbqs;
 	METHOD t getMaxY ()I

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

@@ -1 +1,5 @@
 CLASS bsi net/minecraft/world/gen/chunk/ChunkGeneratorFactory
+	METHOD create (Lbcu;Lbdt;Lbtt;)Lbsh;
+		ARG 1 world
+		ARG 2 biomeSource
+		ARG 3 config

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

@@ -1,5 +1,11 @@
 CLASS bsj net/minecraft/world/gen/chunk/ChunkGeneratorType
 	FIELD f factory Lbsi;
+	FIELD g buffetScreenOption Z
 	FIELD h settingsSupplier Ljava/util/function/Supplier;
+	METHOD <init> (Lbsi;ZLjava/util/function/Supplier;)V
+		ARG 1 factory
+		ARG 2 buffetScreenOption
+		ARG 3 settingsSupplier
 	METHOD a createSettings ()Lbtt;
 	METHOD a register (Ljava/lang/String;Lbsi;Ljava/util/function/Supplier;Z)Lbsj;
+	METHOD b isBuffetScreenOption ()Z

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

@@ -1,4 +1,12 @@
 CLASS btv net/minecraft/world/gen/chunk/DebugChunkGenerator
+	FIELD e AIR Lbqs;
+	FIELD f BARRIER Lbqs;
+	FIELD g BLOCK_STATES Ljava/util/List;
+	FIELD h X_SIDE_LENGTH I
+	FIELD i Z_SIDE_LENGTH I
 	METHOD <init> (Lbcv;Lbdt;Lbtu;)V
 		ARG 1 world
 		ARG 3 config
+	METHOD a getBlockState (II)Lbqs;
+		ARG 0 x
+		ARG 1 z

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

@@ -1,6 +1,8 @@
 CLASS btw net/minecraft/world/gen/chunk/FlatChunkGenerator
+	CLASS btw$a FlatChunkGeneratorBiome
 	FIELD e biome Lbdr;
 	FIELD f phantomSpawner Lbuf;
 	METHOD <init> (Lbcv;Lbdt;Lcas;)V
 		ARG 1 world
 		ARG 3 config
+	METHOD g getBiome ()Lbdr;

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

@@ -1,12 +1,48 @@
 CLASS cas net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig
+	FIELD A SWAMP_HUT Lbvj;
+	FIELD B DESERT_PYRAMID Lbvj;
+	FIELD C JUNGLE_TEMPLE Lbvj;
+	FIELD D IGLOO Lbvj;
+	FIELD E SHIPWRECK Lbvj;
+	FIELD F OCEAN_MONUMENT Lbvj;
+	FIELD G WATER_LAKE Lbvj;
+	FIELD H LAVA_LAKE Lbvj;
+	FIELD I END_CITY Lbvj;
+	FIELD J WOODLAND_MANSION Lbvj;
+	FIELD K NETHER_BRIDGE Lbvj;
+	FIELD L OCEAN_RUIN Lbvj;
 	FIELD M layers Ljava/util/List;
 	FIELD N structures Ljava/util/Map;
 	FIELD O biome Lbdr;
 	FIELD P layerBlocks [Lbqs;
+	FIELD Q hasNoTerrain Z
+	FIELD R groundHeight I
+	FIELD t FEATURE_TO_GENERATION_STEP Ljava/util/Map;
+	FIELD u STRUCTURE_TO_FEATURES Ljava/util/Map;
+	FIELD v FEATURE_TO_FEATURE_CONFIG Ljava/util/Map;
 	FIELD w LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD x MINESHAFT Lbvj;
+	FIELD y VILLAGE Lbvj;
+	FIELD z STRONGHOLD Lbvj;
+	METHOD A hasNoTerrain ()Z
 	METHOD C getLayerBlocks ()[Lbqs;
 	METHOD a setBiome (Lbdr;)V
+	METHOD a fromDynamic (Lcom/mojang/datafixers/Dynamic;)Lcas;
+		ARG 0 dynamic
+	METHOD a toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
+		ARG 1 dynamicOps
 	METHOD a parseBlock (Ljava/lang/String;)Lbhv;
+	METHOD a parseLayerString (Ljava/lang/String;I)Lcar;
+		ARG 0 string
+		ARG 1 startY
+	METHOD b fromString (Ljava/lang/String;)Lcas;
+		ARG 0 string
+	METHOD c parseLayersString (Ljava/lang/String;)Ljava/util/List;
+		ARG 0 string
+	METHOD d addStructure (Ljava/lang/String;)V
+		ARG 1 id
 	METHOD v getBiome ()Lbdr;
 	METHOD w getStructures ()Ljava/util/Map;
 	METHOD x getLayers ()Ljava/util/List;
+	METHOD y updateLayerBlocks ()V
+	METHOD z getDefaultConfig ()Lcas;

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

@@ -0,0 +1,12 @@
+CLASS car net/minecraft/world/gen/chunk/FlatChunkGeneratorLayer
+	FIELD a blockState Lbqs;
+	FIELD b thickness I
+	FIELD c startY I
+	METHOD <init> (ILbhv;)V
+		ARG 1 thickness
+		ARG 2 block
+	METHOD a getThickness ()I
+	METHOD a setStartY (I)V
+		ARG 1 startY
+	METHOD b getBlockState ()Lbqs;
+	METHOD c getStartY ()I

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

@@ -1,5 +1,6 @@
 CLASS bud net/minecraft/world/gen/chunk/OverworldChunkGenerator
 	FIELD h BIOME_WEIGHT_TABLE [F
+	FIELD i noiseSampler Lcfi;
 	FIELD j amplified Z
 	FIELD k phantomSpawner Lbuf;
 	FIELD l pillagerSpawner Lbue;

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

@@ -1 +1,4 @@
 CLASS buc net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig
+	METHOD v getBiomeSize ()I
+	METHOD w getRiverSize ()I
+	METHOD x getForcedBiome ()I

mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping

@@ -1,4 +1,6 @@
 CLASS cav net/minecraft/world/gen/decorator/CarvingMaskDecorator
+	METHOD <init> (Ljava/util/function/Function;)V
+		ARG 1 configDeserializer
 	METHOD a (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream;
 		ARG 1 world
 		ARG 2 generator

mappings/net/minecraft/world/gen/decorator/Decorator.mapping

@@ -1,10 +1,14 @@
 CLASS cbz net/minecraft/world/gen/decorator/Decorator
-	FIELD M factory Ljava/util/function/Function;
+	FIELD M configDeserializer Ljava/util/function/Function;
 	FIELD h NOPE Lcbz;
-	METHOD a (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream;
+	METHOD <init> (Ljava/util/function/Function;)V
+		ARG 1 configDeserializer
+	METHOD a getPositions (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream;
 		ARG 1 world
 		ARG 2 generator
 		ARG 3 random
+		ARG 4 config
+		ARG 5 pos
 	METHOD a generate (Lbcv;Lbsh;Ljava/util/Random;Let;Lbvv;Lbvj;)Z
 		ARG 1 world
 		ARG 2 generator

mappings/net/minecraft/world/gen/decorator/SimpleDecorator.mapping

@@ -0,0 +1,9 @@
+CLASS cck net/minecraft/world/gen/decorator/SimpleDecorator
+	METHOD a (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream;
+		ARG 1 world
+		ARG 2 generator
+		ARG 3 random
+	METHOD a getPositions (Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream;
+		ARG 1 random
+		ARG 2 config
+		ARG 3 pos

mappings/net/minecraft/world/gen/feature/AbstractPileFeature.mapping

@@ -1,3 +1,11 @@
 CLASS buz net/minecraft/world/gen/feature/AbstractPileFeature
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a getPileBlockState (Lbcv;)Lbqs;
+		ARG 1 world
+	METHOD a canPlacePileBlock (Lbcv;Let;)Z
+		ARG 1 world
+		ARG 2 pos
+	METHOD b addPileBlock (Lbcv;Let;)V
+		ARG 1 world
+		ARG 2 pos

mappings/net/minecraft/world/gen/feature/AbstractTempleFeature.mapping

@@ -1,3 +1,8 @@
 CLASS byp net/minecraft/world/gen/feature/AbstractTempleFeature
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a getSpacing (Lbsh;)I
+		ARG 1 chunkGenerator
+	METHOD b getSeparation (Lbsh;)I
+		ARG 1 chunkGenerator
+	METHOD d getSeedModifier ()I

mappings/net/minecraft/world/gen/feature/BambooFeature.mapping

@@ -1,3 +1,7 @@
 CLASS buu net/minecraft/world/gen/feature/BambooFeature
+	FIELD a BAMBOO Lbqs;
+	FIELD aR BAMBOO_TOP_1 Lbqs;
+	FIELD aS BAMBOO_TOP_2 Lbqs;
+	FIELD aT BAMBOO_TOP_3 Lbqs;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/CoralFeature.mapping

@@ -1,3 +1,13 @@
 CLASS bvl net/minecraft/world/gen/feature/CoralFeature
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a spawnCoral (Lbcv;Ljava/util/Random;Let;Lbqs;)Z
+		ARG 1 world
+		ARG 2 random
+		ARG 3 pos
+		ARG 4 state
+	METHOD b spawnCoralPiece (Lbcv;Ljava/util/Random;Let;Lbqs;)Z
+		ARG 1 world
+		ARG 2 random
+		ARG 3 pos
+		ARG 4 state

mappings/net/minecraft/world/gen/feature/DarkOakTreeFeature.mapping

@@ -4,3 +4,16 @@ CLASS bvp net/minecraft/world/gen/feature/DarkOakTreeFeature
 	METHOD <init> (Ljava/util/function/Function;Z)V
 		ARG 1 configFactory
 		ARG 2 emitNeighborBlockUpdates
+	METHOD a addLeaves (Lbcz;III)V
+		ARG 1 world
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
+	METHOD a doesTreeFit (Lbda;Let;I)Z
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 treeHeight
+	METHOD a addLog (Ljava/util/Set;Lbcz;Let;)V
+		ARG 1 logPositions
+		ARG 2 world
+		ARG 3 pos

mappings/net/minecraft/world/gen/feature/DeadBushFeature.mapping

@@ -1,3 +1,4 @@
 CLASS bvq net/minecraft/world/gen/feature/DeadBushFeature
+	FIELD a DEAD_BUSH Lbjb;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping

@@ -1,5 +1,5 @@
 CLASS bvz net/minecraft/world/gen/feature/DesertPyramidFeature
-	CLASS bvz$a
+	CLASS bvz$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/DesertWellFeature.mapping

@@ -1,3 +1,7 @@
 CLASS bwb net/minecraft/world/gen/feature/DesertWellFeature
+	FIELD a CAN_GENERATE Lbrc;
+	FIELD aR slab Lbqs;
+	FIELD aS wall Lbqs;
+	FIELD aT fluidInside Lbqs;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping

@@ -1,4 +1,8 @@
 CLASS bxu net/minecraft/world/gen/feature/DungeonFeature
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD aR MOB_SPAWNER_ENTITIES [Lahm;
+	FIELD aS AIR Lbqs;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a getMobSpawnerEntity (Ljava/util/Random;)Lahm;
+		ARG 1 random

mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping

@@ -1,7 +1,11 @@
 CLASS bwg net/minecraft/world/gen/feature/EndCityFeature
-	CLASS bwg$a
+	CLASS bwg$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD b getGenerationHeight (IILbsh;)I
+		ARG 0 chunkX
+		ARG 1 chunkZ
+		ARG 2 chunkGenerator

mappings/net/minecraft/world/gen/feature/EndGatewayFeatureConfig.mapping

@@ -1,5 +1,14 @@
 CLASS bwh net/minecraft/world/gen/feature/EndGatewayFeatureConfig
-	FIELD b exitsAtSpawn Z
+	FIELD a exitPos Ljava/util/Optional;
+	FIELD b exact Z
+	METHOD <init> (Ljava/util/Optional;Z)V
+		ARG 1 exitPos
+		ARG 2 exact
+	METHOD a createConfig ()Lbwh;
 	METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwh;
 		ARG 0 dynamic
-	METHOD c exitsAtSpawn ()Z
+	METHOD a createConfig (Let;Z)Lbwh;
+		ARG 0 exitPortalPosition
+		ARG 1 exitsAtSpawn
+	METHOD b getExitPos ()Ljava/util/Optional;
+	METHOD c isExact ()Z

mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping

@@ -15,6 +15,8 @@ CLASS bzk net/minecraft/world/gen/feature/EndSpikeFeature
 		METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzk$a;
 			ARG 0 dynamic
 		METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic;
+		METHOD a isInChunk (Let;)Z
+			ARG 1 pos
 		METHOD b getCenterZ ()I
 		METHOD c getRadius ()I
 		METHOD d getHeight ()I
@@ -25,3 +27,7 @@ CLASS bzk net/minecraft/world/gen/feature/EndSpikeFeature
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
 	METHOD a getSpikes (Lbcv;)Ljava/util/List;
+	METHOD a generateSpike (Lbcv;Ljava/util/Random;Lbzj;Lbzk$a;)V
+		ARG 1 world
+		ARG 2 random
+		ARG 3 config

mappings/net/minecraft/world/gen/feature/EndSpikeFeatureConfig.mapping

@@ -1,4 +1,4 @@
-CLASS bzj net/minecraft/world/gen/feature/EndPillarFeatureConfig
+CLASS bzj net/minecraft/world/gen/feature/EndSpikeFeatureConfig
 	FIELD a crystalInvulnerable Z
 	FIELD b spikes Ljava/util/List;
 	FIELD c crystalBeamTarget Let;

mappings/net/minecraft/world/gen/feature/Feature.mapping

@@ -4,7 +4,7 @@ CLASS bwl net/minecraft/world/gen/feature/Feature
 	FIELD G PLAIN_FLOWER Lbwo;
 	FIELD H SWAMP_FLOWER Lbwo;
 	FIELD I GENERAL_FOREST_FLOWER Lbwo;
-	FIELD a configFactory Ljava/util/function/Function;
+	FIELD a configDeserializer Ljava/util/function/Function;
 	FIELD aN BONUS_CHEST Lbvb;
 	FIELD aO STRUCTURES Lcom/google/common/collect/BiMap;
 	FIELD aP JIGSAW_STRUCTURES Ljava/util/List;
@@ -25,9 +25,9 @@ CLASS bwl net/minecraft/world/gen/feature/Feature
 	FIELD o BURIED_TREASURE Lbzp;
 	FIELD p VILLAGE Lbzp;
 	METHOD <init> (Ljava/util/function/Function;)V
-		ARG 1 configFactory
+		ARG 1 configDeserializer
 	METHOD <init> (Ljava/util/function/Function;Z)V
-		ARG 1 configFactory
+		ARG 1 configDeserializer
 		ARG 2 emitNeighborBlockUpdates
 	METHOD a generate (Lbcv;Lbsh;Ljava/util/Random;Let;Lbwm;)Z
 		ARG 1 world
@@ -39,7 +39,7 @@ CLASS bwl net/minecraft/world/gen/feature/Feature
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
-	METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwm;
+	METHOD a deserializeConfig (Lcom/mojang/datafixers/Dynamic;)Lbwm;
 		ARG 1 dynamic
 	METHOD a register (Ljava/lang/String;Lbwl;)Lbwl;
 		ARG 0 name

mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping

@@ -1,3 +1,6 @@
 CLASS bwo net/minecraft/world/gen/feature/FlowerFeature
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a getFlowerToPlace (Ljava/util/Random;Let;)Lbqs;
+		ARG 1 random
+		ARG 2 pos

mappings/net/minecraft/world/gen/feature/ForestFlowerFeature.mapping

@@ -1,3 +1,4 @@
 CLASS bwp net/minecraft/world/gen/feature/ForestFlowerFeature
+	FIELD a FLOWERS [Lbhv;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/IcePatchFeature.mapping

@@ -1,3 +1,4 @@
 CLASS bxc net/minecraft/world/gen/feature/IcePatchFeature
+	FIELD a ICE Lbhv;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/IglooFeature.mapping

@@ -1,5 +1,5 @@
 CLASS bxg net/minecraft/world/gen/feature/IglooFeature
-	CLASS bxg$a
+	CLASS bxg$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/JungleGrassFeature.mapping

@@ -1,3 +1,5 @@
 CLASS bxh net/minecraft/world/gen/feature/JungleGrassFeature
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a getGrass (Ljava/util/Random;)Lbqs;
+		ARG 1 random

mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping

@@ -1,5 +1,5 @@
 CLASS bxi net/minecraft/world/gen/feature/JungleTempleFeature
-	CLASS bxi$a
+	CLASS bxi$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/LakeFeature.mapping

@@ -1,3 +1,4 @@
 CLASS bxm net/minecraft/world/gen/feature/LakeFeature
+	FIELD a CAVE_AIR Lbqs;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping

@@ -1,6 +1,58 @@
 CLASS buv net/minecraft/world/gen/feature/LargeOakTreeFeature
+	CLASS buv$a BranchPosition
+		FIELD b endY I
+		METHOD <init> (Let;I)V
+			ARG 1 pos
+			ARG 2 endY
+		METHOD r getEndY ()I
 	FIELD a LOG Lbqs;
 	FIELD aR LEAVES Lbqs;
 	METHOD <init> (Ljava/util/function/Function;Z)V
 		ARG 1 configFactory
 		ARG 2 emitNeighborBlockUpdates
+	METHOD a getLeafRadiusForLayer (I)F
+	METHOD a getBaseBranchSize (II)F
+		ARG 1 treeHeight
+		ARG 2 branchCount
+	METHOD a makeLeaves (Lbcz;ILet;Ljava/util/List;)V
+		ARG 1 world
+		ARG 2 treeHeight
+		ARG 3 treePos
+		ARG 4 branchPositions
+	METHOD a makeLeafLayer (Lbcz;Let;F)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 radius
+	METHOD a getLongestSide (Let;)I
+		ARG 1 box
+	METHOD a getLogAxis (Let;Let;)Ley$a;
+		ARG 1 branchStart
+		ARG 2 branchEnd
+	METHOD a makeBranches (Ljava/util/Set;Lbcz;ILet;Ljava/util/List;)V
+		ARG 1 logPositions
+		ARG 2 world
+		ARG 3 treeHeight
+		ARG 4 treePosition
+		ARG 5 branchPositions
+	METHOD a makeTrunk (Ljava/util/Set;Lbcz;Let;I)V
+		ARG 1 logPositions
+		ARG 2 world
+		ARG 3 pos
+		ARG 4 height
+	METHOD a makeOrCheckBranch (Ljava/util/Set;Lbcz;Let;Let;Z)I
+		ARG 1 logPositions
+		ARG 2 world
+		ARG 3 start
+		ARG 4 end
+		ARG 5 make
+	METHOD b isHighEnough (II)Z
+		ARG 1 treeHeight
+		ARG 2 height
+	METHOD b makeLeaves (Lbcz;Let;)V
+		ARG 1 world
+		ARG 2 pos
+	METHOD b getTreeHeight (Ljava/util/Set;Lbcz;Let;I)I
+		ARG 1 logPositions
+		ARG 2 world
+		ARG 3 pos
+		ARG 4 height

mappings/net/minecraft/world/gen/feature/MegaJungleTreeFeature.mapping

@@ -1 +1,9 @@
 CLASS bxn net/minecraft/world/gen/feature/MegaJungleTreeFeature
+	METHOD a tryMakingVine (Lbcz;Ljava/util/Random;Let;Lbrk;)V
+		ARG 1 world
+		ARG 2 random
+		ARG 3 pos
+		ARG 4 directionProperty
+	METHOD d makeLeaves (Lbcz;Let;I)V
+		ARG 1 world
+		ARG 2 pos

mappings/net/minecraft/world/gen/feature/MegaPineTreeFeature.mapping

@@ -2,3 +2,10 @@ CLASS bxo net/minecraft/world/gen/feature/MegaPineTreeFeature
 	FIELD aU LOG Lbqs;
 	FIELD aV LEAVES Lbqs;
 	FIELD aW PODZOL Lbqs;
+	METHOD a makeTopLeaves (Lbcz;IIIILjava/util/Random;)V
+	METHOD a replaceGround (Lbcz;Ljava/util/Random;Let;)V
+		ARG 1 world
+		ARG 2 random
+		ARG 3 pos
+	METHOD b replaceGroundNear (Lbcz;Let;)V
+	METHOD c prepareGroundColumn (Lbcz;Let;)V

mappings/net/minecraft/world/gen/feature/MegaTreeFeature.mapping

@@ -1 +1,31 @@
 CLASS bxp net/minecraft/world/gen/feature/MegaTreeFeature
+	FIELD a baseHeight I
+	FIELD aR log Lbqs;
+	FIELD aS leaves Lbqs;
+	FIELD aT maxExtraHeight I
+	METHOD <init> (Ljava/util/function/Function;ZIILbqs;Lbqs;)V
+		ARG 2 emitNeighborBlockUpdates
+		ARG 3 baseHeight
+		ARG 4 maxExtraHeight
+		ARG 5 log
+		ARG 6 leaves
+	METHOD a checkTreeFitsAndReplaceGround (Lbcz;Let;I)Z
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 height
+	METHOD a doesTreeFit (Lbda;Let;I)Z
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 height
+	METHOD a getHeight (Ljava/util/Random;)I
+	METHOD b replaceGround (Lbcz;Let;)Z
+		ARG 1 world
+		ARG 2 pos
+	METHOD b makeSquaredLeafLayer (Lbcz;Let;I)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 radius
+	METHOD c makeRoundLeafLayer (Lbcz;Let;I)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 radius

mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping

@@ -1,5 +1,5 @@
 CLASS bxt net/minecraft/world/gen/feature/MineshaftFeature
-	CLASS bxt$a
+	CLASS bxt$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping

@@ -1,7 +1,8 @@
 CLASS bxv net/minecraft/world/gen/feature/NetherFortressFeature
-	CLASS bxv$a
+	CLASS bxv$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ
+	FIELD a MONSTER_SPAWNS Ljava/util/List;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/OakTreeFeature.mapping

@@ -2,6 +2,7 @@ CLASS bzw net/minecraft/world/gen/feature/OakTreeFeature
 	FIELD a height I
 	FIELD aR LOG Lbqs;
 	FIELD aS LEAVES Lbqs;
+	FIELD aT hasVinesAndCocoa Z
 	FIELD aU log Lbqs;
 	FIELD aV leaves Lbqs;
 	METHOD <init> (Ljava/util/function/Function;Z)V
@@ -11,4 +12,19 @@ CLASS bzw net/minecraft/world/gen/feature/OakTreeFeature
 		ARG 3 height
 		ARG 4 log
 		ARG 5 leaves
-	METHOD a getRandomTreeHeight (Ljava/util/Random;)I
+		ARG 6 hasVinesAndCocoa
+	METHOD a makeVineColumn (Lbcz;Let;Lbrk;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 directionProperty
+	METHOD a makeCocoa (Lbdc;ILet;Ley;)V
+		ARG 1 worlf
+		ARG 2 age
+		ARG 3 pos
+		ARG 4 direction
+	METHOD a makeVine (Lbdc;Let;Lbrk;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 directionProperty
+	METHOD a getTreeHeight (Ljava/util/Random;)I
+		ARG 1 random

mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping

@@ -1,7 +1,11 @@
 CLASS bxz net/minecraft/world/gen/feature/OceanMonumentFeature
-	CLASS bxz$a
+	CLASS bxz$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ
+		METHOD b (II)V
+			ARG 1 chunkX
+			ARG 2 chunkZ
+	FIELD a MONSTER_SPAWNS Ljava/util/List;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cdg net/minecraft/world/gen/feature/OceanRuinFeature
-	CLASS cdg$a
+	CLASS cdg$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/OreFeature.mapping

@@ -1,3 +1,17 @@
 CLASS byc net/minecraft/world/gen/feature/OreFeature
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a generateVeinPart (Lbcv;Ljava/util/Random;Lbyb;DDDDDDIIIII)Z
+		ARG 1 world
+		ARG 2 random
+		ARG 3 config
+		ARG 4 startX
+		ARG 6 endX
+		ARG 8 startZ
+		ARG 10 endZ
+		ARG 12 startY
+		ARG 14 endY
+		ARG 16 x
+		ARG 17 y
+		ARG 18 z
+		ARG 19 size

mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping

@@ -1,7 +1,8 @@
 CLASS bye net/minecraft/world/gen/feature/PillagerOutpostFeature
-	CLASS bye$a
+	CLASS bye$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ
+	FIELD a MONSTER_SPAWNS Ljava/util/List;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/PumpkinFeature.mapping

@@ -1 +1,5 @@
 CLASS bvh net/minecraft/world/gen/feature/PumpkinFeature
+	FIELD a pumpkin Lbqs;
+	METHOD <init> (Ljava/util/function/Function;Lbqs;)V
+		ARG 1 configDeserializer
+		ARG 2 pumpkin

mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping

@@ -4,3 +4,10 @@ CLASS byu net/minecraft/world/gen/feature/SavannaTreeFeature
 	METHOD <init> (Ljava/util/function/Function;Z)V
 		ARG 1 configFactory
 		ARG 2 emitNeighborBlockUpdates
+	METHOD a addLog (Ljava/util/Set;Lbdc;Let;)V
+		ARG 1 logPositions
+		ARG 2 world
+		ARG 3 pos
+	METHOD b addLeaves (Lbcz;Let;)V
+		ARG 1 world
+		ARG 2 pos

mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping

@@ -1,5 +1,5 @@
 CLASS bza net/minecraft/world/gen/feature/ShipwreckFeature
-	CLASS bza$a
+	CLASS bza$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping

@@ -13,5 +13,5 @@ CLASS bzb net/minecraft/world/gen/feature/SimpleBlockFeatureConfig
 		ARG 2 placeOn
 		ARG 3 placeIn
 		ARG 4 placeUnder
-	METHOD a make (Lcom/mojang/datafixers/Dynamic;)Lbzb;
+	METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzb;
 		ARG 0 dynamic

mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping

@@ -1,7 +1,14 @@
 CLASS bzo net/minecraft/world/gen/feature/StrongholdFeature
-	CLASS bzo$a
+	CLASS bzo$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ
+	FIELD aR startPositions [Lbch;
+	FIELD aS starts Ljava/util/List;
+	FIELD aT lastSeed J
+	FIELD a stateStillValid Z
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a initialize (Lbsh;)V
+		ARG 1 chunkGenerator
+	METHOD d invalidateState ()V

mappings/net/minecraft/world/gen/feature/StructureFeature.mapping

@@ -12,9 +12,21 @@ CLASS bzp net/minecraft/world/gen/feature/StructureFeature
 	METHOD a getStructureStartFactory ()Lbzp$a;
 	METHOD a locateStructure (Lbcu;Lbsh;Let;IZ)Let;
 		ARG 5 skipExistingChunks
+	METHOD a getStructureStarts (Lbcv;II)Ljava/util/List;
+		ARG 1 world
+		ARG 2 chunkX
+		ARG 3 chunkZ
+	METHOD a isApproximatelyInsideStructure (Lbcv;Let;)Z
+	METHOD a isInsideStructure (Lbcv;Let;Z)Lcdq;
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 exact
 	METHOD a shouldStartAt (Lbsh;Ljava/util/Random;II)Z
 		ARG 1 chunkGenerator
 		ARG 2 random
 		ARG 3 chunkX
 		ARG 4 chunkZ
+	METHOD a getStart (Lbsh;Ljava/util/Random;IIII)Lbch;
 	METHOD b getName ()Ljava/lang/String;
+	METHOD b isInsideStructure (Lbcv;Let;)Z
+	METHOD c getRadius ()I

mappings/net/minecraft/world/gen/feature/StructureFeatures.mapping

@@ -16,4 +16,9 @@ CLASS cdn net/minecraft/world/gen/feature/StructureFeatures
 	FIELD o VILLAGE Lbzp;
 	FIELD p LOGGER Lorg/apache/logging/log4j/Logger;
 	METHOD a initialize ()V
+	METHOD a readStructureStart (Lbsh;Lcej;Lbdt;Lhr;)Lcdq;
+		ARG 0 chunkGenerator
+		ARG 1 structureManager
+		ARG 2 biomeSource
+		ARG 3 tag
 	METHOD a register (Ljava/lang/String;Lbzp;)Lbzp;

mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping

@@ -1,7 +1,9 @@
 CLASS bzt net/minecraft/world/gen/feature/SwampHutFeature
-	CLASS bzt$a
+	CLASS bzt$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ
+	FIELD a MONSTER_SPAWNS Ljava/util/List;
+	FIELD aR CREATURE_SPAWNS Ljava/util/List;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping

@@ -3,3 +3,7 @@ CLASS bzs net/minecraft/world/gen/feature/SwampTreeFeature
 	FIELD aR LEAVES Lbqs;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a makeVines (Lbcz;Let;Lbrk;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 directionProperty

mappings/net/minecraft/world/gen/feature/TaigaGrassFeature.mapping

@@ -1,3 +1,5 @@
 CLASS bzu net/minecraft/world/gen/feature/TaigaGrassFeature
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory
+	METHOD a getGrass (Ljava/util/Random;)Lbqs;
+		ARG 1 random

mappings/net/minecraft/world/gen/feature/VillageFeature.mapping

@@ -1,5 +1,5 @@
 CLASS bzy net/minecraft/world/gen/feature/VillageFeature
-	CLASS bzy$a
+	CLASS bzy$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/VillageFeatureConfig.mapping

@@ -4,3 +4,5 @@ CLASS bzx net/minecraft/world/gen/feature/VillageFeatureConfig
 	METHOD <init> (Ljava/lang/String;I)V
 		ARG 1 startPool
 		ARG 2 size
+	METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzx;
+		ARG 0 dynamic

mappings/net/minecraft/world/gen/feature/VinesFeature.mapping

@@ -1,3 +1,4 @@
 CLASS caa net/minecraft/world/gen/feature/VinesFeature
+	FIELD a DIRECTIONS [Ley;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cae net/minecraft/world/gen/feature/WoodlandMansionFeature
-	CLASS cae$a
+	CLASS cae$a Start
 		METHOD <init> (Lbzp;IILbdr;Lccw;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/surfacebuilder/BadlandsSurfaceBuilder.mapping

@@ -1 +1,12 @@
 CLASS ceq net/minecraft/world/gen/surfacebuilder/BadlandsSurfaceBuilder
+	FIELD S WHITE_TERACOTTA Lbqs;
+	FIELD T ORANGE_TERRACOTTA Lbqs;
+	FIELD U TERACOTTA Lbqs;
+	FIELD V YELLOW_TERACOTTA Lbqs;
+	FIELD W BROWN_TERACOTTA Lbqs;
+	FIELD X RED_TERACOTTA Lbqs;
+	FIELD Y LIGHT_GRAY_TERACOTTA Lbqs;
+	FIELD a layerBlocks [Lbqs;
+	FIELD b seed J
+	METHOD b initLayerBlocks (J)V
+		ARG 1 seed

mappings/net/minecraft/world/gen/surfacebuilder/ErodedBadlandsSurfaceBuilder.mapping

@@ -1 +1,4 @@
 CLASS cet net/minecraft/world/gen/surfacebuilder/ErodedBadlandsSurfaceBuilder
+	FIELD S WHITE_TERRACOTTA Lbqs;
+	FIELD T ORANGE_TERRACOTTA Lbqs;
+	FIELD U TERACOTTA Lbqs;

mappings/net/minecraft/world/gen/surfacebuilder/FrozenOceanSurfaceBuilder.mapping

@@ -1 +1,7 @@
 CLASS ceu net/minecraft/world/gen/surfacebuilder/FrozenOceanSurfaceBuilder
+	FIELD U seed J
+	FIELD a PACKED_ICE Lbqs;
+	FIELD b SNOW_BLOCK Lbqs;
+	FIELD c AIR Lbqs;
+	FIELD d GRAVEL Lbqs;
+	FIELD e ICE Lbqs;

mappings/net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder.mapping

@@ -1 +1,7 @@
 CLASS cey net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder
+	FIELD S GLOWSTONE Lbqs;
+	FIELD a seed J
+	FIELD b noise Lcfi;
+	FIELD c CAVE_AIR Lbqs;
+	FIELD d NETHERRACK Lbqs;
+	FIELD e GRAVEL Lbqs;

mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping

@@ -39,6 +39,8 @@ CLASS cfb net/minecraft/world/gen/surfacebuilder/SurfaceBuilder
 	FIELD x STONE_CONFIG Lcfc;
 	FIELD y COARSE_DIRT_CONFIG Lcfc;
 	FIELD z SAND_CONFIG Lcfc;
+	METHOD a initSeed (J)V
+		ARG 1 seed
 	METHOD a register (Ljava/lang/String;Lcfb;)Lcfb;
 	METHOD a generate (Ljava/util/Random;Lbsg;Lbdr;IIIDLbqs;Lbqs;IJLcfd;)V
 		ARG 1 random

mappings/net/minecraft/world/gen/surfacebuilder/WoodedBadlandsSurfaceBuilder.mapping

@@ -1 +1,4 @@
 CLASS cff net/minecraft/world/gen/surfacebuilder/WoodedBadlandsSurfaceBuilder
+	FIELD S WHITE_TERRACOTTA Lbqs;
+	FIELD T ORANGE_TERRACOTTA Lbqs;
+	FIELD U TERRACOTTA Lbqs;

mappings/net/minecraft/world/level/LevelProperties.mapping

@@ -20,7 +20,11 @@ CLASS cjf net/minecraft/world/level/LevelProperties
 	FIELD S enabledDataPacks Ljava/util/Set;
 	FIELD T worldData Ljava/util/Map;
 	FIELD U customBossEvents Lhr;
+	FIELD V wanderingTraderSpawnDelay I
+	FIELD W wanderingTraderSpawnChance I
+	FIELD X wanderingTraderId Ljava/util/UUID;
 	FIELD Y gameRules Lbcq;
+	FIELD Z scheduledEvents Lcmr;
 	FIELD a DEFAULT_DIFFICULTY Lagb;
 	FIELD b versionName Ljava/lang/String;
 	FIELD c versionId I
@@ -64,6 +68,8 @@ CLASS cjf net/minecraft/world/level/LevelProperties
 	METHOD O getDisabledDataPacks ()Ljava/util/Set;
 	METHOD P getEnabledDataPacks ()Ljava/util/Set;
 	METHOD Q getCustomBossEvents ()Lhr;
+	METHOD R getWanderingTraderSpawnDelay ()I
+	METHOD S getWanderingTraderSpawnChance ()I
 	METHOD U loadPlayerData ()V
 	METHOD a getSeed ()J
 	METHOD a setBorderSize (D)V
@@ -71,6 +77,8 @@ CLASS cjf net/minecraft/world/level/LevelProperties
 	METHOD a setTime (J)V
 	METHOD a setDifficulty (Lagb;)V
 	METHOD a setGameMode (Lbcr;)V
+	METHOD a loadLevelInfo (Lbcy;)V
+		ARG 1 levelInfo
 	METHOD a setGeneratorType (Lbdb;)V
 	METHOD a getWorldData (Lbtl;)Lhr;
 	METHOD a setWorldData (Lbtl;Lhr;)V
@@ -78,9 +86,13 @@ CLASS cjf net/minecraft/world/level/LevelProperties
 	METHOD a populateCrashReport (Lc;)V
 	METHOD a setSpawnPos (Let;)V
 	METHOD a cloneWorldTag (Lhr;)Lhr;
+		ARG 1 playerTag
 	METHOD a updateProperties (Lhr;Lhr;)V
 		ARG 1 levelTag
+		ARG 2 playerTag
 	METHOD a setLevelName (Ljava/lang/String;)V
+	METHOD a setWanderingTraderId (Ljava/util/UUID;)V
+		ARG 1 wanderingTraderId
 	METHOD a setThundering (Z)V
 	METHOD b getSpawnX ()I
 	METHOD b setBorderSizeLerpTarget (D)V
@@ -113,7 +125,10 @@ CLASS cjf net/minecraft/world/level/LevelProperties
 	METHOD i getDimension ()I
 	METHOD i setBorderWarningTime (I)V
 	METHOD j getLevelName ()Ljava/lang/String;
+	METHOD j setWanderingTraderSpawnDelay (I)V
+		ARG 1 wanderingTraderSpawnDelay
 	METHOD k getVersion ()I
+	METHOD k setWanderingTraderSpawnChance (I)V
 	METHOD l getLastPlayed ()J
 	METHOD m isThundering ()Z
 	METHOD n getThunderTime ()I
@@ -128,3 +143,4 @@ CLASS cjf net/minecraft/world/level/LevelProperties
 	METHOD w getGameRules ()Lbcq;
 	METHOD x getDifficulty ()Lagb;
 	METHOD y isDifficultyLocked ()Z
+	METHOD z getScheduledEvents ()Lcmr;

mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping

@@ -1,5 +1,20 @@
 CLASS btg net/minecraft/world/level/storage/AlphaChunkIo
 	CLASS btg$a AlphaChunk
+		FIELD a lastUpdate J
+		FIELD b terrainPopulated Z
+		FIELD c heightMap [B
+		FIELD d blockLight Lbsw;
+		FIELD e skyLight Lbsw;
+		FIELD f data Lbsw;
+		FIELD g blocks [B
+		FIELD h entities Lhx;
+		FIELD i blockEntities Lhx;
+		FIELD j blockTicks Lhx;
+		FIELD k x I
+		FIELD l z I
+		METHOD <init> (II)V
+			ARG 1 x
+			ARG 2 z
 	METHOD a convertAlphaChunk (Lbtg$a;Lhr;Lbdt;)V
 		ARG 0 alphaChunk
 		ARG 1 tag

mappings/net/minecraft/world/level/storage/LevelStorage.mapping

@@ -1,11 +1,42 @@
 CLASS cji net/minecraft/world/level/storage/LevelStorage
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b TIME_FORMATTER Ljava/time/format/DateTimeFormatter;
+	FIELD c savesDirectory Ljava/nio/file/Path;
+	FIELD d backupsDirectory Ljava/nio/file/Path;
+	FIELD e dataFixer Lcom/mojang/datafixers/DataFixer;
+	METHOD <init> (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)V
+		ARG 1 savesDirectory
+		ARG 2 backupsDirectory
+		ARG 3 dataFixer
 	METHOD a getName ()Ljava/lang/String;
-	METHOD a isConvertible (Ljava/lang/String;)Z
+	METHOD a readLevelProperties (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lcjf;
-	METHOD a rename (Ljava/lang/String;Ljava/lang/String;)V
+		ARG 0 file
-	METHOD b getAvailableLevels ()Ljava/util/List;
+		ARG 1 dataFixer
-	METHOD b requiresConversion (Ljava/lang/String;)Lcjf;
+	METHOD a requiresConversion (Ljava/lang/String;)Z
+		ARG 1 name
+	METHOD a renameLevel (Ljava/lang/String;Ljava/lang/String;)V
+		ARG 1 name
+		ARG 2 newName
+	METHOD a convertLevel (Ljava/lang/String;Lzg;)Z
+		ARG 1 name
+		ARG 2 progressListener
+	METHOD a getLevelProperties (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Ljava/lang/String;)Lcjf;
+		ARG 0 savesDirectory
+		ARG 1 dataFixer
+		ARG 2 name
+	METHOD a deleteFilesRecursively ([Ljava/io/File;)Z
+		ARG 0 files
+	METHOD b getLevelList ()Ljava/util/List;
+	METHOD b getLevelProperties (Ljava/lang/String;)Lcjf;
 	METHOD b resolveFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File;
-	METHOD c canCreate (Ljava/lang/String;)Z
+	METHOD c getBackupsDirectory ()Ljava/nio/file/Path;
-	METHOD d delete (Ljava/lang/String;)Z
+	METHOD c isLevelNameValid (Ljava/lang/String;)Z
-	METHOD e exists (Ljava/lang/String;)Z
+		ARG 1 name
+	METHOD d getCurrentVersion ()I
+	METHOD d deleteLevel (Ljava/lang/String;)Z
+		ARG 1 name
+	METHOD e levelExists (Ljava/lang/String;)Z
+		ARG 1 name
+	METHOD f backupLevel (Ljava/lang/String;)J
+		ARG 1 name
 	METHOD g resolvePath (Ljava/lang/String;)Ljava/nio/file/Path;

mappings/net/minecraft/world/level/storage/LevelSummary.mapping

@@ -22,11 +22,12 @@ CLASS cjj net/minecraft/world/level/storage/LevelSummary
 	METHOD b getDisplayName ()Ljava/lang/String;
 	METHOD c getSizeOnDisk ()J
 	METHOD d requiresConversion ()Z
-	METHOD e lastPlayed ()J
+	METHOD e getLastPlayed ()J
 	METHOD f getGameMode ()Lbcr;
 	METHOD g isHardcore ()Z
-	METHOD h areCommandsAllowed ()Z
+	METHOD h hasCheats ()Z
 	METHOD i getVersionTextComponent ()Ljc;
+	METHOD l isDifferentVersion ()Z
 	METHOD m isFutureLevel ()Z
 	METHOD n isLegacyCustomizedWorld ()Z
 	METHOD o isOutdatedLevel ()Z

mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping

@@ -2,4 +2,5 @@ CLASS clt net/minecraft/world/loot/condition/AlternativeLootCondition
 	CLASS clt$a Builder
 	CLASS clt$b Factory
 	FIELD a terms [Lcmc;
+	FIELD b predicate Ljava/util/function/Predicate;
 	METHOD a or ([Lcmc$a;)Lclt$a;

mappings/net/minecraft/world/timer/FunctionTagTimerCallback.mapping

@@ -0,0 +1,3 @@
+CLASS cmo net/minecraft/world/timer/FunctionTagTimerCallback
+	CLASS cmo$a Serializer
+	FIELD a name Lqd;

mappings/net/minecraft/world/timer/FunctionTimerCallback.mapping

@@ -0,0 +1,3 @@
+CLASS cmn net/minecraft/world/timer/FunctionTimerCallback
+	CLASS cmn$a Serializer
+	FIELD a name Lqd;

mappings/net/minecraft/world/timer/Timer.mapping

@@ -0,0 +1,42 @@
+CLASS cmr net/minecraft/world/timer/Timer
+	CLASS cmr$a Event
+		FIELD a triggerTime J
+		FIELD b id Lcom/google/common/primitives/UnsignedLong;
+		FIELD c name Ljava/lang/String;
+		FIELD d callback Lcmp;
+		METHOD <init> (JLcom/google/common/primitives/UnsignedLong;Ljava/lang/String;Lcmp;)V
+			ARG 1 triggerTime
+			ARG 3 id
+			ARG 4 name
+			ARG 5 callback
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b callback Lcmq;
+	FIELD c events Ljava/util/Queue;
+	FIELD d eventCounter Lcom/google/common/primitives/UnsignedLong;
+	FIELD e eventsByName Ljava/util/Map;
+	METHOD <init> (Lcmq;)V
+		ARG 1 timerCallbackSerializer
+	METHOD a serialize (Lcmr$a;)Lhr;
+		ARG 1 event
+	METHOD a addEvent (Lhr;)V
+		ARG 1 tag
+	METHOD a fromTag (Lhx;)V
+		ARG 1 tag
+	METHOD a processEvents (Ljava/lang/Object;J)V
+		ARG 1 server
+		ARG 2 time
+	METHOD a addEvent (Ljava/lang/String;JLcmp;)Z
+	METHOD addEvent (Ljava/lang/String;JLcmp;)Z
+		ARG 1 name
+		ARG 2 triggerTime
+		ARG 4 callback
+	METHOD b toTag ()Lhx;
+	METHOD b replaceEvent (Ljava/lang/String;JLcmp;)V
+		ARG 1 name
+		ARG 2 triggerTime
+		ARG 4 callback
+	METHOD c createEventComparator ()Ljava/util/Comparator;
+	METHOD c setEvent (Ljava/lang/String;JLcmp;)V
+		ARG 1 name
+		ARG 2 triggerTime
+		ARG 4 callback

mappings/net/minecraft/world/timer/TimerCallback.mapping

@@ -0,0 +1,15 @@
+CLASS cmp net/minecraft/world/timer/TimerCallback
+	CLASS cmp$a Serializer
+		FIELD a id Lqd;
+		FIELD b callbackClass Ljava/lang/Class;
+		METHOD a getId ()Lqd;
+		METHOD a serialize (Lhr;Lcmp;)V
+			ARG 1 tag
+			ARG 2 callback
+		METHOD b getCallbackClass ()Ljava/lang/Class;
+		METHOD b deserialize (Lhr;)Lcmp;
+			ARG 1 tag
+	METHOD a call (Ljava/lang/Object;Lcmr;J)V
+		ARG 1 server
+		ARG 2 events
+		ARG 3 time

mappings/net/minecraft/world/timer/TimerCallbackSerializer.mapping

@@ -0,0 +1,12 @@
+CLASS cmq net/minecraft/world/timer/TimerCallbackSerializer
+	FIELD a INSTANCE Lcmq;
+	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD c serializersByType Ljava/util/Map;
+	FIELD d serializersByClass Ljava/util/Map;
+	METHOD a registerSerializer (Lcmp$a;)Lcmq;
+		ARG 1 serializer
+	METHOD a serialize (Lcmp;)Lhr;
+		ARG 1 callback
+	METHOD a deserialize (Lhr;)Lcmp;
+		ARG 1 tag
+	METHOD a getSerializer (Ljava/lang/Class;)Lcmp$a;

mappings/net/minecraft/world/updater/WorldUpdater.mapping

@@ -4,6 +4,7 @@ CLASS afs net/minecraft/world/updater/WorldUpdater
 	FIELD c levelName Ljava/lang/String;
 	FIELD d worldSaveHandler Lcjg;
 	FIELD e updateThread Ljava/lang/Thread;
+	FIELD f worldDirectory Ljava/io/File;
 	FIELD g keepUpgradingChunks Z
 	FIELD h isDone Z
 	FIELD i progress F
@@ -12,10 +13,13 @@ CLASS afs net/minecraft/world/updater/WorldUpdater
 	FIELD l skippedChunkCount I
 	FIELD m dimensionProgress Lit/unimi/dsi/fastutil/objects/Object2FloatMap;
 	FIELD n status Ljc;
+	FIELD o REGION_FILE_PATTERN Ljava/util/regex/Pattern;
 	FIELD p persistentStateManager Lcje;
 	METHOD a cancel ()V
 	METHOD a getProgress (Lbtl;)F
 	METHOD b isDone ()Z
+	METHOD b getChunkPositions (Lbtl;)Ljava/util/List;
+		ARG 1 dimensionType
 	METHOD c getProgress ()F
 	METHOD d getTotalChunkCount ()I
 	METHOD e getUpgradedChunkCount ()I