A few mappings (#631)

* A few mappings

* Suggestions by liach

* Improvements

* Add methods from liach's PR

* make -> get to match others

* get -> create for methods that create tasks

mappings/net/minecraft/advancement/Advancement.mapping

@@ -1,4 +1,4 @@
-CLASS q net/minecraft/advancement/SimpleAdvancement
+CLASS q net/minecraft/advancement/Advancement
 	CLASS q$a Task
 		FIELD a parentId Lqs;
 		FIELD b parentObj Lq;
@@ -9,6 +9,9 @@ CLASS q net/minecraft/advancement/SimpleAdvancement
 		FIELD g merger Lab;
 		METHOD a create ()Lq$a;
 		METHOD a criteriaMerger (Lab;)Lq$a;
+		METHOD a display (Lbbx;Ljm;Ljm;Lqs;Laa;ZZZ)Lq$a;
+			ARG 1 stack
+			ARG 2 textComponent2
 		METHOD a display (Lbhc;Ljm;Ljm;Lqs;Laa;ZZZ)Lq$a;
 		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq$a;
 			ARG 0 obj

mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping

@@ -13,6 +13,7 @@ CLASS ae net/minecraft/advancement/criterion/BredAnimalsCriterion
 		FIELD a parent Lav;
 		FIELD b partner Lav;
 		FIELD c child Lav;
+		METHOD a create (Lav$a;)Lae$b;
 		METHOD a matches (Lvg;Laqo;Laqo;Laib;)Z
 		METHOD c any ()Lae$b;
 	FIELD a ID Lqs;

mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping

@@ -1,7 +1,15 @@
 CLASS ah net/minecraft/advancement/criterion/ChanneledLightningCriterion
+	CLASS ah$a Handler
+		FIELD a manager Lrb;
+		FIELD b conditions Ljava/util/Set;
+		METHOD a isEmpty ()Z
+		METHOD a handle (Lvg;Ljava/util/Collection;)V
+		METHOD a addCondition (Lx$a;)V
+		METHOD b removeCondition (Lx$a;)V
 	CLASS ah$b Conditions
 		FIELD a victims [Lav;
 		METHOD a matches (Lvg;Ljava/util/Collection;)Z
 		METHOD a create ([Lav;)Lah$b;
 			ARG 0 victims
 	FIELD a ID Lqs;
+	METHOD a handle (Lvg;Ljava/util/Collection;)V

mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping

@@ -8,6 +8,7 @@ CLASS ao net/minecraft/advancement/criterion/EffectsChangedCriterion
 		METHOD b removeCondition (Lx$a;)V
 	CLASS ao$b Conditions
 		FIELD a effects Lbj;
+		METHOD a create (Lbj;)Lao$b;
 		METHOD a matches (Lvg;)Z
 	FIELD a ID Lqs;
 	FIELD b handlers Ljava/util/Map;

mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping

@@ -13,3 +13,4 @@ CLASS ar net/minecraft/advancement/criterion/EnterBlockCriterion
 		METHOD a matches (Lbvf;)Z
 	FIELD a ID Lqs;
 	FIELD b handlers Ljava/util/Map;
+	METHOD a handle (Lvg;Lbvf;)V

mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping

@@ -12,6 +12,7 @@ CLASS au net/minecraft/advancement/criterion/EntityHurtPlayerCriterion
 		METHOD b removeCondition (Lx$a;)V
 	CLASS au$b Conditions
 		FIELD a damage Lal;
+		METHOD a create (Lal$a;)Lau$b;
 		METHOD a matches (Lvg;Lahm;FFZ)Z
 	FIELD a ID Lqs;
 	FIELD b handlers Ljava/util/Map;

mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping

@@ -1,6 +1,16 @@
 CLASS ax net/minecraft/advancement/criterion/FilledBucketCriterion
+	CLASS ax$a Handler
+		FIELD a manager Lrb;
+		FIELD b conditions Ljava/util/Set;
+		METHOD <init> (Lrb;)V
+			ARG 1 manager
+		METHOD a isEmpty ()Z
+		METHOD a handle (Lbbx;)V
+		METHOD a addCondition (Lx$a;)V
+		METHOD b removeCondition (Lx$a;)V
 	CLASS ax$b Conditions
 		FIELD a item Lbc;
 		METHOD a matches (Lbbx;)Z
 		METHOD a create (Lbc;)Lax$b;
 	FIELD a ID Lqs;
+	METHOD a handle (Lvg;Lbbx;)V

mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping

@@ -1,4 +1,13 @@
 CLASS ay net/minecraft/advancement/criterion/FishingRodHookedCriterion
+	CLASS ay$a Handler
+		FIELD a manager Lrb;
+		FIELD b conditions Ljava/util/Set;
+		METHOD <init> (Lrb;)V
+			ARG 1 manager
+		METHOD a isEmpty ()Z
+		METHOD a handle (Lvg;Lbbx;Latg;Ljava/util/Collection;)V
+		METHOD a addCondition (Lx$a;)V
+		METHOD b removeCondition (Lx$a;)V
 	CLASS ay$b Conditions
 		FIELD a rod Lbc;
 		FIELD b entity Lav;
@@ -9,3 +18,4 @@ CLASS ay net/minecraft/advancement/criterion/FishingRodHookedCriterion
 		METHOD a create (Lbc;Lav;Lbc;)Lay$b;
 		METHOD a matches (Lvg;Lbbx;Latg;Ljava/util/Collection;)Z
 	FIELD a ID Lqs;
+	METHOD a handle (Lvg;Lbbx;Latg;Ljava/util/Collection;)V

mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping

@@ -11,6 +11,7 @@ CLASS bb net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion
 		FIELD b durability Lbi$d;
 		FIELD c delta Lbi$d;
 		METHOD a matches (Lbbx;I)Z
+		METHOD a create (Lbc;Lbi$d;)Lbb$b;
 	FIELD a ID Lqs;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a handle (Lvg;Lbbx;I)V

mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping

@@ -9,7 +9,9 @@ CLASS bd net/minecraft/advancement/criterion/KilledByCrossbowCriterion
 	CLASS bd$b Conditions
 		FIELD a victims [Lav;
 		FIELD b uniqueEntityTypes Lbi$d;
+		METHOD a create (Lbi$d;)Lbd$b;
 		METHOD a matches (Lvg;Ljava/util/Collection;I)Z
+		METHOD a create ([Lav$a;)Lbd$b;
 	FIELD a ID Lqs;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a trigger (Lvg;Ljava/util/Collection;I)V

mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping

@@ -11,6 +11,7 @@ CLASS bf net/minecraft/advancement/criterion/LevitationCriterion
 	CLASS bf$b Conditions
 		FIELD a distance Lan;
 		FIELD b duration Lbi$d;
+		METHOD a create (Lan;)Lbf$b;
 		METHOD a matches (Lvg;Lcrr;I)Z
 	FIELD a ID Lqs;
 	FIELD b handlers Ljava/util/Map;

mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping

@@ -10,7 +10,10 @@ CLASS bh net/minecraft/advancement/criterion/LocationArrivalCriterion
 		METHOD b removeCondition (Lx$a;)V
 	CLASS bh$b Conditions
 		FIELD a location Lbg;
+		METHOD a create (Lbg;)Lbh$b;
 		METHOD a matches (Lvf;DDD)Z
+		METHOD c createSleptInBed ()Lbh$b;
+		METHOD d createHeroOfTheVillage ()Lbh$b;
 	FIELD a id Lqs;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a handle (Lvg;)V

mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping

@@ -9,8 +9,11 @@ CLASS be net/minecraft/advancement/criterion/OnKilledCriterion
 	CLASS be$b Conditions
 		FIELD a entity Lav;
 		FIELD b killingBlow Lam;
-		METHOD a createKill (Lav$a;)Lbe$b;
+		METHOD a createPlayerKilledEntity (Lav$a;)Lbe$b;
+		METHOD a createPlayerKilledEntity (Lav$a;Lam$a;)Lbe$b;
 		METHOD a test (Lvg;Laid;Lahm;)Z
+		METHOD c createPlayerKilledEntity ()Lbe$b;
+		METHOD d createEntityKilledPlayer ()Lbe$b;
 	FIELD a handlers Ljava/util/Map;
 	FIELD b id Lqs;
 	METHOD a handle (Lvg;Laid;Lahm;)V

mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping

@@ -10,6 +10,7 @@ CLASS bn net/minecraft/advancement/criterion/PlayerHurtEntityCriterion
 	CLASS bn$b Conditions
 		FIELD a damage Lal;
 		FIELD b entity Lav;
+		METHOD a create (Lal$a;)Lbn$b;
 		METHOD a matches (Lvg;Laid;Lahm;FFZ)Z
 	FIELD a ID Lqs;
 	FIELD b handlers Ljava/util/Map;

mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping

@@ -8,6 +8,7 @@ CLASS bq net/minecraft/advancement/criterion/SummonedEntityCriterion
 		METHOD b removeCondition (Lx$a;)V
 	CLASS bq$b Conditions
 		FIELD a entity Lav;
+		METHOD a create (Lav$a;)Lbq$b;
 		METHOD a matches (Lvg;Laid;)Z
 	FIELD a ID Lqs;
 	FIELD b handlers Ljava/util/Map;

mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping

@@ -9,6 +9,7 @@ CLASS br net/minecraft/advancement/criterion/TameAnimalCriterion
 		METHOD b removeCondition (Lx$a;)V
 	CLASS br$b Conditions
 		FIELD a entity Lav;
+		METHOD a create (Lav;)Lbr$b;
 		METHOD a matches (Lvg;Laqo;)Z
 		METHOD c any ()Lbr$b;
 	FIELD a ID Lqs;

mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping

@@ -9,6 +9,7 @@ CLASS bv net/minecraft/advancement/criterion/UsedTotemCriterion
 	CLASS bv$b Conditions
 		FIELD a item Lbc;
 		METHOD a matches (Lbbx;)Z
+		METHOD a create (Lbhc;)Lbv$b;
 	FIELD a ID Lqs;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a handle (Lvg;Lbbx;)V

mappings/net/minecraft/block/Material.mapping

@@ -1,19 +1,19 @@
 CLASS ckz net/minecraft/block/Material
 	CLASS ckz$a Builder
 		FIELD a pistonBehavior Lclb;
-		FIELD b suffocates Z
+		FIELD b blocksMovement Z
 		FIELD c burnable Z
 		FIELD d breakByHand Z
 		FIELD e liquid Z
 		FIELD f replaceable Z
-		FIELD g flag7 Z
+		FIELD g solid Z
 		FIELD h color Lcla;
 		FIELD i blocksLight Z
 		METHOD <init> (Lcla;)V
 			ARG 1 color
 		METHOD a liquid ()Lckz$a;
-		METHOD b setFlag7 ()Lckz$a;
+		METHOD b notSolid ()Lckz$a;
-		METHOD c suffocates ()Lckz$a;
+		METHOD c allowsMovement ()Lckz$a;
 		METHOD d requiresTool ()Lckz$a;
 		METHOD e burnable ()Lckz$a;
 		METHOD f replaceable ()Lckz$a;
@@ -39,13 +39,13 @@ CLASS ckz net/minecraft/block/Material
 	FIELD P CAKE Lckz;
 	FIELD Q color Lcla;
 	FIELD R pistonBehavior Lclb;
-	FIELD S suffocates Z
+	FIELD S blocksMovement Z
 	FIELD T burnable Z
 	FIELD U breakByHand Z
 	FIELD V liquid Z
 	FIELD W blocksLight Z
 	FIELD X replaceable Z
-	FIELD Y flag7 Z
+	FIELD Y solid Z
 	FIELD a AIR Lckz;
 	FIELD b STRUCTURE_VOID Lckz;
 	FIELD c PORTAL Lckz;
@@ -75,15 +75,16 @@ CLASS ckz net/minecraft/block/Material
 	METHOD <init> (Lcla;ZZZZZZZLclb;)V
 		ARG 1 color
 		ARG 2 liquid
-		ARG 3 flag7
+		ARG 3 solid
-		ARG 4 suffocates
+		ARG 4 blocksMovement
-		ARG 5 flag5
+		ARG 5 blocksLight
-		ARG 6 flag3
+		ARG 6 breakByHand
 		ARG 7 burnable
 		ARG 8 replaceable
 		ARG 9 pistonBehavior
 	METHOD a isLiquid ()Z
-	METHOD c suffocates ()Z
+	METHOD b isSolid ()Z
+	METHOD c blocksMovement ()Z
 	METHOD d isBurnable ()Z
 	METHOD e isReplaceable ()Z
 	METHOD f blocksLight ()Z

mappings/net/minecraft/client/render/block/FluidRenderer.mapping

@@ -4,3 +4,16 @@ CLASS dkz net/minecraft/client/render/block/FluidRenderer
 	FIELD c waterOverlaySprite Lduc;
 	METHOD a onResourceReload ()V
 	METHOD a tesselate (Lbgm;Lev;Lcuf;Lckv;)Z
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 bufferBuilder
+		ARG 4 state
+	METHOD a getNorthWestCornerFluidHeight (Lbgo;Lev;Lcku;)F
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 fluid
+	METHOD a isSameFluid (Lbgo;Lev;Lfa;Lckv;)Z
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 side
+		ARG 3 state

mappings/net/minecraft/client/util/NarratorManager.mapping

@@ -3,4 +3,7 @@ CLASS cwb net/minecraft/client/util/NarratorManager
 	FIELD d narrator Lcom/mojang/text2speech/Narrator;
 	METHOD a isActive ()Z
 	METHOD a addToast (Lcvg;)V
+	METHOD a narrate (ZLjava/lang/String;)V
+		ARG 1 interrupt
+		ARG 2 message
 	METHOD b clear ()V

mappings/net/minecraft/command/arguments/BlockArgumentParser.mapping

@@ -18,6 +18,7 @@ CLASS dh net/minecraft/command/arguments/BlockArgumentParser
 	FIELD q tagId Lqs;
 	FIELD r cursorPos I
 	FIELD s suggestions Ljava/util/function/Function;
+	METHOD a getBlockProperties ()Ljava/util/Map;
 	METHOD a stringifyBlockState (Lbvf;)Ljava/lang/String;
 	METHOD a parsePropertyValue (Lbwi;Ljava/lang/String;I)V
 	METHOD a getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
@@ -29,6 +30,7 @@ CLASS dh net/minecraft/command/arguments/BlockArgumentParser
 	METHOD b suggestBlockPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 	METHOD c getNbtData ()Lib;
 	METHOD c suggestTagPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+	METHOD d getTagId ()Lqs;
 	METHOD d suggestBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 	METHOD e parseBlockId ()V
 	METHOD e suggestTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;

mappings/net/minecraft/command/arguments/BrigadierArgumentTypes.mapping

@@ -1,2 +1,9 @@
 CLASS en net/minecraft/command/arguments/BrigadierArgumentTypes
 	METHOD a register ()V
+	METHOD a hasMin (B)Z
+		ARG 0 rangeFlag
+	METHOD a createFlag (ZZ)B
+		ARG 0 hasMin
+		ARG 1 hasMax
+	METHOD b hasMax (B)Z
+		ARG 0 rangeFlag

mappings/net/minecraft/command/arguments/FunctionArgumentType.mapping

@@ -1,4 +1,7 @@
 CLASS dv net/minecraft/command/arguments/FunctionArgumentType
+	CLASS dv$a FunctionArgument
+		METHOD a getFunctions (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection;
+		METHOD b getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;)Lcom/mojang/datafixers/util/Either;
 	FIELD a EXAMPLES Ljava/util/Collection;
 	FIELD b UNKNOWN_FUNCTION_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD c UNKNOWN_FUNCTION_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;

mappings/net/minecraft/command/arguments/ItemStackArgument.mapping

@@ -3,3 +3,6 @@ CLASS dx net/minecraft/command/arguments/ItemStackArgument
 	FIELD b item Lbbs;
 	FIELD c tag Lib;
 	METHOD a getItem ()Lbbs;
+	METHOD a createStack (IZ)Lbbx;
+		ARG 1 amount
+		ARG 2 checkOverstack

mappings/net/minecraft/command/arguments/ItemStringReader.mapping

@@ -1,17 +1,25 @@
 CLASS dy net/minecraft/command/arguments/ItemStringReader
 	FIELD a TAG_DISALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD b ID_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD c NBT_SUGGESTION_PROVIDER Ljava/util/function/Function;
 	FIELD d reader Lcom/mojang/brigadier/StringReader;
+	FIELD e allowTag Z
 	FIELD g item Lbbs;
 	FIELD h tag Lib;
 	FIELD i id Lqs;
 	FIELD j cursor I
 	FIELD k suggestions Ljava/util/function/Function;
+	METHOD <init> (Lcom/mojang/brigadier/StringReader;Z)V
+		ARG 1 reader
+		ARG 2 allowTag
 	METHOD b getItem ()Lbbs;
+	METHOD b suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 	METHOD c getTag ()Lib;
-	METHOD c suggestIdentifiers (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+	METHOD c suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 suggestionsBuilder
 	METHOD d getId ()Lqs;
+	METHOD d suggestAny (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 	METHOD e readItem ()V
-	METHOD g readTag ()V
+	METHOD f readTag ()V
+	METHOD g readNbt ()V
 	METHOD h consume ()Ldy;

mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping

@@ -1,12 +1,91 @@
 CLASS cr net/minecraft/command/arguments/NbtPathArgumentType
+	CLASS cr$a AllListElementsNode
+		FIELD a INSTANCE Lcr$a;
+	CLASS cr$b CompoundChildNode
+		FIELD a name Ljava/lang/String;
+	CLASS cr$c ListIndexNode
+		FIELD a index I
+		METHOD <init> (I)V
+			ARG 1 index
+	CLASS cr$e EqualListElementNode
+		FIELD a tag Lib;
+		FIELD b predicate Ljava/util/function/Predicate;
+	CLASS cr$f EqualCompundChildNode
+		FIELD a name Ljava/lang/String;
+		FIELD b tag Lib;
+		FIELD c predicate Ljava/util/function/Predicate;
+		METHOD <init> (Ljava/lang/String;Lib;)V
+			ARG 1 name
+			ARG 2 tag
+	CLASS cr$g EqualCompoundNode
+		FIELD a predicate Ljava/util/function/Predicate;
+		METHOD <init> (Lib;)V
+			ARG 1 tag
+	CLASS cr$h NbtPath
+		FIELD a string Ljava/lang/String;
+		FIELD b nodeEndIndices Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+		FIELD c nodes [Lcr$i;
+		METHOD <init> (Ljava/lang/String;[Lcr$i;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)V
+			ARG 1 string
+			ARG 2 nodes
+			ARG 3 nodeEndIndices
+		METHOD a createNothingFoundException (Lcr$i;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;
+			ARG 1 node
+		METHOD a get (Lis;)Ljava/util/List;
+			ARG 1 tag
+		METHOD a putIfAbsent (Lis;Ljava/util/function/Supplier;)Ljava/util/List;
+			ARG 1 tag
+			ARG 2 supplier
+		METHOD a forEach (Ljava/util/List;Ljava/util/function/Function;)I
+			ARG 0 tags
+			ARG 1 function
+		METHOD b count (Lis;)I
+			ARG 1 tag
+		METHOD b put (Lis;Ljava/util/function/Supplier;)I
+			ARG 1 tag
+			ARG 2 supplier
+		METHOD c remove (Lis;)I
+			ARG 1 tag
+		METHOD d getParents (Lis;)Ljava/util/List;
+			ARG 1 tag
 	CLASS cr$i NbtPathNode
-	FIELD a INVALID_NBT_PATH_NODE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
+		METHOD a createParent ()Lis;
-	FIELD b NBT_PATH_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+		METHOD a remove (Lis;)I
+			ARG 1 tag
+		METHOD a get (Lis;Ljava/util/List;)V
+			ARG 1 tag
+			ARG 2 results
+		METHOD a put (Lis;Ljava/util/function/Supplier;)I
+			ARG 1 tag
+			ARG 2 supplier
+		METHOD a putIfAbsent (Lis;Ljava/util/function/Supplier;Ljava/util/List;)V
+			ARG 1 tag
+			ARG 2 supplier
+			ARG 3 results
+		METHOD a get (Ljava/util/List;)Ljava/util/List;
+			ARG 1 tags
+		METHOD a get (Ljava/util/List;Ljava/util/function/BiConsumer;)Ljava/util/List;
+			ARG 1 tags
+			ARG 2 getter
+		METHOD a putIfAbsent (Ljava/util/List;Ljava/util/function/Supplier;)Ljava/util/List;
+			ARG 1 tags
+			ARG 2 supplier
+	FIELD a INVALID_PATH_NODE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
+	FIELD b NOTHING_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD c EXAMPLES Ljava/util/Collection;
 	METHOD a create ()Lcr;
+	METHOD a isNameCharacter (C)Z
+		ARG 0 c
+	METHOD a readCompoundChildNode (Lcom/mojang/brigadier/StringReader;Ljava/lang/String;)Lcr$i;
+		ARG 0 reader
+		ARG 1 name
 	METHOD a parseNode (Lcom/mojang/brigadier/StringReader;Z)Lcr$i;
 		ARG 0 reader
 		ARG 1 first
 	METHOD a getNbtPath (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcr$h;
 		ARG 0 context
 		ARG 1 name
+	METHOD b readName (Lcom/mojang/brigadier/StringReader;)Ljava/lang/String;
+		ARG 0 reader
+	METHOD b getEqualityPredicate (Lib;)Ljava/util/function/Predicate;
+		ARG 0 tag

mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping

@@ -5,8 +5,17 @@ CLASS bfs net/minecraft/enchantment/ProtectionEnchantment
 		FIELD c FALL Lbfs$a;
 		FIELD d EXPLOSION Lbfs$a;
 		FIELD e PROJECTILE Lbfs$a;
+		FIELD f name Ljava/lang/String;
+		FIELD g basePower I
+		FIELD h powerPerLevel I
+		METHOD <init> (Ljava/lang/String;II)V
+			ARG 1 name
+			ARG 2 basePower
+			ARG 3 powerPerLevel
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;II)V
 			ARG 3 name
+		METHOD b getBasePower ()I
+		METHOD c getPowerPerLevel ()I
 	FIELD a type Lbfs$a;
 	METHOD <init> (Lbff$a;Lbfs$a;[Laii;)V
 		ARG 1 weight

mappings/net/minecraft/entity/ai/brain/WalkTarget.mapping

@@ -11,7 +11,7 @@ CLASS apa net/minecraft/entity/ai/brain/WalkTarget
 		ARG 3 completionRange
 	METHOD <init> (Lev;FI)V
 		ARG 1 pos
-		ARG 2 speedFactor
+		ARG 2 speed
 		ARG 3 completionRange
 	METHOD a getLookTarget ()Lakl;
 	METHOD b getSpeed ()F

mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping

@@ -4,6 +4,10 @@ CLASS ajo net/minecraft/entity/ai/brain/task/LookTargetUtil
 	METHOD a give (Laim;Lbbx;Laim;)V
 	METHOD a canSee (Lajb;Laim;)Z
 	METHOD a canSee (Lajb;Laoy;Laih;)Z
+	METHOD a getPosClosestToOccupiedPointOfInterest (Lvf;Lfo;I)Lfo;
+		ARG 0 world
+		ARG 1 center
+		ARG 2 radius
 	METHOD b lookAtEachOther (Laim;Laim;)V
 	METHOD c lookAt (Laim;Laim;)V
 	METHOD d walkTowardsEachOther (Laim;Laim;)V

mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping

@@ -1,17 +1,19 @@
 CLASS alm net/minecraft/entity/ai/brain/task/VillagerTaskListProvider
-	METHOD a getPlayTasks (F)Lcom/google/common/collect/ImmutableList;
+	METHOD a createFreeFollowTask ()Lcom/mojang/datafixers/util/Pair;
-	METHOD a getCoreTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
+	METHOD a createPlayTasks (F)Lcom/google/common/collect/ImmutableList;
+	METHOD a createCoreTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
 		ARG 0 profession
-	METHOD b getWorkTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
+	METHOD b createBusyFollowTask ()Lcom/mojang/datafixers/util/Pair;
+	METHOD b createWorkTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
 		ARG 0 profession
-	METHOD c getRestTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
+	METHOD c createRestTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
 		ARG 0 profession
-	METHOD d getMeetTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
+	METHOD d createMeetTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
 		ARG 0 profession
-	METHOD e getIdleTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
+	METHOD e createIdleTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
 		ARG 0 profession
-	METHOD f getPanicTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
+	METHOD f createPanicTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
 		ARG 0 profession
-	METHOD g getPreRaidTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
+	METHOD g createPreRaidTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
-	METHOD h getRaidTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
+	METHOD h createRaidTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
-	METHOD i getHideTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;
+	METHOD i createHideTasks (Lavk;F)Lcom/google/common/collect/ImmutableList;

mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping

@@ -0,0 +1,5 @@
+CLASS akq net/minecraft/entity/ai/brain/task/WalkHomeTask
+	FIELD a speed F
+	FIELD b lastRunTime J
+	METHOD <init> (F)V
+		ARG 1 speed

mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping

@@ -0,0 +1,2 @@
+CLASS ajy net/minecraft/entity/ai/brain/task/WanderIndoorsTask
+	FIELD a speed F

mappings/net/minecraft/entity/ai/goal/WanderAroundPointOfInterestGoal.mapping

@@ -0,0 +1 @@
+CLASS and net/minecraft/entity/ai/goal/WanderAroundPointOfInterestGoal

mappings/net/minecraft/fluid/BaseFluid.mapping

@@ -4,16 +4,44 @@ CLASS ckt net/minecraft/fluid/BaseFluid
 	FIELD f shapeCache Ljava/util/Map;
 	METHOD a getFlowing (IZ)Lckv;
 		ARG 1 level
-		ARG 2 still
+		ARG 2 falling
-	METHOD a (Lbhg;Lev;Lbvf;)Lckv;
+	METHOD a getNextTickDelay (Lbhd;Lev;Lckv;Lckv;)I
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 oldState
+		ARG 4 newState
+	METHOD a beforeBreakingBlock (Lbhe;Lev;Lbvf;)V
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
-	METHOD a getState (Z)Lckv;
+	METHOD a flow (Lbhe;Lev;Lbvf;Lfa;Lckv;)V
-		ARG 1 still
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+		ARG 5 fluidState
+	METHOD a (Lbhe;Lev;Lckv;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+	METHOD a getUpdatedState (Lbhg;Lev;Lbvf;)Lckv;
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+	METHOD a receivesFlow (Lfa;Lbgo;Lev;Lbvf;Lev;Lbvf;)Z
+		ARG 1 face
+		ARG 2 world
+		ARG 3 pos
+		ARG 4 state
+		ARG 5 fromPos
+		ARG 6 fromState
+	METHOD a getStill (Z)Lckv;
+		ARG 1 falling
+	METHOD c getLevelDecreasePerBlock (Lbhg;)I
+		ARG 1 world
 	METHOD c isFluidAboveEqual (Lckv;Lbgo;Lev;)Z
 		ARG 0 state
 		ARG 1 view
 		ARG 2 pos
 	METHOD e getFlowing ()Lcku;
 	METHOD f getStill ()Lcku;
+	METHOD g isInfinite ()Z

mappings/net/minecraft/fluid/Fluid.mapping

@@ -3,7 +3,14 @@ CLASS cku net/minecraft/fluid/Fluid
 	FIELD c STATE_IDS Lfe;
 	FIELD d stateFactory Lbvg;
 	METHOD a getRenderLayer ()Lbgp;
+	METHOD a getVelocity (Lbgo;Lev;Lckv;)Lcrr;
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
 	METHOD a onScheduledTick (Lbhd;Lev;Lckv;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
 	METHOD a randomDisplayTick (Lbhd;Lev;Lckv;Ljava/util/Random;)V
 	METHOD a getTickRate (Lbhg;)I
 	METHOD a appendProperties (Lbvg$a;)V

mappings/net/minecraft/fluid/FluidState.mapping

@@ -10,6 +10,9 @@ CLASS ckv net/minecraft/fluid/FluidState
 	METHOD a matches (Lza;)Z
 	METHOD b onRandomTick (Lbhd;Lev;Ljava/util/Random;)V
 	METHOD c getFluid ()Lcku;
+	METHOD c getVelocity (Lbgo;Lev;)Lcrr;
+		ARG 1 world
+		ARG 2 pos
 	METHOD d isStill ()Z
 	METHOD d getShape (Lbgo;Lev;)Lcsl;
 	METHOD e isEmpty ()Z

mappings/net/minecraft/scoreboard/Scoreboard.mapping

@@ -34,6 +34,7 @@ CLASS csr net/minecraft/scoreboard/Scoreboard
 	METHOD b updateExistingObjective (Lcso;)V
 	METHOD b updateScoreboardTeam (Lcsp;)V
 	METHOD b containsObjective (Ljava/lang/String;)Z
+		ARG 1 name
 	METHOD b playerHasObjective (Ljava/lang/String;Lcso;)Z
 		ARG 1 playerName
 	METHOD b removePlayerFromTeam (Ljava/lang/String;Lcsp;)V
@@ -42,10 +43,13 @@ CLASS csr net/minecraft/scoreboard/Scoreboard
 	METHOD c updateRemovedObjective (Lcso;)V
 	METHOD c updateRemovedTeam (Lcsp;)V
 	METHOD c getObjective (Ljava/lang/String;)Lcso;
+		ARG 1 name
 	METHOD c getPlayerScore (Ljava/lang/String;Lcso;)Lcsq;
 		ARG 1 player
 	METHOD d getObjectiveNames ()Ljava/util/Collection;
 	METHOD d removeTeam (Lcsp;)V
+	METHOD d getNullableObjective (Ljava/lang/String;)Lcso;
+		ARG 1 name
 	METHOD d resetPlayerScore (Ljava/lang/String;Lcso;)V
 		ARG 1 playerName
 	METHOD e getKnownPlayers ()Ljava/util/Collection;

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -95,6 +95,7 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD a createWorlds (Lcnx;Lcnw;Lbhh;Lvo;)V
 	METHOD a getPermissionLevel (Lcom/mojang/authlib/GameProfile;)I
 	METHOD a setCrashReport (Ld;)V
+	METHOD a upgradeWorld (Ljava/lang/String;)V
 	METHOD a setResourcePack (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 1 url
 	METHOD a setKeyPair (Ljava/security/KeyPair;)V

mappings/net/minecraft/text/ChatMessageType.mapping

@@ -1,7 +1,9 @@
 CLASS jk net/minecraft/text/ChatMessageType
 	FIELD d id B
+	FIELD e interruptsNarration Z
 	METHOD <init> (Ljava/lang/String;IBZ)V
 		ARG 3 id
 	METHOD a getId ()B
 	METHOD a byId (B)Ljk;
 		ARG 0 id
+	METHOD b interruptsNarration ()Z

mappings/net/minecraft/text/NbtTextComponent.mapping

@@ -1,14 +1,32 @@
 CLASS jr net/minecraft/text/NbtTextComponent
 	CLASS jr$a BlockPosArgument
 		FIELD e pos Ljava/lang/String;
+		FIELD f parsedPos Ldl;
+		METHOD b parsePos (Ljava/lang/String;)Ldl;
+			ARG 1 pos
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
 		METHOD k getPos ()Ljava/lang/String;
 	CLASS jr$b EntityNbtTextComponent
 		FIELD e selector Ljava/lang/String;
+		FIELD f parsedSelector Lec;
+		METHOD b parseSelector (Ljava/lang/String;)Lec;
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
 		METHOD k getSelector ()Ljava/lang/String;
+	FIELD b componentJson Z
 	FIELD c path Ljava/lang/String;
+	FIELD d parsedPath Lcr$h;
 	FIELD e LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD <init> (Ljava/lang/String;Lcr$h;Z)V
+		ARG 1 path
+		ARG 2 parsedPath
+		ARG 3 componentJson
+	METHOD <init> (Ljava/lang/String;Z)V
+		ARG 1 path
+	METHOD a resolve (Lcd;)Ljava/util/stream/Stream;
+		ARG 1 source
+	METHOD b parsePath (Ljava/lang/String;)Lcr$h;
+		ARG 0 string
 	METHOD i getPath ()Ljava/lang/String;
+	METHOD j isComponentJson ()Z

mappings/net/minecraft/text/TextComponentWithSelectors.mapping

@@ -1,3 +1,3 @@
 CLASS jo net/minecraft/text/TextComponentWithSelectors
-	METHOD a resolveSelectors (Lcd;Laid;)Ljm;
+	METHOD a resolve (Lcd;Laid;)Ljm;
 		ARG 1 source

mappings/net/minecraft/text/TextFormat.mapping

@@ -11,6 +11,7 @@ CLASS c net/minecraft/text/TextFormat
 		ARG 0 code
 	METHOD a byId (I)Lc;
 		ARG 0 id
+	METHOD a getFormatAtEnd (Ljava/lang/String;)Ljava/lang/String;
 	METHOD a getNames (ZZ)Ljava/util/Collection;
 		ARG 0 colors
 		ARG 1 modifiers

mappings/net/minecraft/text/TextFormatter.mapping

@@ -1,8 +1,14 @@
 CLASS jn net/minecraft/text/TextFormatter
+	METHOD a resolveAndStyle (Lcd;Ljm;Laid;)Ljm;
+		ARG 0 source
+		ARG 1 component
+		ARG 2 entity
 	METHOD a profile (Lcom/mojang/authlib/GameProfile;)Ljm;
 	METHOD a message (Lcom/mojang/brigadier/Message;)Ljm;
 	METHOD a sortedJoin (Ljava/util/Collection;)Ljm;
 	METHOD a sortedJoin (Ljava/util/Collection;Ljava/util/function/Function;)Ljm;
 	METHOD a bracketed (Ljm;)Ljm;
-	METHOD a addStyle (Ljm;Lju;)Ljm;
+	METHOD a style (Ljm;Lju;)Ljm;
+		ARG 0 component
+		ARG 1 style
 	METHOD b join (Ljava/util/Collection;Ljava/util/function/Function;)Ljm;

mappings/net/minecraft/util/DyeColor.mapping

@@ -9,6 +9,14 @@ CLASS bau net/minecraft/util/DyeColor
 	FIELD w colorSwapped I
 	FIELD x colorComponents [F
 	FIELD y fireworkColor I
+	FIELD z signColor I
+	METHOD <init> (ILjava/lang/String;ILcla;II)V
+		ARG 1 id
+		ARG 2 name
+		ARG 3 color
+		ARG 4 materialColor
+		ARG 5 fireworkColor
+		ARG 6 signColor
 	METHOD <init> (Ljava/lang/String;IILjava/lang/String;ILcla;II)V
 		ARG 3 woolId
 		ARG 4 name
@@ -24,3 +32,4 @@ CLASS bau net/minecraft/util/DyeColor
 	METHOD d getColorComponents ()[F
 	METHOD e getMaterialColor ()Lcla;
 	METHOD f getFireworkColor ()I
+	METHOD g getSignColor ()I

mappings/net/minecraft/util/GameTaskQueue.mapping

@@ -1 +0,0 @@
-CLASS agj net/minecraft/util/GameTaskQueue

mappings/net/minecraft/util/GlobalPos.mapping

@@ -3,6 +3,8 @@ CLASS fc net/minecraft/util/GlobalPos
 	FIELD b pos Lev;
 	METHOD a getDimension ()Lbxz;
 	METHOD a create (Lbxz;Lev;)Lfc;
+	METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lfc;
+		ARG 0 dynamic
 	METHOD b getPos ()Lev;
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o

mappings/net/minecraft/util/MetricsData.mapping

@@ -1,7 +1,9 @@
 CLASS zk net/minecraft/util/MetricsData
 	FIELD a samples [J
+	FIELD b startIndex I
 	FIELD c sampleCount I
 	FIELD d writeIndex I
+	METHOD a getStartIndex ()I
 	METHOD a pushSample (J)V
 		ARG 1 time
 	METHOD b getCurrentIndex ()I

mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping

@@ -0,0 +1,3 @@
+CLASS agj net/minecraft/util/NonBlockingThreadExecutor
+	FIELD b runningTasks I
+	METHOD bg hasRunningTasks ()Z

mappings/net/minecraft/util/NumberRange.mapping

@@ -11,9 +11,12 @@ CLASS bi net/minecraft/util/NumberRange
 			ARG 0 element
 		METHOD a parse (Lcom/mojang/brigadier/StringReader;)Lbi$c;
 			ARG 0 reader
-		METHOD a (Lcom/mojang/brigadier/StringReader;Ljava/lang/Float;Ljava/lang/Float;)Lbi$c;
+		METHOD a create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Float;Ljava/lang/Float;)Lbi$c;
+			ARG 0 reader
 			ARG 1 min
 			ARG 2 max
+		METHOD a parse (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lbi$c;
+			ARG 0 reader
 		METHOD a squared (Ljava/lang/Float;)Ljava/lang/Double;
 			ARG 0 value
 		METHOD b atLeast (F)Lbi$c;
@@ -51,8 +54,13 @@ CLASS bi net/minecraft/util/NumberRange
 		ARG 0 json
 		ARG 1 defaultValue
 		ARG 3 factory
-	METHOD a fromStringReader (Lcom/mojang/brigadier/StringReader;Lbi$b;Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/util/function/Function;)Lbi;
+	METHOD a isNextCharValid (Lcom/mojang/brigadier/StringReader;)Z
+		ARG 0 reader
+	METHOD a parse (Lcom/mojang/brigadier/StringReader;Lbi$b;Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/util/function/Function;)Lbi;
 	METHOD a fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/lang/Number;
+	METHOD a applyIfNonNull (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;
+		ARG 0 object
+		ARG 1 function
 	METHOD b getMax ()Ljava/lang/Number;
 	METHOD c isDummy ()Z
 	METHOD d serialize ()Lcom/google/gson/JsonElement;

mappings/net/minecraft/util/PrintStreamLogger.mapping

@@ -1,2 +1,7 @@
 CLASS ra net/minecraft/util/PrintStreamLogger
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b name Ljava/lang/String;
+	METHOD <init> (Ljava/lang/String;Ljava/io/OutputStream;)V
+		ARG 1 name
+		ARG 2 outputStream
+	METHOD a log (Ljava/lang/String;)V

mappings/net/minecraft/util/Rotation.mapping

@@ -3,7 +3,11 @@ CLASS bqs net/minecraft/util/Rotation
 	FIELD b ROT_90 Lbqs;
 	FIELD c ROT_180 Lbqs;
 	FIELD d ROT_270 Lbqs;
+	METHOD a rotate (Lbqs;)Lbqs;
+		ARG 1 rotation
 	METHOD a rotate (Lfa;)Lfa;
 		ARG 1 direction
 	METHOD a random (Ljava/util/Random;)Lbqs;
 		ARG 0 random
+	METHOD b randomRotationOrder (Ljava/util/Random;)Ljava/util/List;
+		ARG 0 random

mappings/net/minecraft/util/SystemUtil.mapping

@@ -19,6 +19,9 @@ CLASS p net/minecraft/util/SystemUtil
 	METHOD a getValueAsString (Lbwi;Ljava/lang/Object;)Ljava/lang/String;
 	METHOD a next (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object;
 	METHOD a consume (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object;
+	METHOD a debugRunnable (Ljava/lang/Runnable;Ljava/util/function/Supplier;)Ljava/lang/Runnable;
+		ARG 0 runnable
+		ARG 1 messageSupplier
 	METHOD a readUuid (Ljava/lang/String;Lcom/mojang/datafixers/Dynamic;)Ljava/util/Optional;
 		ARG 0 name
 		ARG 1 dynamic
@@ -41,6 +44,7 @@ CLASS p net/minecraft/util/SystemUtil
 	METHOD c getMeasuringTimeNano ()J
 	METHOD d getEpochTimeMs ()J
 	METHOD e getServerWorkerExecutor ()Ljava/util/concurrent/Executor;
+	METHOD f shutdownServerWorkerExecutor ()V
 	METHOD g getOperatingSystem ()Lp$b;
 	METHOD h getJVMFlags ()Ljava/util/stream/Stream;
 	METHOD i identityHashStrategy ()Lit/unimi/dsi/fastutil/Hash$Strategy;

mappings/net/minecraft/util/ThreadExecutor.mapping

@@ -4,8 +4,9 @@ CLASS agf net/minecraft/util/ThreadExecutor
 	FIELD d taskQueue Ljava/util/Queue;
 	FIELD e waitCount I
 	METHOD a executeFuture (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 runnable
 	METHOD a executeFuture (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;
-	METHOD aw isOffThread ()Z
+	METHOD aw shouldRunAsync ()Z
 	METHOD ax getThread ()Ljava/lang/Thread;
 	METHOD bc isOnThread ()Z
 	METHOD be clear ()V
@@ -13,5 +14,7 @@ CLASS agf net/minecraft/util/ThreadExecutor
 	METHOD c canRun (Ljava/lang/Runnable;)Z
 	METHOD c waitFor (Ljava/util/function/BooleanSupplier;)V
 	METHOD d prepareRunnable (Ljava/lang/Runnable;)Ljava/lang/Runnable;
+	METHOD f executeSync (Ljava/lang/Runnable;)V
+		ARG 1 runnable
 	METHOD h runSafely (Ljava/lang/Runnable;)V
 	METHOD p executeQueuedTask ()Z

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

@@ -63,7 +63,7 @@ CLASS ev net/minecraft/util/math/BlockPos
 		ARG 0 x
 		ARG 1 y
 		ARG 2 z
-	METHOD a streamBoxPositions (IIIIII)Ljava/util/stream/Stream;
+	METHOD a stream (IIIIII)Ljava/util/stream/Stream;
 		ARG 0 minX
 		ARG 1 minY
 		ARG 2 minZ
@@ -79,7 +79,7 @@ CLASS ev net/minecraft/util/math/BlockPos
 	METHOD a rotate (Lbqs;)Lev;
 	METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lev;
 		ARG 0 dynamic
-	METHOD a iterateBoxPositions (Lev;Lev;)Ljava/lang/Iterable;
+	METHOD a iterate (Lev;Lev;)Ljava/lang/Iterable;
 		ARG 0 pos1
 		ARG 1 pos2
 	METHOD a offset (Lfa;)Lev;
@@ -92,7 +92,7 @@ CLASS ev net/minecraft/util/math/BlockPos
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
-	METHOD b iterateBoxPositions (IIIIII)Ljava/lang/Iterable;
+	METHOD b iterate (IIIIII)Ljava/lang/Iterable;
 		ARG 0 minX
 		ARG 1 maxX
 		ARG 2 minY
@@ -100,6 +100,9 @@ CLASS ev net/minecraft/util/math/BlockPos
 		ARG 4 minZ
 		ARG 5 maxZ
 	METHOD b unpackLongX (J)I
+	METHOD b stream (Lev;Lev;)Ljava/util/stream/Stream;
+		ARG 0 pos1
+		ARG 1 pos2
 	METHOD b subtract (Lfq;)Lev;
 	METHOD c down ()Lev;
 	METHOD c down (I)Lev;

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

@@ -1,5 +1,6 @@
 CLASS fo net/minecraft/util/math/ChunkSectionPos
 	CLASS fo$1
+		FIELD a iterator Ley;
 		METHOD tryAdvance (Ljava/util/function/Consumer;)Z
 			ARG 1 consumer
 	METHOD <init> (III)V
@@ -13,6 +14,13 @@ CLASS fo net/minecraft/util/math/ChunkSectionPos
 		ARG 0 x
 		ARG 1 y
 		ARG 2 z
+	METHOD a stream (IIIIII)Ljava/util/stream/Stream;
+		ARG 0 minX
+		ARG 1 minY
+		ARG 2 minZ
+		ARG 3 maxX
+		ARG 4 maxY
+		ARG 5 maxZ
 	METHOD a from (J)Lfo;
 		ARG 0 packed
 	METHOD a offsetPacked (JIII)J
@@ -29,6 +37,9 @@ CLASS fo net/minecraft/util/math/ChunkSectionPos
 		ARG 1 y
 	METHOD a from (Lev;)Lfo;
 		ARG 0 pos
+	METHOD a stream (Lfo;I)Ljava/util/stream/Stream;
+		ARG 0 center
+		ARG 1 radius
 	METHOD b getChunkY ()I
 	METHOD b toLocalCoord (I)I
 		ARG 0 coord
@@ -51,6 +62,8 @@ CLASS fo net/minecraft/util/math/ChunkSectionPos
 	METHOD e toChunkLong (J)J
 		ARG 0 globalLong
 	METHOD f getMinZ ()I
+	METHOD f toLightStorageIndex (J)J
+		ARG 0 pos
 	METHOD g getMaxX ()I
 	METHOD h getMaxY ()I
 	METHOD r getMaxZ ()I
@@ -58,4 +71,4 @@ CLASS fo net/minecraft/util/math/ChunkSectionPos
 	METHOD t getCenterPos ()Lev;
 	METHOD u toChunkPos ()Lbgq;
 	METHOD v asLong ()J
-	METHOD w streamBoxPositions ()Ljava/util/stream/Stream;
+	METHOD w streamBlocks ()Ljava/util/stream/Stream;

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

@@ -22,10 +22,12 @@ CLASS bgq net/minecraft/world/chunk/ChunkPos
 		ARG 3 chunkRelativeZ
 	METHOD a getPackedX (J)I
 		ARG 0 pos
-	METHOD a streamPositions (Lbgq;I)Ljava/util/stream/Stream;
+	METHOD a stream (Lbgq;I)Ljava/util/stream/Stream;
-		ARG 0 pos
+		ARG 0 center
 		ARG 1 radius
-	METHOD a streamPositions (Lbgq;Lbgq;)Ljava/util/stream/Stream;
+	METHOD a stream (Lbgq;Lbgq;)Ljava/util/stream/Stream;
+		ARG 0 pos1
+		ARG 1 pos2
 	METHOD b getPackedZ (J)I
 		ARG 0 pos
 	METHOD d getStartX ()I