24w05a stuff (#3780)

* 24w05a stuff * More stuff * Fix capitalization --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
FabricMC · Feb 2, 2024 · 08f2d8f · 08f2d8f
1 parent 3b275d2
commit 08f2d8f
Show file tree

Hide file tree

Showing 57 changed files with 262 additions and 52 deletions.
diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping
@@ -3,5 +3,7 @@ CLASS net/minecraft/class_8965 net/minecraft/block/spawner/TrialSpawnerConfig
 	FIELD field_47368 codec Lcom/mojang/serialization/MapCodec;
 	METHOD method_55179 getTotalMobs (I)I
 		ARG 1 additionalPlayers
+	METHOD method_55180 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
 	METHOD method_55181 getSimultaneousMobs (I)I
 		ARG 1 additionalPlayers
diff --git a/mappings/net/minecraft/block/vault/VaultConfig.mapping b/mappings/net/minecraft/block/vault/VaultConfig.mapping
@@ -8,4 +8,6 @@ CLASS net/minecraft/class_9203 net/minecraft/block/vault/VaultConfig
 		ARG 4 deactivationRange
 		ARG 6 keyItem
 		ARG 7 overrideLootTableToDisplay
+	METHOD method_56764 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
 	METHOD method_56765 validate ()Lcom/mojang/serialization/DataResult;
diff --git a/mappings/net/minecraft/class_9187.mapping b/mappings/net/minecraft/class_9187.mapping
diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping
@@ -21,6 +21,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
 	FIELD field_45993 tickNanosLog Lnet/minecraft/class_9191;
 	FIELD field_45994 pingLog Lnet/minecraft/class_9191;
 	FIELD field_45995 packetSizeLog Lnet/minecraft/class_9191;
+	FIELD field_48931 receivedDebugSamples Ljava/util/Map;
+	METHOD <init> (Lnet/minecraft/class_310;)V
+		ARG 1 client
 	METHOD method_1834 getChunk ()Lnet/minecraft/class_2818;
 	METHOD method_1835 getLeftText ()Ljava/util/List;
 	METHOD method_1836 getClientChunk ()Lnet/minecraft/class_2818;
@@ -78,6 +81,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud
 	METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_9191;
 	METHOD method_53545 clear ()V
 	METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_9191;
+	METHOD method_56828 set ([JLnet/minecraft/class_9192;)V
+		ARG 1 values
+		ARG 2 type
 	METHOD method_56829 shouldRenderTickCharts ()Z
 	CLASS class_7412 AllocationRateCalculator
 		FIELD field_38986 INTERVAL I

diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -34,6 +34,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	FIELD field_46578 worldLoadingState Lnet/minecraft/class_8819;
 	FIELD field_47878 scoreboard Lnet/minecraft/class_269;
 	FIELD field_48403 secureChatEnforced Z
+	FIELD field_48933 debugSampleSubscriber Lnet/minecraft/class_9211;
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
 		ARG 1 client
 	METHOD method_16690 getSessionId ()Ljava/util/UUID;

diff --git a/mappings/net/minecraft/class_9211.mapping → ...ent/network/DebugSampleSubscriber.mapping b/mappings/net/minecraft/class_9211.mapping → ...ent/network/DebugSampleSubscriber.mapping
@@ -1,10 +1,11 @@
-CLASS net/minecraft/class_9211
+CLASS net/minecraft/class_9211 net/minecraft/client/network/DebugSampleSubscriber
 	FIELD field_48934 TIMEOUT I
 	FIELD field_48935 networkHandler Lnet/minecraft/class_634;
 	FIELD field_48936 debugHud Lnet/minecraft/class_340;
 	FIELD field_48937 lastTime Ljava/util/EnumMap;
 	METHOD <init> (Lnet/minecraft/class_634;Lnet/minecraft/class_340;)V
 		ARG 1 handler
 		ARG 2 hud
-	METHOD method_56831 update (Lnet/minecraft/class_9192;)V
+	METHOD method_56830 tick ()V
+	METHOD method_56831 subscribe (Lnet/minecraft/class_9192;)V
 		ARG 1 type
diff --git a/mappings/net/minecraft/client/option/HotbarStorage.mapping b/mappings/net/minecraft/client/option/HotbarStorage.mapping
@@ -12,3 +12,5 @@ CLASS net/minecraft/class_302 net/minecraft/client/option/HotbarStorage
 	METHOD method_1410 getSavedHotbar (I)Lnet/minecraft/class_748;
 		ARG 1 i
 	METHOD method_1411 load ()V
+	METHOD method_56825 (Ljava/lang/String;)V
+		ARG 0 error
diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
@@ -2,8 +2,28 @@ CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry
 	FIELD field_48942 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_48943 LOGGER Lorg/slf4j/Logger;
 	FIELD field_48944 HOTBAR_SIZE I
-	METHOD method_56836 (Lnet/minecraft/class_1661;Lnet/minecraft/class_5455;)V
+	FIELD field_48945 NBT_OPS Lcom/mojang/serialization/DynamicOps;
+	FIELD field_48946 EMPTY_STACK Lcom/mojang/serialization/Dynamic;
+	FIELD field_48947 stacks Ljava/util/List;
+	METHOD <init> (Ljava/util/List;)V
+		ARG 1 stacks
+	METHOD method_56835 isEmpty ()Z
+	METHOD method_56836 serialize (Lnet/minecraft/class_1661;Lnet/minecraft/class_5455;)V
 		ARG 1 playerInventory
 		ARG 2 registryManager
-	METHOD method_56839 (Lnet/minecraft/class_7225$class_7874;)Ljava/util/List;
+	METHOD method_56837 isEmpty (Lcom/mojang/serialization/Dynamic;)Z
+		ARG 0 stack
+	METHOD method_56838 (Lnet/minecraft/class_748;)Ljava/util/List;
+		ARG 0 entry
+	METHOD method_56839 deserialize (Lnet/minecraft/class_7225$class_7874;)Ljava/util/List;
 		ARG 1 registryLookup
+	METHOD method_56840 (Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_1799;
+		ARG 1 stack
+	METHOD method_56841 (Ljava/lang/String;)V
+		ARG 0 error
+	METHOD method_56842 (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 0 stacks
+	METHOD method_56843 (Lnet/minecraft/class_2520;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 nbt
+	METHOD method_56844 (Ljava/lang/String;)V
+		ARG 0 error
diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping
@@ -413,6 +413,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 1 song
 		ARG 2 songPosition
 	METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V
+		ARG 1 parameters
 		ARG 2 shouldAlwaysSpawn
 		ARG 3 important
 		ARG 4 x

diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping
@@ -60,6 +60,7 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack
 	CLASS class_4665 Entry
 		FIELD field_21327 positionMatrix Lorg/joml/Matrix4f;
 		FIELD field_21328 normalMatrix Lorg/joml/Matrix3f;
+		FIELD field_48930 canSkipNormalization Z
 		METHOD <init> (Lnet/minecraft/class_4587$class_4665;)V
 			ARG 1 matrix
 		METHOD <init> (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)V
@@ -69,4 +70,13 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack
 			COMMENT {@return the matrix used to transform positions}
 		METHOD method_23762 getNormalMatrix ()Lorg/joml/Matrix3f;
 			COMMENT {@return the matrix used to transform normal vectors}
+		METHOD method_56820 transformNormal (FFFLorg/joml/Vector3f;)Lorg/joml/Vector3f;
+			ARG 1 x
+			ARG 2 y
+			ARG 3 z
+			ARG 4 dest
+		METHOD method_56821 transformNormal (Lorg/joml/Vector3f;Lorg/joml/Vector3f;)Lorg/joml/Vector3f;
+			ARG 1 vec
+			ARG 2 dest
 		METHOD method_56822 copy ()Lnet/minecraft/class_4587$class_4665;
+		METHOD method_56823 computeNormal ()V
diff --git a/mappings/net/minecraft/command/CommandRegistryAccess.mapping b/mappings/net/minecraft/command/CommandRegistryAccess.mapping
@@ -8,3 +8,6 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess
 	METHOD method_46722 of (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157;
 		ARG 0 wrapperLookup
 		ARG 1 enabledFeatures
+	CLASS 1
+		METHOD method_56810 (Lnet/minecraft/class_7699;Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226;
+			ARG 1 wrapper
diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping
@@ -18,6 +18,7 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage
 		ARG 2 nbt
 	METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_4565$class_4566;
 		ARG 2 nbt
+		ARG 3 registryLookup
 	METHOD method_52614 getPersistentStateType (Ljava/lang/String;)Lnet/minecraft/class_18$class_8645;
 		ARG 1 namespace
 	CLASS class_4566 PersistentState

diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgumentType
 	FIELD field_10812 EXAMPLES Ljava/util/Collection;
+	FIELD field_48959 reader Lnet/minecraft/class_9215;
 	METHOD <init> (Lnet/minecraft/class_7157;)V
 		ARG 1 commandRegistryAccess
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;

diff --git a/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping b/mappings/net/minecraft/command/argument/ItemPredicateReader.mapping
@@ -0,0 +1,52 @@
+CLASS net/minecraft/class_9216 net/minecraft/command/argument/ItemPredicateReader
+	FIELD field_48963 INVALID_ID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_48964 INVALID_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_48965 HASH C
+	FIELD field_48966 CURLY_OPEN_BRACKET C
+	FIELD field_48967 DEFAULT_SUGGESTOR Ljava/util/function/Function;
+	FIELD field_48968 itemRegistry Lnet/minecraft/class_7225$class_7226;
+	FIELD field_48969 allowTags Z
+	METHOD <init> (Lnet/minecraft/class_7225$class_7874;Z)V
+		ARG 1 registryLookup
+		ARG 2 allowTags
+	METHOD method_56865 read (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_9216$class_9219;)V
+		ARG 1 reader
+		ARG 2 callbacks
+	METHOD method_56866 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 builder
+	METHOD method_56867 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 tag
+	METHOD method_56868 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 id
+	CLASS class_9217 Reader
+		FIELD field_48971 reader Lcom/mojang/brigadier/StringReader;
+		FIELD field_48972 callbacks Lnet/minecraft/class_9216$class_9219;
+		METHOD <init> (Lnet/minecraft/class_9216;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_9216$class_9219;)V
+			ARG 2 reader
+			ARG 3 callbacks
+		METHOD method_56869 suggest ()V
+		METHOD method_56871 suggestCurlyBraceIfPossible (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_56872 readItem ()V
+		METHOD method_56874 suggestItems (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_56875 readTag ()V
+		METHOD method_56876 suggestTags (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+		METHOD method_56877 readNbt ()V
+		METHOD method_56878 suggestAll (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+	CLASS class_9218 SuggestionCallbacks
+		FIELD field_48973 suggestor Ljava/util/function/Function;
+		METHOD method_56879 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lcom/mojang/brigadier/StringReader;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 builder
+			ARG 2 reader
+	CLASS class_9219 Callbacks
+		METHOD method_56853 onItem (Lnet/minecraft/class_6880;)V
+			ARG 1 item
+		METHOD method_56854 setNbt (Lnet/minecraft/class_2487;)V
+			ARG 1 nbt
+		METHOD method_56862 onTag (Lnet/minecraft/class_6885;)V
+			ARG 1 tag
+		METHOD method_56880 setSuggestor (Ljava/util/function/Function;)V
+			ARG 1 suggestor
diff --git a/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping b/mappings/net/minecraft/command/argument/ItemPredicateStringReader.mapping
@@ -0,0 +1,15 @@
+CLASS net/minecraft/class_9215 net/minecraft/command/argument/ItemPredicateStringReader
+	FIELD field_48960 predicateReader Lnet/minecraft/class_9216;
+	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
+	METHOD method_56859 read (Lcom/mojang/brigadier/StringReader;)Ljava/util/function/Predicate;
+		ARG 1 reader
+	METHOD method_56860 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 builder
+	CLASS 1
+		METHOD method_56861 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1799;)Z
+			ARG 1 stack
+		METHOD method_56863 (Lnet/minecraft/class_6885;Lnet/minecraft/class_1799;)Z
+			ARG 1 stack
+		METHOD method_56864 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1799;)Z
+			ARG 1 stack
diff --git a/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_2287 net/minecraft/command/argument/ItemStackArgumentType
 	FIELD field_10790 EXAMPLES Ljava/util/Collection;
+	FIELD field_48954 reader Lnet/minecraft/class_2291;
 	METHOD <init> (Lnet/minecraft/class_7157;)V
 		ARG 1 commandRegistryAccess
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;

diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping
@@ -1,4 +1,9 @@
 CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
+	FIELD field_48955 predicateReader Lnet/minecraft/class_9216;
+	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
 	METHOD method_9789 consume (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2291$class_7215;
+		ARG 1 reader
 	METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 builder
 	CLASS class_7215 ItemResult
diff --git a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType
+	FIELD field_48929 registryLookup Lnet/minecraft/class_7225$class_7874;
 	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
@@ -13,11 +14,13 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgu
 		ARG 0 registryAccess
 	METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 		ARG 0 reader
+		ARG 1 registryLookup
 	METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
 	METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 		ARG 0 reader
 		ARG 1 type
+		ARG 2 registryLookup
 	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/StyleArgumentType.mapping b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping
@@ -1,7 +1,11 @@
 CLASS net/minecraft/class_9019 net/minecraft/command/argument/StyleArgumentType
 	FIELD field_47553 INVALID_STYLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_47554 EXAMPLES Ljava/util/Collection;
+	FIELD field_48932 registryLookup Lnet/minecraft/class_7225$class_7874;
+	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
 	METHOD method_55446 style (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9019;
+		ARG 0 registryAccess
 	METHOD method_55448 getStyle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2583;
 		ARG 0 context
 		ARG 1 style

diff --git a/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping b/mappings/net/minecraft/command/argument/TagKeyArgumentType.mapping
diff --git a/mappings/net/minecraft/command/argument/TextArgumentType.mapping b/mappings/net/minecraft/command/argument/TextArgumentType.mapping
@@ -1,10 +1,14 @@
 CLASS net/minecraft/class_2178 net/minecraft/command/argument/TextArgumentType
+	FIELD field_48917 registryLookup Lnet/minecraft/class_7225$class_7874;
 	FIELD field_9841 EXAMPLES Ljava/util/Collection;
 	FIELD field_9842 INVALID_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
+		ARG 1 registryLookup
 	METHOD method_9280 getTextArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 0 context
 		ARG 1 name
 	METHOD method_9281 text (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2178;
+		ARG 0 registryAccess
 	METHOD method_9282 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 text
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;

diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -484,7 +484,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT Removes this entity from the current dimension.
 		COMMENT
 		COMMENT <p>This calls {@link #setRemoved} by default. Subclasses can add other logics,
-		COMMENT such as setting the stack count of {@linkplain #getItemsEquipped equipped stacks}
+		COMMENT such as setting the stack count of {@linkplain LivingEntity#getEquippedItems equipped stacks}
 		COMMENT to zero.
 		COMMENT
 		COMMENT @see #moveToWorld

diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -24,6 +24,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	FIELD field_42108 limbAnimator Lnet/minecraft/class_8080;
 	FIELD field_45123 serverHeadYaw D
 	FIELD field_45740 ACTIVE_EFFECTS_NBT_KEY Ljava/lang/String;
+	FIELD field_48826 syncedBodyArmorStack Lnet/minecraft/class_1799;
 	FIELD field_6210 bodyTrackingIncrements I
 	FIELD field_6212 sidewaysSpeed F
 	FIELD field_6213 deathTime I

diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
@@ -8,6 +8,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 	FIELD field_42106 INFINITE I
 	FIELD field_47739 fading Lnet/minecraft/class_1293$class_9063;
 	FIELD field_48821 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_49014 MIN_AMPLIFIER I
+	FIELD field_49015 MAX_AMPLIFIER I
 	FIELD field_5889 showIcon Z
 	FIELD field_5890 showParticles Z
 	FIELD field_5892 ambient Z
@@ -142,5 +144,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 			ARG 5 hiddenEffect
 		METHOD method_56670 (Lnet/minecraft/class_1293$class_9195;)Ljava/util/Optional;
 			ARG 0 parameters
+		METHOD method_56671 (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/MapCodec;
+			ARG 0 codec
 		METHOD method_56672 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 1 instance
diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
@@ -17,6 +17,8 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity
 	METHOD method_35194 getXp ()I
 	METHOD method_40125 (Lnet/minecraft/class_6880$class_6883;)V
 		ARG 1 profession
+	METHOD method_56681 (Lnet/minecraft/class_1916;)V
+		ARG 1 offerData
 	METHOD method_7194 getConversionRate ()I
 	METHOD method_7197 finishConversion (Lnet/minecraft/class_3218;)V
 		ARG 1 world

diff --git a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity
 	FIELD field_17723 inventory Lnet/minecraft/class_1277;
 	FIELD field_19295 HEAD_ROLLING_TIME_LEFT Lnet/minecraft/class_2940;
 	FIELD field_30600 INVENTORY_SIZE I
+	FIELD field_48833 LOGGER Lorg/slf4j/Logger;
 	METHOD method_18007 produceParticles (Lnet/minecraft/class_2394;)V
 		ARG 1 parameters
 	METHOD method_18008 afterUsing (Lnet/minecraft/class_1914;)V
@@ -20,4 +21,6 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity
 	METHOD method_20506 getHeadRollingTimeLeft ()I
 	METHOD method_20507 setHeadRollingTimeLeft (I)V
 		ARG 1 ticks
+	METHOD method_56682 (Lnet/minecraft/class_1916;)V
+		ARG 1 offers
 	METHOD method_7237 fillRecipes ()V
diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
@@ -104,5 +104,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
 	METHOD method_49695 sendOffersToCustomer ()V
 	METHOD method_51304 (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
+	METHOD method_56683 (Lnet/minecraft/class_3850;)V
+		ARG 1 villagerData
 	METHOD method_7234 wantsToStartBreeding ()Z
 	METHOD method_7239 canBreed ()Z
diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping
@@ -418,6 +418,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items
 	FIELD field_47025 WAXED_OXIDIZED_COPPER_BULB Lnet/minecraft/class_1792;
 	FIELD field_47026 CHISELED_TUFF_BRICKS Lnet/minecraft/class_1792;
 	FIELD field_47314 TRIAL_SPAWNER Lnet/minecraft/class_1792;
+	FIELD field_48847 VAULT Lnet/minecraft/class_1792;
 	FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792;
 	FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792;
 	FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792;

diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping
@@ -2,17 +2,11 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker
 	COMMENT Represents a banner marker in world.
 	COMMENT <p>
 	COMMENT Used to track banners in a map state.
-	FIELD comp_2312 pos Lnet/minecraft/class_2338;
-	FIELD comp_2313 color Lnet/minecraft/class_1767;
-	FIELD comp_2314 name Ljava/util/Optional;
 	FIELD field_48918 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_48919 LIST_CODEC Lcom/mojang/serialization/Codec;
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_1767;Ljava/util/Optional;)V
 		ARG 1 pos
 		ARG 2 dyeColor
-	METHOD comp_2312 pos ()Lnet/minecraft/class_2338;
-	METHOD comp_2313 color ()Lnet/minecraft/class_1767;
-	METHOD comp_2314 name ()Ljava/util/Optional;
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_56812 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;