24w06a stuff

Plenty more to do, will leave it for others for now
Shnupbups · Feb 7, 2024 · 86f6b3b · 86f6b3b
1 parent eafbb88
commit 86f6b3b
Show file tree

Hide file tree

Showing 39 changed files with 218 additions and 4 deletions.
diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -1024,6 +1024,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		FIELD field_44626 replaceable Z
 		METHOD <init> (Lnet/minecraft/class_2248;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V
 			ARG 1 block
+			ARG 2 propertyMap
 			ARG 3 codec
 		METHOD method_26164 isIn (Lnet/minecraft/class_6862;)Z
 			ARG 1 tag

diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
@@ -29,7 +29,17 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior
 			ARG 1 entity
 	CLASS 9
 		FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347;
+	CLASS 10
+		FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347;
 	CLASS 17
+	CLASS 18
+		FIELD field_49138 fallbackBehavior Lnet/minecraft/class_2347;
+		METHOD method_57069 (Lnet/minecraft/class_4970$class_4971;)Z
+			ARG 0 state
+		METHOD method_57070 tryPutFilledBottle (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
+			ARG 1 pointer
+			ARG 2 emptyBottleStack
+			ARG 3 filledBottleStack
 	CLASS 22
 		FIELD field_38001 fallback Lnet/minecraft/class_2347;
 	CLASS 24

diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 	FIELD field_12024 inventory Lnet/minecraft/class_2371;
 	FIELD field_31341 TRANSFER_COOLDOWN I
 	FIELD field_31342 INVENTORY_SIZE I
+	FIELD field_49101 facing Lnet/minecraft/class_2350;
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
@@ -20,6 +21,8 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 1 transferCooldown
 	METHOD method_11239 needsCooldown ()Z
 	METHOD method_11241 extract (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;)Z
+		ARG 0 world
+		ARG 1 hopper
 	METHOD method_11242 isDisabled ()Z
 	METHOD method_11243 insertAndExtract (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2614;Ljava/util/function/BooleanSupplier;)Z
 		ARG 0 world
@@ -34,16 +37,25 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 	METHOD method_11246 insert (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2614;)Z
 		ARG 0 world
 		ARG 1 pos
+		ARG 2 blockEntity
 	METHOD method_11247 extract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1542;)Z
 		ARG 0 inventory
 		ARG 1 itemEntity
 	METHOD method_11248 getInputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1263;
 		ARG 0 world
+		ARG 1 hopper
+		ARG 2 pos
+		ARG 3 state
 	METHOD method_11250 getInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1263;
 		ARG 0 world
 		ARG 1 pos
 	METHOD method_11251 getInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;DDD)Lnet/minecraft/class_1263;
 		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
+		ARG 3 x
+		ARG 5 y
+		ARG 7 z
 	METHOD method_11252 canExtract (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;ILnet/minecraft/class_2350;)Z
 		ARG 0 hopperInventory
 		ARG 1 fromInventory
