25w09b stuff

FabricMC · Mar 5, 2025 · 1a484e1 · 1a484e1
1 parent 29739e7
commit 1a484e1
Show file tree

Hide file tree

Showing 40 changed files with 194 additions and 17 deletions.
diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping
@@ -13,6 +13,7 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
 	FIELD field_50055 ops Lnet/minecraft/class_6903;
 	FIELD field_51458 MALFORMED_ITEM_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_51831 EXCLAMATION_MARK C
+	FIELD field_57954 snbtReader Lnet/minecraft/class_2522;
 	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 registries
 	METHOD method_58517 consume (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2291$class_9219;)V
@@ -57,6 +58,9 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
 		METHOD method_57808 suggestBracket (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 builder
 		METHOD method_57811 readComponentValue (Lnet/minecraft/class_2522;Lnet/minecraft/class_6903;Lnet/minecraft/class_9331;)V
+			ARG 1 snbtReader
+			ARG 2 ops
+			ARG 3 type
 		METHOD method_57812 suggestEndOfComponent (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 builder
 		METHOD method_57813 suggestEqual (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;

diff --git a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
@@ -1,6 +1,7 @@
 CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType
 	FIELD field_48929 registries Lnet/minecraft/class_7225$class_7874;
 	FIELD field_51438 INVALID_OPTIONS_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_57832 snbtReader Lnet/minecraft/class_2522;
 	FIELD field_9935 EXAMPLES Ljava/util/Collection;
 	FIELD field_9936 UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	METHOD <init> (Lnet/minecraft/class_7157;)V
@@ -21,6 +22,11 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgu
 	METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
 	METHOD method_9420 readParameters (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2522;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
+		ARG 0 ops
+		ARG 1 snbtReader
+		ARG 2 reader
+		ARG 3 particleType
+		ARG 4 registries
 	METHOD method_9421 getParticle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2394;
 		ARG 0 context
 		ARG 1 name

diff --git a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping
@@ -5,6 +5,7 @@ CLASS net/minecraft/class_9433 net/minecraft/command/argument/RegistryEntryArgum
 	FIELD field_50040 registries Lnet/minecraft/class_7225$class_7874;
 	FIELD field_50041 canLookupRegistry Z
 	FIELD field_50042 entryCodec Lcom/mojang/serialization/Codec;
+	FIELD field_57909 snbtReader Lnet/minecraft/class_2522;
 	METHOD <init> (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V
 		ARG 1 registryAccess
 		ARG 2 registry
@@ -19,6 +20,9 @@ CLASS net/minecraft/class_9433 net/minecraft/command/argument/RegistryEntryArgum
 	METHOD method_58483 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 argument
 	METHOD method_58484 parseAsNbt (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2522;Lcom/mojang/brigadier/StringReader;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 ops
+		ARG 1 snbtReader
+		ARG 2 reader
 	METHOD method_58485 getLootFunction (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880;
 		ARG 0 context
 		ARG 1 argument

diff --git a/mappings/net/minecraft/command/argument/packrat/ParsingRuleEntry.mapping b/mappings/net/minecraft/command/argument/packrat/ParsingRuleEntry.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_10842 net/minecraft/command/argument/packrat/ParsingRuleEntry
+	METHOD method_68213 getSymbol ()Lnet/minecraft/class_9387;
+	METHOD method_68214 getRule ()Lnet/minecraft/class_9396;
diff --git a/mappings/net/minecraft/command/argument/packrat/ParsingRules.mapping b/mappings/net/minecraft/command/argument/packrat/ParsingRules.mapping
@@ -8,3 +8,20 @@ CLASS net/minecraft/class_9389 net/minecraft/command/argument/packrat/ParsingRul
 	METHOD method_58302 set (Lnet/minecraft/class_9387;Lnet/minecraft/class_9402;Lnet/minecraft/class_9396$class_9398;)Lnet/minecraft/class_10842;
 		ARG 1 symbol
 		ARG 2 term
+		ARG 3 action
+	METHOD method_68205 ensureBound ()V
+	METHOD method_68207 set (Lnet/minecraft/class_9387;Lnet/minecraft/class_9402;Lnet/minecraft/class_9396$class_9397;)Lnet/minecraft/class_10842;
+		ARG 1 symbol
+		ARG 2 term
+		ARG 3 action
+	METHOD method_68208 (Ljava/util/Map$Entry;)Z
+		ARG 0 entry
+	METHOD method_68209 getOrCreate (Lnet/minecraft/class_9387;)Lnet/minecraft/class_10842;
+		ARG 1 symbol
+	METHOD method_68211 getOrCreateInternal (Lnet/minecraft/class_9387;)Lnet/minecraft/class_9389$class_10838;
+		ARG 1 symbol
+	CLASS class_10838 RuleEntryImpl
+		FIELD field_57523 symbol Lnet/minecraft/class_9387;
+		FIELD field_57524 rule Lnet/minecraft/class_9396;
+		METHOD <init> (Lnet/minecraft/class_9387;)V
+			ARG 1 symbol
diff --git a/mappings/net/minecraft/command/argument/packrat/ParsingState.mapping b/mappings/net/minecraft/command/argument/packrat/ParsingState.mapping
@@ -3,5 +3,7 @@ CLASS net/minecraft/class_9393 net/minecraft/command/argument/packrat/ParsingSta
 	METHOD method_58311 setCursor (I)V
 		ARG 1 cursor
 	METHOD method_58312 startParsing (Lnet/minecraft/class_10842;)Ljava/util/Optional;
+		ARG 1 rule
 	METHOD method_58315 getReader ()Ljava/lang/Object;
 	METHOD method_58317 getCursor ()I
+	METHOD method_68187 getResults ()Lnet/minecraft/class_9400;
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -153,6 +153,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	FIELD field_54948 collidedBlockPositions Lit/unimi/dsi/fastutil/longs/LongSet;
 	FIELD field_56630 collisionHandler Lnet/minecraft/class_10774$class_10775;
 	FIELD field_56631 TAG_LIST_CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_57579 currentlyCheckedCollisions Ljava/util/List;
+	FIELD field_57580 X_THEN_Z Lcom/google/common/collect/ImmutableList;
+	FIELD field_57581 Z_THEN_X Lcom/google/common/collect/ImmutableList;
 	FIELD field_5951 ridingCooldown I
 	FIELD field_5952 onGround Z
 	FIELD field_5953 firstUpdate Z
@@ -317,6 +320,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 4 collisions
 	METHOD method_20737 adjustMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/List;)Lnet/minecraft/class_243;
 		ARG 0 movement
+		ARG 1 entityBoundingBox
 		ARG 2 collisions
 	METHOD method_20802 getFireTicks ()I
 	METHOD method_20803 setFireTicks (I)V
@@ -2313,6 +2317,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_67634 (Ljava/util/UUID;)V
 		ARG 1 uuid
 	METHOD method_67635 defrost ()V
+	METHOD method_68259 popQueuedCollisionCheck ()V
+	METHOD method_68260 tickBlockCollisions (Ljava/util/List;)V
+		ARG 1 checks
+	METHOD method_68261 getAxisCheckOrder (Lnet/minecraft/class_243;)Ljava/lang/Iterable;
+		ARG 0 movement
 	METHOD method_7325 isSpectator ()Z
 		COMMENT {@return whether the entity is a spectator}
 		COMMENT

diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping
@@ -195,6 +195,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		ARG 3 callback
 	METHOD method_67637 (Ljava/util/function/Consumer;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 1 entity
+	METHOD method_68263 (Lnet/minecraft/class_2520;)Ljava/util/stream/Stream;
+		ARG 0 nbt
 	CLASS class_1300 Builder
 		FIELD field_18071 dimensions Lnet/minecraft/class_4048;
 		FIELD field_18982 fireImmune Z

diff --git a/mappings/net/minecraft/entity/FallingBlockEntity.mapping b/mappings/net/minecraft/entity/FallingBlockEntity.mapping
@@ -21,7 +21,7 @@ CLASS net/minecraft/class_1540 net/minecraft/entity/FallingBlockEntity
 		ARG 2 x
 		ARG 4 y
 		ARG 6 z
-		ARG 8 block
+		ARG 8 blockState
 	METHOD method_32752 onDestroyedOnLanding (Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V
 		ARG 1 block
 		ARG 2 pos

diff --git a/mappings/net/minecraft/entity/InventoryOwner.mapping b/mappings/net/minecraft/entity/InventoryOwner.mapping
@@ -12,3 +12,5 @@ CLASS net/minecraft/class_6067 net/minecraft/entity/InventoryOwner
 	METHOD method_46400 readInventory (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 nbt
 		ARG 2 registries
+	METHOD method_68276 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2499;)V
+		ARG 2 inventory
diff --git a/mappings/net/minecraft/entity/LazyEntityReference.mapping b/mappings/net/minecraft/entity/LazyEntityReference.mapping
@@ -33,3 +33,5 @@ CLASS net/minecraft/class_10583 net/minecraft/entity/LazyEntityReference
 		ARG 0 nbt
 		ARG 1 key
 	METHOD method_66263 getUuid ()Ljava/util/UUID;
+	METHOD method_68262 (Lnet/minecraft/class_1937;Ljava/lang/String;)Ljava/util/UUID;
+		ARG 1 name
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -754,6 +754,10 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_67518 createEquipment ()Lnet/minecraft/class_10630;
 	METHOD method_67650 (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
+	METHOD method_68264 (Ljava/lang/String;)V
+		ARG 1 team
+	METHOD method_68265 (Lnet/minecraft/class_2487;)V
+		ARG 1 brain
 	METHOD method_7292 getLuck ()F
 	METHOD method_7329 dropItem (Lnet/minecraft/class_1799;ZZ)Lnet/minecraft/class_1542;
 		ARG 1 stack

diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping
@@ -74,6 +74,8 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit
 	METHOD method_6827 damageLivingEntities (Lnet/minecraft/class_3218;Ljava/util/List;)V
 		ARG 1 world
 		ARG 2 entities
+	METHOD method_68271 (Ljava/lang/Integer;)V
+		ARG 1 phase
 	METHOD method_6828 crystalDestroyed (Lnet/minecraft/class_3218;Lnet/minecraft/class_1511;Lnet/minecraft/class_2338;Lnet/minecraft/class_1282;)V
 		ARG 1 world
 		ARG 2 crystal

diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
@@ -27,6 +27,8 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
 		ARG 2 spawnReason
 		ARG 3 pos
 		ARG 4 random
+	METHOD method_68268 (Ljava/lang/Integer;)V
+		ARG 1 scuteTime
 	CLASS class_9070 State
 		FIELD field_47793 name Ljava/lang/String;
 		FIELD field_47794 CODEC Lcom/mojang/serialization/Codec;

diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping
@@ -76,6 +76,8 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
 	METHOD method_57305 (Lnet/minecraft/class_2487;)V
 		ARG 1 nbt
 	METHOD method_61479 tickClient ()V
+	METHOD method_68269 (Lnet/minecraft/class_2487;Ljava/lang/Long;)V
+		ARG 2 huntingCooldown
 	CLASS class_5763 AxolotlData
 		FIELD field_28338 variants [Lnet/minecraft/class_5762$class_5767;
 		METHOD <init> ([Lnet/minecraft/class_5762$class_5767;)V

diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping
@@ -18,3 +18,5 @@ CLASS net/minecraft/class_1428 net/minecraft/entity/passive/ChickenEntity
 	METHOD method_67521 setVariant (Lnet/minecraft/class_6880;)V
 		ARG 1 variant
 	METHOD method_67522 getVariant ()Lnet/minecraft/class_6880;
+	METHOD method_68267 (Ljava/lang/Integer;)V
+		ARG 1 eggLayTime
diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping
@@ -32,6 +32,10 @@ CLASS net/minecraft/class_3763 net/minecraft/entity/raid/RaiderEntity
 		ARG 1 celebrating
 	METHOD method_58646 isCaptain ()Z
 	METHOD method_58647 hasRaid ()Z
+	METHOD method_67376 (Lnet/minecraft/class_2487;I)V
+		ARG 1 raidId
+	METHOD method_68278 (Lnet/minecraft/class_3218;Ljava/lang/Integer;)V
+		ARG 2 raidId
 	CLASS class_3764 PickUpBannerAsLeaderGoal
 		FIELD field_16603 actor Lnet/minecraft/class_3763;
 		FIELD field_52513 bannerItemCache Lit/unimi/dsi/fastutil/ints/Int2LongOpenHashMap;

diff --git a/mappings/net/minecraft/inventory/SimpleInventory.mapping b/mappings/net/minecraft/inventory/SimpleInventory.mapping
@@ -64,6 +64,8 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory
 		COMMENT @return the leftover part of the stack, or {@code ItemStack#EMPTY} if the entire
 		COMMENT stack fit inside the inventory
 		ARG 1 stack
+	METHOD method_68258 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2487;)Ljava/util/stream/Stream;
+		ARG 1 nbt
 	METHOD method_7659 readNbtList (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V
 		COMMENT Reads the item stacks from {@code nbtList}.
 		COMMENT

diff --git a/mappings/net/minecraft/loot/provider/number/StorageLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/StorageLootNumberProvider.mapping
@@ -4,3 +4,4 @@ CLASS net/minecraft/class_9432 net/minecraft/loot/provider/number/StorageLootNum
 		ARG 0 instance
 	METHOD method_58471 getNumber (Lnet/minecraft/class_47;Ljava/lang/Number;)Ljava/lang/Number;
 		ARG 1 context
+		ARG 2 fallback
diff --git a/mappings/net/minecraft/nbt/AbstractNbtList.mapping b/mappings/net/minecraft/nbt/AbstractNbtList.mapping
@@ -14,3 +14,5 @@ CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractNbtList
 		COMMENT @return whether the element was actually set
 		ARG 1 index
 		ARG 2 element
+	CLASS 1
+		FIELD field_57976 current I
diff --git a/mappings/net/minecraft/nbt/NbtCompound.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping
@@ -364,9 +364,9 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound
 		ARG 1 key
 		ARG 2 fallback
 	METHOD method_68567 values ()Ljava/util/Collection;
-	METHOD method_68568 getOrCreateCompound (Ljava/lang/String;)Lnet/minecraft/class_2487;
+	METHOD method_68568 getCompoundOrEmpty (Ljava/lang/String;)Lnet/minecraft/class_2487;
 		ARG 1 key
-	METHOD method_68569 getOrCreateList (Ljava/lang/String;)Lnet/minecraft/class_2499;
+	METHOD method_68569 getListOrEmpty (Ljava/lang/String;)Lnet/minecraft/class_2499;
 		ARG 1 key
 	METHOD method_68570 getOptional (Ljava/lang/String;)Ljava/util/Optional;
 		ARG 1 key

diff --git a/mappings/net/minecraft/nbt/NbtElement.mapping b/mappings/net/minecraft/nbt/NbtElement.mapping
@@ -73,17 +73,19 @@ CLASS net/minecraft/class_2520 net/minecraft/nbt/NbtElement
 	METHOD method_39876 accept (Lnet/minecraft/class_6836;)V
 		ARG 1 visitor
 	METHOD method_47988 getSizeInBytes ()I
-	METHOD method_68559 castToByteArray ()Ljava/util/Optional;
-	METHOD method_68571 castToNbtCompound ()Ljava/util/Optional;
-	METHOD method_68572 castToIntArray ()Ljava/util/Optional;
-	METHOD method_68592 castToNbtList ()Ljava/util/Optional;
-	METHOD method_68593 castToLongArray ()Ljava/util/Optional;
-	METHOD method_68599 castToNumber ()Ljava/util/Optional;
-	METHOD method_68600 castToByte ()Ljava/util/Optional;
-	METHOD method_68601 castToShort ()Ljava/util/Optional;
-	METHOD method_68602 castToInt ()Ljava/util/Optional;
-	METHOD method_68603 castToLong ()Ljava/util/Optional;
-	METHOD method_68604 castToFloat ()Ljava/util/Optional;
-	METHOD method_68605 castToDouble ()Ljava/util/Optional;
-	METHOD method_68606 castToBoolean ()Ljava/util/Optional;
-	METHOD method_68658 castToString ()Ljava/util/Optional;
+	METHOD method_68559 asByteArray ()Ljava/util/Optional;
+	METHOD method_68571 asCompound ()Ljava/util/Optional;
+	METHOD method_68572 asIntArray ()Ljava/util/Optional;
+	METHOD method_68592 asNbtList ()Ljava/util/Optional;
+	METHOD method_68593 asLongArray ()Ljava/util/Optional;
+	METHOD method_68599 asNumber ()Ljava/util/Optional;
+	METHOD method_68600 asByte ()Ljava/util/Optional;
+	METHOD method_68601 asShort ()Ljava/util/Optional;
+	METHOD method_68602 asInt ()Ljava/util/Optional;
+	METHOD method_68603 asLong ()Ljava/util/Optional;
+	METHOD method_68604 asFloat ()Ljava/util/Optional;
+	METHOD method_68605 asDouble ()Ljava/util/Optional;
+	METHOD method_68606 asBoolean ()Ljava/util/Optional;
+	METHOD method_68658 asString ()Ljava/util/Optional;
+	METHOD method_68661 (Ljava/lang/Byte;)Ljava/lang/Boolean;
+		ARG 0 b
diff --git a/mappings/net/minecraft/nbt/NbtList.mapping b/mappings/net/minecraft/nbt/NbtList.mapping
@@ -17,6 +17,8 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList
 	FIELD field_11550 value Ljava/util/List;
 	FIELD field_21039 TYPE Lnet/minecraft/class_4614;
 	FIELD field_41725 SIZE I
+	METHOD <init> (Ljava/util/List;)V
+		ARG 1 value
 	METHOD add (ILjava/lang/Object;)V
 		ARG 1 index
 		ARG 2 element
@@ -66,6 +68,9 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList
 		COMMENT
 		COMMENT @apiNote Modifying the returned array also modifies the NBT long array.
 		ARG 1 index
+	METHOD method_68573 wrapIfNeeded (BLnet/minecraft/class_2520;)Lnet/minecraft/class_2520;
+		ARG 0 type
+		ARG 1 value
 	METHOD method_68574 getDouble (ID)D
 		ARG 1 index
 		ARG 2 fallback
@@ -81,11 +86,25 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList
 	METHOD method_68578 getShort (IS)S
 		ARG 1 index
 		ARG 2 fallback
+	METHOD method_68579 unwrap (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2520;
+		ARG 0 nbt
+	METHOD method_68581 (Lnet/minecraft/class_2520;Ljava/util/function/Consumer;)V
+		ARG 0 nbt
+		ARG 1 callback
 	METHOD method_68582 getOrCreateCompound (I)Lnet/minecraft/class_2487;
 		ARG 1 index
+	METHOD method_68583 isConvertedEntry (Lnet/minecraft/class_2487;)Z
+		ARG 0 nbt
+	METHOD method_68584 convertToCompound (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2487;
+		ARG 0 nbt
+	METHOD method_68587 getValueType ()B
 	METHOD method_68588 getOrCreateList (I)Lnet/minecraft/class_2499;
 		ARG 1 index
 	METHOD method_68589 streamCompounds ()Ljava/util/stream/Stream;
+	METHOD method_68590 getNullable (I)Lnet/minecraft/class_2520;
+		ARG 1 index
+	METHOD method_68591 getOptional (I)Ljava/util/Optional;
+		ARG 1 index
 	METHOD set (ILjava/lang/Object;)Ljava/lang/Object;
 		ARG 1 index
 		ARG 2 element

diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping
@@ -9,6 +9,9 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader
 	FIELD field_51469 NBT_COMPOUND_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_56410 EXPECTED_COMPOUND Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD field_56411 STRINGIFIED_CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_58029 parser Lnet/minecraft/class_9408;
+	METHOD <init> (Lnet/minecraft/class_9408;)V
+		ARG 1 parser
 	METHOD method_53502 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
 		ARG 0 snbt
 	METHOD method_67310 readCompoundAsArgument (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2487;
@@ -24,3 +27,5 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader
 		ARG 0 snbt
 	METHOD method_67319 readAsArgument (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader
+	METHOD method_68662 fromOps (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/class_2522;
+		ARG 0 ops
diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket.mapping
@@ -50,6 +50,10 @@ CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC
 			ARG 5 z
 			ARG 7 onGround
 			ARG 8 horizontalCollision
+		METHOD <init> (Lnet/minecraft/class_243;ZZ)V
+			ARG 1 pos
+			ARG 2 onGround
+			ARG 3 horizontalCollision
 		METHOD method_34221 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_2829;
 			ARG 0 buf
 		METHOD method_55979 write (Lnet/minecraft/class_2540;)V
@@ -64,6 +68,12 @@ CLASS net/minecraft/class_2828 net/minecraft/network/packet/c2s/play/PlayerMoveC
 			ARG 8 pitch
 			ARG 9 onGround
 			ARG 10 horizontalCollision
+		METHOD <init> (Lnet/minecraft/class_243;FFZZ)V
+			ARG 1 pos
+			ARG 2 yaw
+			ARG 3 pitch
+			ARG 4 onGround
+			ARG 5 horizontalCollision
 		METHOD method_34222 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2828$class_2830;
 			ARG 0 buf
 		METHOD method_55980 write (Lnet/minecraft/class_2540;)V

diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping
@@ -126,6 +126,7 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand
 		ARG 0 list
 		ARG 1 processor
 	METHOD method_48096 asString (Lnet/minecraft/class_2520;)Ljava/lang/String;
+		ARG 0 nbt
 	METHOD method_48097 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 3 context
 	METHOD method_48098 getValuesByPath (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;)Ljava/util/List;

diff --git a/mappings/net/minecraft/server/function/Macro.mapping b/mappings/net/minecraft/server/function/Macro.mapping
@@ -14,6 +14,7 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro
 		ARG 2 arguments
 		ARG 3 dispatcher
 	METHOD method_53840 toString (Lnet/minecraft/class_2520;)Ljava/lang/String;
+		ARG 0 nbt
 	METHOD method_54423 (Ljava/text/DecimalFormat;)V
 		ARG 0 format
 	METHOD method_54424 addArgumentsByIndices (Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntList;Ljava/util/List;)V