@@ -60,8 +72,12 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 0 first
 		ARG 1 second
 	METHOD method_11255 getOutputInventory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2614;)Lnet/minecraft/class_1263;
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 blockEntity
 	METHOD method_11256 isFull ()Z
 	METHOD method_11258 isInventoryFull (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Z
+		ARG 0 inventory
 		ARG 1 direction
 	METHOD method_11260 transfer (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;Lnet/minecraft/class_2350;)Lnet/minecraft/class_1799;
 		ARG 0 from
@@ -81,3 +97,12 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 blockEntity
+	METHOD method_57009 getEntityInventoryAt (Lnet/minecraft/class_1937;DDD)Lnet/minecraft/class_1263;
+		ARG 0 world
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
+	METHOD method_57010 getBlockInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1263;
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
diff --git a/mappings/net/minecraft/class_9236.mapping b/mappings/net/minecraft/class_9236.mapping
diff --git a/mappings/net/minecraft/client/gui/screen/option/FontOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/FontOptionsScreen.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9246 net/minecraft/client/gui/screen/option/FontOptionsScreen
+	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
+		ARG 1 parent
+		ARG 2 gameOptions
+	METHOD method_57041 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172;
+		ARG 0 gameOptions
diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping
@@ -222,6 +222,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_45987 narratorHotkey Lnet/minecraft/class_7172;
 	FIELD field_46854 HIDE_SPLASH_TEXTS_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_46855 hideSplashTexts Lnet/minecraft/class_7172;
+	FIELD field_49105 japaneseGlyphVariants Lnet/minecraft/class_7172;
 	METHOD <init> (Lnet/minecraft/class_310;Ljava/io/File;)V
 		ARG 1 client
 		ARG 2 optionsFile
@@ -597,6 +598,11 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	METHOD method_53530 getNarratorHotkey ()Lnet/minecraft/class_7172;
 	METHOD method_53842 getSyncedOptions ()Lnet/minecraft/class_8791;
 	METHOD method_54581 getHideSplashTexts ()Lnet/minecraft/class_7172;
+	METHOD method_57018 getJapaneseGlyphVariants ()Lnet/minecraft/class_7172;
+	METHOD method_57020 onFontOptionsChanged ()V
+	METHOD method_57021 shouldUseJapaneseGlyphsByDefault ()Z
+	METHOD method_57022 (Ljava/lang/Boolean;)V
+		ARG 0 value
 	CLASS 2
 		METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String;
 			ARG 1 key
@@ -627,3 +633,5 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 		METHOD method_33684 visitBoolean (Ljava/lang/String;Z)Z
 			ARG 1 key
 			ARG 2 current
+	CLASS class_9242
+		METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V
diff --git a/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping
@@ -1,2 +1,5 @@
 CLASS net/minecraft/class_9079 net/minecraft/client/render/entity/animation/ArmadilloAnimations
 	FIELD field_47844 IDLE Lnet/minecraft/class_7184;
+	FIELD field_49108 ROLLING Lnet/minecraft/class_7184;
+	FIELD field_49109 SCARED Lnet/minecraft/class_7184;
+	FIELD field_49110 UNROLLING Lnet/minecraft/class_7184;
diff --git a/...minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator.mapping b/...minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9249 net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneEntityLootTableGenerator
diff --git a/mappings/net/minecraft/datafixer/FixUtil.mapping b/mappings/net/minecraft/datafixer/FixUtil.mapping
@@ -0,0 +1,21 @@
+CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil
+	METHOD method_56943 fixBlockPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+	METHOD method_56944 renameKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+		ARG 1 oldKey
+		ARG 2 newKey
+	METHOD method_56945 replaceKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+		ARG 1 oldKey
+		ARG 2 newKey
+		ARG 3 newValue
+	METHOD method_56946 replaceKey (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/UnaryOperator;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+		ARG 1 oldKey
+		ARG 2 newKey
+		ARG 3 valueTransformer
+	METHOD method_56947 setOptional (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+		ARG 1 key
+		ARG 2 value
diff --git a/mappings/net/minecraft/datafixer/fix/BlockPosFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockPosFormatFix.mapping
@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_9230 net/minecraft/datafixer/fix/BlockPosFormatFix
+	FIELD field_49057 PATROL_TARGET_ENTITY_IDS Ljava/util/List;
+	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
+		ARG 1 outputSchema
+	METHOD method_56953 createFixRule (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/util/Map;)Lcom/mojang/datafixers/TypeRewriteRule;
+		ARG 1 typeReference
+		ARG 2 id
+		ARG 3 oldToNewKey
+	METHOD method_56956 fixOldBlockPosFormat (Lcom/mojang/datafixers/Typed;Ljava/util/Map;)Lcom/mojang/datafixers/Typed;
+		ARG 2 oldToNewKey
+	METHOD method_56957 fixMapItemFrames (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 1 dynamic
+	METHOD method_56958 addEntityFixes (Ljava/util/List;)V
+		ARG 1 rules
+	METHOD method_56963 addBlockEntityFixes (Ljava/util/List;)V
+		ARG 1 rules
diff --git a/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping b/mappings/net/minecraft/datafixer/fix/LegacyDragonFightFix.mapping
@@ -5,3 +5,5 @@ CLASS net/minecraft/class_8575 net/minecraft/datafixer/fix/LegacyDragonFightFix
 		ARG 0 typed
 	METHOD method_52228 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 		ARG 0 levelData
+	METHOD method_56973 updateExitPortalLocation (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
diff --git a/mappings/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9231 net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix
+	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
+		ARG 1 outputSchema
+	METHOD method_56975 update (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
diff --git a/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping b/mappings/net/minecraft/datafixer/fix/StatusEffectFix.mapping
@@ -6,9 +6,13 @@ CLASS net/minecraft/class_8744 net/minecraft/datafixer/fix/StatusEffectFix
 	METHOD method_53078 makeBlockEntitiesRule ()Lcom/mojang/datafixers/TypeRewriteRule;
 	METHOD method_53082 fixEffect (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
 		ARG 0 effectDynamic
+	METHOD method_53083 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53084 updateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/util/Optional;
+		ARG 0 dynamic
 		ARG 1 idKey
 	METHOD method_53085 renameKeyAndUpdateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 		ARG 1 oldKey
 		ARG 3 newKey
 	METHOD method_53090 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V
@@ -17,14 +21,22 @@ CLASS net/minecraft/class_8744 net/minecraft/datafixer/fix/StatusEffectFix
 		ARG 0 oldId
 	METHOD method_53093 makeEntitiesRule ()Lcom/mojang/datafixers/TypeRewriteRule;
 	METHOD method_53096 renameKeyAndUpdateId (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 		ARG 1 oldKey
 		ARG 2 newKey
 	METHOD method_53098 makeItemStacksRule ()Lcom/mojang/datafixers/TypeRewriteRule;
 	METHOD method_53100 fixStewEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53101 fixEffectList (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 		ARG 1 oldEffectListKey
 		ARG 2 newEffectListKey
 	METHOD method_53103 fixCustomPotionEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53104 fixEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53105 fixActiveEffectsKey (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
+	METHOD method_53108 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
 	METHOD method_53713 makePlayersRule ()Lcom/mojang/datafixers/TypeRewriteRule;
diff --git a/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping b/mappings/net/minecraft/datafixer/fix/WolfHealthFix.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_9229 net/minecraft/datafixer/fix/WolfHealthFix
+	FIELD field_49054 WOLF_ENTITY_ID Ljava/lang/String;
+	FIELD field_49055 MAX_HEALTH_ATTRIBUTE_ID Lnet/minecraft/class_2960;
+	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
+		ARG 1 outputSchema
diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping
@@ -17,3 +17,6 @@ CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState
 	METHOD method_45317 setRunning (ZI)V
 		ARG 1 running
 		ARG 2 age
+	METHOD method_56988 skip (IF)V
+		ARG 1 seconds
+		ARG 2 speedMultiplier
diff --git a/mappings/net/minecraft/class_9221.mapping → .../net/minecraft/entity/DataTracked.mapping b/mappings/net/minecraft/class_9221.mapping → .../net/minecraft/entity/DataTracked.mapping
@@ -1,3 +1,5 @@
-CLASS net/minecraft/class_9221
+CLASS net/minecraft/class_9221 net/minecraft/entity/DataTracked
 	METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V
+		ARG 1 entries
 	METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V
+		ARG 1 data
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -1352,6 +1352,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT <p>This is {@code 0} for non-players.
 		COMMENT
 		COMMENT @see #hasPermissionLevel
+	METHOD method_56918 onExplodedBy (Lnet/minecraft/class_1297;)V
+		ARG 1 entity
 	METHOD method_5692 updateMovementInFluid (Lnet/minecraft/class_6862;D)Z
 		ARG 1 tag
 		ARG 2 speed
@@ -1360,6 +1362,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT @apiNote Subclasses should override this and call {@link DataTracker#startTracking}
 		COMMENT for any data that needs to be tracked.
+		ARG 1 builder
 	METHOD method_5694 onPlayerCollision (Lnet/minecraft/class_1657;)V
 		COMMENT Called when a player collides with the entity. Does nothing by default.
 		COMMENT
@@ -1387,6 +1390,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT @see World#canPlayerModifyAt
 		ARG 1 attacker
+	METHOD method_56989 getFinalGravity ()D
 	METHOD method_5699 dropStack (Lnet/minecraft/class_1799;F)Lnet/minecraft/class_1542;
 		COMMENT Drops {@code stack} at the entity's position with the given Y offset.
 		COMMENT
@@ -1398,6 +1402,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #dropStack(ItemStack)
 		ARG 1 stack
 		ARG 2 yOffset
+	METHOD method_56990 applyGravity ()V
 	METHOD method_5700 onBubbleColumnSurfaceCollision (Z)V
 		COMMENT Called when the entity collides with a bubble column with an air above.
 		COMMENT

diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping
@@ -55,3 +55,4 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses
 	FIELD field_38094 EARS_TWITCH B
 	FIELD field_38847 SONIC_BOOM B
 	FIELD field_42621 START_DIGGING B
+	FIELD field_49074 PEEKING B
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -375,6 +375,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
 		ARG 1 slot
 		ARG 2 stack
+	METHOD method_56994 getJumpVelocity (F)F
+		ARG 1 strength
 	METHOD method_5877 getHandItems ()Ljava/lang/Iterable;
 	METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z
 		ARG 1 type

diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping
@@ -4,6 +4,9 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker
 	FIELD field_13333 trackedEntity Lnet/minecraft/class_9221;
 	FIELD field_13334 LOGGER Lorg/slf4j/Logger;
 	FIELD field_33378 MAX_DATA_VALUE_ID I
+	METHOD <init> (Lnet/minecraft/class_9221;[Lnet/minecraft/class_2945$class_2946;)V
+		ARG 1 trackedEntity
+		ARG 2 entries
 	METHOD method_12778 set (Lnet/minecraft/class_2940;Ljava/lang/Object;)V
 		ARG 1 key
 		ARG 2 value
@@ -58,3 +61,12 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker
 			ARG 0 buf
 			ARG 1 id
 			ARG 2 handler
+	CLASS class_9222 Builder
+		FIELD field_49022 entity Lnet/minecraft/class_9221;
+		FIELD field_49023 entries [Lnet/minecraft/class_2945$class_2946;
+		METHOD <init> (Lnet/minecraft/class_9221;)V
+			ARG 1 entity
+		METHOD method_56911 build ()Lnet/minecraft/class_2945;
+		METHOD method_56912 add (Lnet/minecraft/class_2940;Ljava/lang/Object;)Lnet/minecraft/class_2945$class_9222;
+			ARG 1 data
+			ARG 2 value
diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping
@@ -25,4 +25,9 @@ CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain
 	METHOD method_55739 addPanicActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 brain
 	CLASS class_9072 RollUpTask
+		FIELD field_49087 RUN_TIME_IN_TICKS I
+		FIELD field_49090 ticksUntilPeek I
+		FIELD field_49091 considerPeeking Z
+		METHOD method_57001 calculateTicksUntilPeek (Lnet/minecraft/class_9069;)I
+			ARG 1 entity
 	CLASS class_9073 UnrollAndFleeTask
diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping
@@ -2,6 +2,10 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
 	FIELD field_47785 STATE Lnet/minecraft/class_2940;
 	FIELD field_47786 currentStateTicks J
 	FIELD field_47787 nextScuteShedCooldown I
+	FIELD field_49080 unrollingAnimationState Lnet/minecraft/class_7094;
+	FIELD field_49081 rollingAnimationState Lnet/minecraft/class_7094;
+	FIELD field_49082 scaredAnimationState Lnet/minecraft/class_7094;
+	FIELD field_49083 peeking Z
 	METHOD method_55711 isRolledUp ()Z
 	METHOD method_55713 setState (Lnet/minecraft/class_9069$class_9070;)V
 		ARG 1 state
@@ -23,14 +27,24 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity
 		ARG 2 spawnReason
 		ARG 3 pos
 		ARG 4 random
+	METHOD method_56997 shouldUnrollAndFlee ()Z
 	CLASS class_9070 State
 		FIELD field_47793 name Ljava/lang/String;
 		FIELD field_47794 CODEC Lnet/minecraft/class_3542$class_7292;
 		FIELD field_48335 PACKET_CODEC Lnet/minecraft/class_9139;
 		FIELD field_48336 INDEX_TO_VALUE Ljava/util/function/IntFunction;
 		FIELD field_48337 index I
+		FIELD field_49085 runRollUpTask Z
+		FIELD field_49086 lengthInTicks I
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;ZII)V
 			ARG 3 name
+			ARG 4 runRollUpTask
+			ARG 5 lengthInTicks
+			ARG 6 index
 		METHOD method_55727 fromName (Ljava/lang/String;)Lnet/minecraft/class_9069$class_9070;
 			ARG 0 name
 		METHOD method_56084 getIndex ()I
+		METHOD method_56998 shouldRunRollUpTask ()Z
+		METHOD method_56999 isRolledUp (J)Z
+			ARG 1 currentStateTicks
+		METHOD method_57000 getLengthInTicks ()I
diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping
@@ -8,13 +8,15 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity
 	METHOD method_24345 isSitting ()Z
 	METHOD method_24346 setSitting (Z)V
 		ARG 1 sitting
+	METHOD method_56996 updateAttributesForTamed ()V
 	METHOD method_6170 setOwner (Lnet/minecraft/class_1657;)V
 		ARG 1 player
 	METHOD method_6171 isOwner (Lnet/minecraft/class_1309;)Z
 		ARG 1 entity
 	METHOD method_6172 isInSittingPose ()Z
 	METHOD method_6173 setTamed (ZZ)V
 		ARG 1 tamed
+		ARG 2 updateAttributes
 	METHOD method_6174 setOwnerUuid (Ljava/util/UUID;)V
 		ARG 1 uuid
 	METHOD method_6178 canAttackWithOwner (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z

diff --git a/mappings/net/minecraft/entity/projectile/AbstractWindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractWindChargeEntity.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9236 net/minecraft/entity/projectile/AbstractWindChargeEntity
+	METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDD)V
+		ARG 1 type
+		ARG 2 world
+		ARG 3 owner
+		ARG 4 x
+		ARG 6 y
+		ARG 8 z
+	METHOD method_55055 createExplosion ()V
+	CLASS class_9237 WindChargeExplosionBehavior
diff --git a/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/BreezeWindChargeEntity.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_9238 net/minecraft/entity/projectile/BreezeWindChargeEntity
+	FIELD field_49095 EXPLOSION_BEHAVIOR Lnet/minecraft/class_9236$class_9237;
+	FIELD field_49096 BASE_EXPLOSION_POWER F
+	METHOD <init> (Lnet/minecraft/class_8949;Lnet/minecraft/class_1937;)V
+		ARG 1 breeze
+		ARG 2 world