misc stuff (#2292)

* misc stuff * Apply suggestions from code review Co-authored-by: YanisBft <doublecraft.official@gmail.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> * stuff * carver config * heightproviders * Update HeightProvider.mapping * Update mappings/net/minecraft/entity/passive/AxolotlEntity.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: YanisBft <doublecraft.official@gmail.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
2021-04-09 18:36:00 +10:00 · 2021-04-09 18:36:00 +10:00 · 4b9ac0574d
parent 8c4c969b5a
commit 4b9ac0574d
54 changed files with 234 additions and 7 deletions
--- a/mappings/net/minecraft/SharedConstants.mapping
+++ b/mappings/net/minecraft/SharedConstants.mapping
@ -7,6 +7,9 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants
 		COMMENT Specifies whether Minecraft should use choice type registrations from the game's schema when entity types or block entity types are created.
 	METHOD method_16673 getGameVersion ()Lcom/mojang/bridge/game/GameVersion;
 	METHOD method_31372 getProtocolVersion ()I
+	METHOD method_34872 setGameVersion (Lcom/mojang/bridge/game/GameVersion;)V
+		ARG 0 version
+	METHOD method_36208 createGameVersion ()V
 	METHOD method_643 isValidChar (C)Z
 		ARG 0 chr
 	METHOD method_644 stripInvalidChars (Ljava/lang/String;)Ljava/lang/String;
--- a/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping
+++ b/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping
@ -14,3 +14,5 @@ CLASS net/minecraft/class_5244 net/minecraft/client/gui/screen/ScreenTexts
 	METHOD method_32700 composeGenericOptionText (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250;
 		ARG 0 text
 		ARG 1 value
+	METHOD method_36134 onOrOff (Z)Lnet/minecraft/class_2561;
+		ARG 0 on
--- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping
@ -15,6 +15,7 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
 	FIELD field_2594 EDITION_TITLE_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2599 realmsNotificationsInitialized Z
 	FIELD field_2606 copyrightTextX I
+	FIELD field_32271 COPYRIGHT Ljava/lang/String;
 	METHOD <init> (Z)V
 		ARG 1 doBackgroundFade
 	METHOD method_18105 loadTexturesAsync (Lnet/minecraft/class_1060;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
--- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping
+++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping
@ -57,3 +57,6 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc
 	METHOD method_2319 addWidget (Lnet/minecraft/class_456;Lnet/minecraft/class_161;)V
 		ARG 1 widget
 		ARG 2 advancement
+	METHOD method_35734 getType ()Lnet/minecraft/class_453;
+	METHOD method_35735 getIndex ()I
+	METHOD method_35736 getDisplay ()Lnet/minecraft/class_185;
--- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping
+++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping
@ -55,3 +55,4 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc
 	METHOD method_2333 setProgress (Lnet/minecraft/class_167;)V
 		ARG 1 progress
 	METHOD method_27572 getMaxWidth (Lnet/minecraft/class_5225;Ljava/util/List;)F
+	METHOD method_35737 getWidth ()I
--- a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping
@ -2,6 +2,7 @@ CLASS net/minecraft/class_471 net/minecraft/client/gui/screen/ingame/AnvilScreen
 	FIELD field_26559 TOO_EXPENSIVE_TEXT Lnet/minecraft/class_2561;
 	FIELD field_2819 TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2821 nameField Lnet/minecraft/class_342;
+	FIELD field_29348 player Lnet/minecraft/class_1657;
 	METHOD <init> (Lnet/minecraft/class_1706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
 		ARG 1 handler
 		ARG 2 inventory
--- a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping
@ -33,6 +33,7 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen
 		ARG 1 page
 	METHOD method_33888 (Lnet/minecraft/class_2487;Ljava/util/function/Consumer;)V
 		ARG 0 nbt
+	METHOD method_34494 closeScreen ()V
 	CLASS class_3931 Contents
 		METHOD method_17560 getPageCount ()I
 		METHOD method_17561 getPageUnchecked (I)Lnet/minecraft/class_5348;
--- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping
@ -5,5 +5,6 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph
 		ARG 2 inventory
 		ARG 3 title
 	METHOD method_17566 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V
+		ARG 1 matrices
 	METHOD method_17567 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V
 		ARG 1 matrices
--- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping
@ -43,6 +43,8 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 	CLASS class_482 LockableSlot
 	CLASS class_483 CreativeScreenHandler
 		FIELD field_2897 itemList Lnet/minecraft/class_2371;
+		METHOD <init> (Lnet/minecraft/class_1657;)V
+			ARG 1 player
 		METHOD method_2473 scrollItems (F)V
 			ARG 1 position
 		METHOD method_2474 shouldShowScrollbar ()Z
--- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping
+++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping
@ -40,4 +40,5 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia
 	METHOD method_31335 setOffline (Z)V
 		ARG 1 offline
 	METHOD method_31389 getNarrationMessage (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250;
+		ARG 1 text
 	METHOD method_31390 getStatusText ()Lnet/minecraft/class_2561;
--- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping
+++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping
@ -42,3 +42,4 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid
 		METHOD method_20173 recreate ()V
 		METHOD method_20174 start ()V
 		METHOD method_20175 getIconTexture ()Lnet/minecraft/class_1043;
+		METHOD method_35740 getLevelDisplayName ()Ljava/lang/String;
--- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping
+++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping
@ -15,6 +15,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 	FIELD field_22749 scrollAmount D
 	FIELD field_22750 scrolling Z
 	FIELD field_22751 selected Lnet/minecraft/class_350$class_351;
+	FIELD field_29346 WHITE_TEXTURE Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_310;IIIII)V
 		ARG 1 client
 		ARG 2 width
--- a/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping
+++ b/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping
@ -53,6 +53,15 @@ CLASS net/minecraft/class_344 net/minecraft/client/gui/widget/TexturedButtonWidg
 		ARG 7 hoveredVOffset
 		ARG 8 texture
 		ARG 9 pressAction
+	METHOD <init> (IIIIIILnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V
+		ARG 1 x
+		ARG 2 y
+		ARG 3 width
+		ARG 4 height
+		ARG 5 u
+		ARG 6 v
+		ARG 7 texture
+		ARG 8 pressAction
 	METHOD method_1893 setPos (II)V
 		ARG 1 x
 		ARG 2 y
--- a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping
+++ b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping
@ -5,6 +5,7 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR
 	FIELD field_24446 DAMAGED_PROVIDER Lnet/minecraft/class_1800;
 	FIELD field_24447 DAMAGE_PROVIDER Lnet/minecraft/class_1800;
 	FIELD field_24448 ITEM_SPECIFIC Ljava/util/Map;
+	FIELD field_32947 CUSTOM_MODEL_DATA_KEY Ljava/lang/String;
 	METHOD method_27878 get (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1800;
 		ARG 0 item
 		ARG 1 id
--- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping
+++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping
@ -28,3 +28,4 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry
 	METHOD method_2971 getDisplayName ()Lnet/minecraft/class_2561;
 	METHOD method_2977 getModel ()Ljava/lang/String;
 	METHOD method_2979 getCapeTexture ()Lnet/minecraft/class_2960;
+	METHOD method_35757 hasCape ()Z
--- a/mappings/net/minecraft/client/option/CyclingOption.mapping
+++ b/mappings/net/minecraft/client/option/CyclingOption.mapping
@ -56,6 +56,12 @@ CLASS net/minecraft/class_4064 net/minecraft/client/option/CyclingOption
 		ARG 1 tooltips
 	METHOD method_32532 (Lnet/minecraft/class_2561;Lnet/minecraft/class_310;)Lnet/minecraft/class_5676$class_5679;
 		ARG 1 client
+	METHOD method_35694 create (Ljava/lang/String;Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_4064$class_5675;)Lnet/minecraft/class_4064;
+		ARG 0 key
+		ARG 1 values
+		ARG 2 valueToText
+		ARG 3 getter
+		ARG 4 setter
 	CLASS class_5675 Setter
 		METHOD accept (Lnet/minecraft/class_315;Lnet/minecraft/class_316;Ljava/lang/Object;)V
 			ARG 1 gameOptions
--- a/mappings/net/minecraft/client/option/KeyBinding.mapping
+++ b/mappings/net/minecraft/client/option/KeyBinding.mapping
@ -9,6 +9,13 @@ CLASS net/minecraft/class_304 net/minecraft/client/option/KeyBinding
 	FIELD field_1659 category Ljava/lang/String;
 	FIELD field_1660 translationKey Ljava/lang/String;
 	FIELD field_1661 timesPressed I
+	FIELD field_32136 MOVEMENT_CATEGORY Ljava/lang/String;
+	FIELD field_32137 MISC_CATEGORY Ljava/lang/String;
+	FIELD field_32138 MULTIPLAYER_CATEGORY Ljava/lang/String;
+	FIELD field_32139 GAMEPLAY_CATEGORY Ljava/lang/String;
+	FIELD field_32140 INVENTORY_CATEGORY Ljava/lang/String;
+	FIELD field_32141 UI_CATEGORY Ljava/lang/String;
+	FIELD field_32142 CREATIVE_CATEGORY Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 		ARG 1 translationKey
 		ARG 2 code
--- a/mappings/net/minecraft/client/particle/AbstractDustParticle.mapping
+++ b/mappings/net/minecraft/client/particle/AbstractDustParticle.mapping
@ -1,3 +1,11 @@
 CLASS net/minecraft/class_5736 net/minecraft/client/particle/AbstractDustParticle
+	FIELD field_28247 spriteProvider Lnet/minecraft/class_4002;
 	METHOD <init> (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_5744;Lnet/minecraft/class_4002;)V
 		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+		ARG 15 spriteProvider
--- a/mappings/net/minecraft/client/particle/AscendingParticle.mapping
+++ b/mappings/net/minecraft/client/particle/AscendingParticle.mapping
@ -12,5 +12,8 @@ CLASS net/minecraft/class_4794 net/minecraft/client/particle/AscendingParticle
 		ARG 13 velocityY
 		ARG 15 velocityZ
 		ARG 17 scaleMultiplier
+		ARG 18 spriteProvider
 		ARG 19 colorMultiplier
 		ARG 20 baseMaxAge
+		ARG 21 gravityStrength
+		ARG 22 collidesWithWorld
--- a/mappings/net/minecraft/client/particle/BlockDustParticle.mapping
+++ b/mappings/net/minecraft/client/particle/BlockDustParticle.mapping
@ -2,6 +2,15 @@ CLASS net/minecraft/class_727 net/minecraft/client/particle/BlockDustParticle
 	FIELD field_17884 sampleU F
 	FIELD field_17885 sampleV F
 	FIELD field_3891 blockPos Lnet/minecraft/class_2338;
+	METHOD <init> (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_2680;)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+		ARG 14 state
 	METHOD <init> (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 x
@ -10,4 +19,6 @@ CLASS net/minecraft/class_727 net/minecraft/client/particle/BlockDustParticle
 		ARG 8 velocityX
 		ARG 10 velocityY
 		ARG 12 velocityZ
+		ARG 14 state
+		ARG 15 blockPos
 	CLASS class_728 Factory
--- a/mappings/net/minecraft/client/particle/CloudParticle.mapping
+++ b/mappings/net/minecraft/client/particle/CloudParticle.mapping
@ -5,6 +5,7 @@ CLASS net/minecraft/class_704 net/minecraft/client/particle/CloudParticle
 		ARG 2 x
 		ARG 4 y
 		ARG 6 z
+		ARG 14 spriteProvider
 	CLASS class_705 CloudFactory
 		FIELD field_17863 spriteProvider Lnet/minecraft/class_4002;
 		METHOD <init> (Lnet/minecraft/class_4002;)V
--- a/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping
+++ b/mappings/net/minecraft/client/particle/DustColorTransitionParticle.mapping
@ -1,6 +1,13 @@
 CLASS net/minecraft/class_5734 net/minecraft/client/particle/DustColorTransitionParticle
 	METHOD <init> (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_5743;Lnet/minecraft/class_4002;)V
 		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+		ARG 15 spriteProvider
 	CLASS class_5735 Factory
 		FIELD field_28246 spriteProvider Lnet/minecraft/class_4002;
 		METHOD <init> (Lnet/minecraft/class_4002;)V
--- a/mappings/net/minecraft/client/particle/ExplosionSmokeParticle.mapping
+++ b/mappings/net/minecraft/client/particle/ExplosionSmokeParticle.mapping
@ -5,6 +5,7 @@ CLASS net/minecraft/class_673 net/minecraft/client/particle/ExplosionSmokePartic
 		ARG 2 x
 		ARG 4 y
 		ARG 6 z
+		ARG 14 spriteProvider
 	CLASS class_674 Factory
 		FIELD field_17807 spriteProvider Lnet/minecraft/class_4002;
 		METHOD <init> (Lnet/minecraft/class_4002;)V
--- a/mappings/net/minecraft/client/particle/SnowflakeParticle.mapping
+++ b/mappings/net/minecraft/client/particle/SnowflakeParticle.mapping
@ -8,6 +8,7 @@ CLASS net/minecraft/class_5685 net/minecraft/client/particle/SnowflakeParticle
 		ARG 8 velocityX
 		ARG 10 velocityY
 		ARG 12 velocityZ
+		ARG 14 spriteProvider
 	CLASS class_5686 Factory
 		FIELD field_28004 spriteProvider Lnet/minecraft/class_4002;
 		METHOD <init> (Lnet/minecraft/class_4002;)V
--- a/mappings/net/minecraft/client/particle/SpellParticle.mapping
+++ b/mappings/net/minecraft/client/particle/SpellParticle.mapping
@ -9,6 +9,7 @@ CLASS net/minecraft/class_711 net/minecraft/client/particle/SpellParticle
 		ARG 8 velocityX
 		ARG 10 velocityY
 		ARG 12 velocityZ
+		ARG 14 spriteProvider
 	CLASS class_712 EntityAmbientFactory
 		FIELD field_17871 spriteProvider Lnet/minecraft/class_4002;
 		METHOD <init> (Lnet/minecraft/class_4002;)V
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@ -251,6 +251,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 0 state
 	METHOD method_29495 refreshPositionAfterTeleport (Lnet/minecraft/class_243;)V
 		ARG 1 pos
+	METHOD method_29919 getLeashOffset ()Lnet/minecraft/class_243;
 	METHOD method_30022 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z
 		ARG 1 state
 		ARG 2 pos
--- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping
+++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping
@ -121,6 +121,7 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain
 	METHOD method_29519 hasMemoryModuleWithValue (Lnet/minecraft/class_4140;Ljava/lang/Object;)Z
 		ARG 1 type
 		ARG 2 value
+	METHOD method_35059 getPossibleActivities ()Ljava/util/Set;
 	METHOD method_35060 clear ()V
 	CLASS class_5302 MemoryEntry
 		FIELD field_24661 type Lnet/minecraft/class_4140;
--- a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping
+++ b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping
@ -64,6 +64,12 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil
 	METHOD method_24565 isVisibleInMemory (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
 		ARG 0 source
 		ARG 1 target
+	METHOD method_25940 isTargetWithinAttackRange (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;I)Z
+		ARG 0 source
+		ARG 1 target
+	METHOD method_25941 isTargetWithinMeleeRange (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)Z
+		ARG 0 source
+		ARG 1 target
 	METHOD method_29248 streamSeenVillagers (Lnet/minecraft/class_1646;Ljava/util/function/Predicate;)Ljava/util/stream/Stream;
 		ARG 0 villager
 		ARG 1 filter
--- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping
@ -21,6 +21,9 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector
 		ARG 1 profiler
 	METHOD method_19048 getRunningGoals ()Ljava/util/stream/Stream;
 	METHOD method_35113 clear ()V
+	METHOD method_35114 setTimeInterval (I)V
+		ARG 1 timeInterval
+	METHOD method_35115 getGoals ()Ljava/util/Set;
 	METHOD method_6273 enableControl (Lnet/minecraft/class_1352$class_4134;)V
 		ARG 1 control
 	METHOD method_6274 disableControl (Lnet/minecraft/class_1352$class_4134;)V
--- a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping
@ -1,5 +1,6 @@
 CLASS net/minecraft/class_1366 net/minecraft/entity/ai/goal/MeleeAttackGoal
 	FIELD field_19200 lastUpdateTime J
+	FIELD field_24667 cooldown I
 	FIELD field_6500 speed D
 	FIELD field_6501 updateCountdownTicks I
 	FIELD field_6502 pauseWhenMobIdle Z
@ -13,6 +14,10 @@ CLASS net/minecraft/class_1366 net/minecraft/entity/ai/goal/MeleeAttackGoal
 		ARG 1 mob
 		ARG 2 speed
 		ARG 4 pauseWhenMobIdle
+	METHOD method_28346 setMaxCooldown ()V
+	METHOD method_28347 isCooledDown ()Z
+	METHOD method_28348 getCooldown ()I
+	METHOD method_28349 getMaxCooldown ()I
 	METHOD method_6288 attack (Lnet/minecraft/class_1309;D)V
 		ARG 1 target
 		ARG 2 squaredDistance
--- a/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping
@ -2,6 +2,8 @@ CLASS net/minecraft/class_1409 net/minecraft/entity/ai/pathing/MobNavigation
 	FIELD field_6686 avoidSunlight Z
 	METHOD method_26338 canWalkOnPath (Lnet/minecraft/class_7;)Z
 		ARG 1 pathType
+	METHOD method_35139 setCanEnterOpenDoors (Z)V
+		ARG 1 canEnterOpenDoors
 	METHOD method_6361 setAvoidSunlight (Z)V
 		ARG 1 avoidSunlight
 	METHOD method_6362 getPathfindingY ()I
--- a/mappings/net/minecraft/entity/ai/pathing/Path.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/Path.mapping
@ -10,6 +10,10 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path
 		ARG 3 reachesTarget
 	METHOD method_21655 reachesTarget ()Z
 	METHOD method_21656 getManhattanDistanceFromTarget ()F
+	METHOD method_29301 getCurrentNode ()Lnet/minecraft/class_9;
+	METHOD method_31031 getNodePos (I)Lnet/minecraft/class_2338;
+		ARG 1 index
+	METHOD method_31032 getCurrentNodePos ()Lnet/minecraft/class_2338;
 	METHOD method_33 setNode (ILnet/minecraft/class_9;)V
 		ARG 1 index
 		ARG 2 node
--- a/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping
@ -6,6 +6,7 @@ CLASS net/minecraft/class_5 net/minecraft/entity/ai/pathing/PathMinHeap
 	METHOD method_3 setNodeWeight (Lnet/minecraft/class_9;F)V
 		ARG 1 node
 		ARG 2 weight
+	METHOD method_35490 getFirstNode ()Lnet/minecraft/class_9;
 	METHOD method_4 shiftUp (I)V
 		ARG 1 index
 	METHOD method_5 clear ()V
--- a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping
@ -28,8 +28,8 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode
 		ARG 2 y
 		ARG 3 z
 	METHOD method_27 isInHeap ()Z
-	METHOD method_28 fromBuffer (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9;
-		ARG 0 buffer
+	METHOD method_28 readBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9;
+		ARG 0 buf
 	METHOD method_30 hash (III)I
 		ARG 0 x
 		ARG 1 y
@ -38,3 +38,10 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode
 		ARG 1 node
 	METHOD method_32 getSquaredDistance (Lnet/minecraft/class_9;)F
 		ARG 1 node
+	METHOD method_35494 getDistance (Lnet/minecraft/class_2338;)F
+		ARG 1 pos
+	METHOD method_35495 writeBuf (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
+	METHOD method_35496 getVec3d ()Lnet/minecraft/class_243;
+	METHOD method_35497 getSquaredDistance (Lnet/minecraft/class_2338;)F
+		ARG 1 pos
--- a/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping
@ -11,3 +11,4 @@ CLASS net/minecraft/class_4459 net/minecraft/entity/ai/pathing/TargetPathNode
 		ARG 0 buffer
 	METHOD method_21664 getNearestNode ()Lnet/minecraft/class_9;
 	METHOD method_21665 markReached ()V
+	METHOD method_35501 hasReached ()Z
--- a/mappings/net/minecraft/entity/attribute/ClampedEntityAttribute.mapping
+++ b/mappings/net/minecraft/entity/attribute/ClampedEntityAttribute.mapping
@ -7,3 +7,5 @@ CLASS net/minecraft/class_1329 net/minecraft/entity/attribute/ClampedEntityAttri
 		ARG 2 fallback
 		ARG 4 min
 		ARG 6 max
+	METHOD method_35061 getMinValue ()D
+	METHOD method_35062 getMaxValue ()D
--- a/mappings/net/minecraft/entity/damage/DamageTracker.mapping
+++ b/mappings/net/minecraft/entity/damage/DamageTracker.mapping
@ -12,6 +12,9 @@ CLASS net/minecraft/class_1283 net/minecraft/entity/damage/DamageTracker
 	METHOD method_33937 getBiggestAttackerId ()I
 		COMMENT Gets the Entity ID of the biggest attacker
 		COMMENT @see #getBiggestAttacker() for getting the entity itself
+	METHOD method_35039 hasDamage ()Z
+	METHOD method_35040 wasRecentlyAttacked ()Z
+	METHOD method_35041 getMostRecentDamage ()Lnet/minecraft/class_1281;
 	METHOD method_5539 update ()V
 	METHOD method_5540 getEntity ()Lnet/minecraft/class_1309;
 	METHOD method_5541 getBiggestAttacker ()Lnet/minecraft/class_1309;
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@ -91,9 +91,9 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 		ARG 2 slot
 	METHOD method_30759 enchantMainHandItem (F)V
 		ARG 1 power
-	METHOD method_33191 (Lnet/minecraft/class_1309;)D
-		ARG 1 entity
-	METHOD method_35056 clear ()V
+	METHOD method_33191 squaredAttackRange (Lnet/minecraft/class_1309;)D
+		ARG 1 target
+	METHOD method_35056 clearGoalsAndTasks ()V
 	METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
 		ARG 1 slot
 	METHOD method_5930 setForwardSpeed (F)V
--- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping
@ -26,9 +26,9 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
 		ARG 1 air
 	METHOD method_33231 setPlayingDead (Z)V
 		ARG 1 playingDead
-	METHOD method_35175 buffAttacker (Lnet/minecraft/class_5762;)V
+	METHOD method_35175 appreciatePlayer (Lnet/minecraft/class_5762;)V
 		ARG 0 axolotl
-	METHOD method_35176 hasAir ()Z
+	METHOD method_35176 isAirLessThanMax ()Z
 	CLASS class_5763 AxolotlData
 		FIELD field_28338 variants [Lnet/minecraft/class_5762$class_5767;
 		METHOD <init> ([Lnet/minecraft/class_5762$class_5767;)V
--- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping
@ -84,6 +84,7 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity
 	METHOD method_26880 createBeeAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_35161 getMoveGoalTicks ()I
 	METHOD method_35162 getPossibleHives ()Ljava/util/List;
+	METHOD method_35163 getGoalSelector ()Lnet/minecraft/class_1355;
 	CLASS class_4467 NotAngryGoal
 		METHOD method_21814 canBeeStart ()Z
 		METHOD method_21815 canBeeContinue ()Z
--- a/mappings/net/minecraft/entity/passive/GoatEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/GoatEntity.mapping
@ -2,6 +2,8 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity
 	FIELD field_30399 LONG_JUMPING_DIMENSIONS Lnet/minecraft/class_4048;
 	FIELD field_30400 SENSORS Lcom/google/common/collect/ImmutableList;
 	FIELD field_30401 MEMORY_MODULES Lcom/google/common/collect/ImmutableList;
+	FIELD field_30402 FALL_DAMAGE_SUBTRACTOR I
+	FIELD field_30403 SCREAMING_CHANCE D
 	FIELD field_30404 screaming Z
 	METHOD method_35178 isScreaming ()Z
 	METHOD method_35179 createGoatAttributes ()Lnet/minecraft/class_5132$class_5133;
--- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping
@ -2,6 +2,7 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity
 	FIELD field_22478 ownerUuid Ljava/util/UUID;
 	FIELD field_23740 leftOwner Z
 	FIELD field_28646 shot Z
+	FIELD field_33399 owner Lnet/minecraft/class_1297;
 	METHOD method_24919 setProperties (Lnet/minecraft/class_1297;FFFFF)V
 		ARG 1 user
 		ARG 2 pitch
--- a/mappings/net/minecraft/item/Items.mapping
+++ b/mappings/net/minecraft/item/Items.mapping
@ -742,6 +742,9 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items
 	FIELD field_8890 MOSSY_STONE_BRICK_STAIRS Lnet/minecraft/class_1792;
 	FIELD field_8893 BLUE_BED Lnet/minecraft/class_1792;
 	METHOD method_35220 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792;
+		ARG 0 block
+		ARG 1 group
+		ARG 2 blocks
 	METHOD method_7988 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792;
 		ARG 0 block
 		ARG 1 group
--- a/mappings/net/minecraft/recipe/Ingredient.mapping
+++ b/mappings/net/minecraft/recipe/Ingredient.mapping
@ -9,6 +9,7 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient
 		ARG 0 stacks
 	METHOD method_26965 (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
+	METHOD method_35226 empty ()Lnet/minecraft/class_1856;
 	METHOD method_8086 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1856;
 		ARG 0 buf
 	METHOD method_8088 write (Lnet/minecraft/class_2540;)V
--- a/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping
+++ b/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping
@ -1,3 +1,12 @@
 CLASS net/minecraft/class_5871 net/minecraft/world/gen/carver/CarverConfig
 	FIELD field_29053 debugConfig Lnet/minecraft/class_5872;
 	FIELD field_29054 CONFIG_CODEC Lcom/mojang/serialization/MapCodec;
+	FIELD field_31488 y Lnet/minecraft/class_6122;
+	FIELD field_31489 yScale Lnet/minecraft/class_5863;
+	FIELD field_31490 lavaLevel Lnet/minecraft/class_5843;
+	METHOD <init> (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;)V
+		ARG 1 probability
+		ARG 2 y
+		ARG 3 yScale
+		ARG 4 lavaLevel
+		ARG 5 debugConfig
--- a/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping
+++ b/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping
@ -0,0 +1,26 @@
+CLASS net/minecraft/class_6108 net/minecraft/world/gen/carver/CaveCarverConfig
+	FIELD field_31491 CAVE_CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_31492 horizontalRadiusMultiplier Lnet/minecraft/class_5863;
+	FIELD field_31493 verticalRadiusMultiplier Lnet/minecraft/class_5863;
+	FIELD field_31494 floorLevel Lnet/minecraft/class_5863;
+	METHOD <init> (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V
+		ARG 1 probability
+		ARG 2 y
+		ARG 3 yScale
+		ARG 4 lavaLevel
+		ARG 5 horizontalRadiusMultiplier
+		ARG 6 verticalRadiusMultiplier
+		ARG 7 floorLevel
+	METHOD <init> (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V
+		ARG 1 probability
+		ARG 2 y
+		ARG 3 yScale
+		ARG 4 lavaLevel
+		ARG 5 debugConfig
+		ARG 6 horizontalRadiusMultiplier
+		ARG 7 verticalRadiusMultiplier
+		ARG 8 floorLevel
+	METHOD <init> (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V
+		ARG 2 horizontalRadiusMultiplier
+		ARG 3 verticalRadiusMultiplier
+		ARG 4 floorLevel
--- a/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping
+++ b/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping
@ -1,2 +1,30 @@
 CLASS net/minecraft/class_5869 net/minecraft/world/gen/carver/RavineCarverConfig
 	FIELD field_29041 RAVINE_CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_31479 verticalRotation Lnet/minecraft/class_5863;
+	FIELD field_31480 shape Lnet/minecraft/class_5869$class_6107;
+	METHOD <init> (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V
+		ARG 1 probability
+		ARG 2 y
+		ARG 3 yScale
+		ARG 4 lavaLevel
+		ARG 5 debugConfig
+		ARG 6 verticalRotation
+		ARG 7 shape
+	METHOD <init> (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V
+		ARG 2 verticalRotation
+		ARG 3 shape
+	CLASS class_6107 Shape
+		FIELD field_31481 CODEC Lcom/mojang/serialization/Codec;
+		FIELD field_31482 distanceFactor Lnet/minecraft/class_5863;
+		FIELD field_31483 thickness Lnet/minecraft/class_5863;
+		FIELD field_31484 widthSmoothness I
+		FIELD field_31485 horizontalRadiusFactor Lnet/minecraft/class_5863;
+		FIELD field_31486 verticalRadiusDefaultFactor F
+		FIELD field_31487 verticalRadiusCenterFactor F
+		METHOD <init> (Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;ILnet/minecraft/class_5863;FF)V
+			ARG 1 distanceFactor
+			ARG 2 thickness
+			ARG 3 widthSmoothness
+			ARG 4 horizontalRadiusFactor
+			ARG 5 verticalRadiusDefaultFactor
+			ARG 6 verticalRadiusCenterFactor
--- a/mappings/net/minecraft/world/gen/carver/UnderwaterCanyonCarver.mapping
+++ b/mappings/net/minecraft/world/gen/carver/UnderwaterCanyonCarver.mapping
@ -0,0 +1 @@
+CLASS net/minecraft/class_6330 net/minecraft/world/gen/carver/UnderwaterCanyonCarver
--- a/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping
+++ b/mappings/net/minecraft/world/gen/carver/UnderwaterCaveCarver.mapping
@ -0,0 +1 @@
+CLASS net/minecraft/class_6331 net/minecraft/world/gen/carver/UnderwaterCaveCarver
--- a/mappings/net/minecraft/world/gen/heightprovider/BiasedToBottomHeightProvider.mapping
+++ b/mappings/net/minecraft/world/gen/heightprovider/BiasedToBottomHeightProvider.mapping
@ -0,0 +1,14 @@
+CLASS net/minecraft/class_6120 net/minecraft/world/gen/heightprovider/BiasedToBottomHeightProvider
+	FIELD field_31531 BIASED_TO_BOTTOM_CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_31532 LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD field_31533 minOffset Lnet/minecraft/class_5843;
+	FIELD field_31534 maxOffset Lnet/minecraft/class_5843;
+	FIELD field_31535 inner I
+	METHOD <init> (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;I)V
+		ARG 1 minOffset
+		ARG 2 maxOffset
+		ARG 3 inner
+	METHOD method_35377 create (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;I)Lnet/minecraft/class_6120;
+		ARG 0 minOffset
+		ARG 1 maxOffset
+		ARG 2 inner
--- a/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping
+++ b/mappings/net/minecraft/world/gen/heightprovider/ConstantHeightProvider.mapping
@ -0,0 +1,9 @@
+CLASS net/minecraft/class_6121 net/minecraft/world/gen/heightprovider/ConstantHeightProvider
+	FIELD field_31536 ZERO Lnet/minecraft/class_6121;
+	FIELD field_31537 CONSTANT_CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_31538 offset Lnet/minecraft/class_5843;
+	METHOD <init> (Lnet/minecraft/class_5843;)V
+		ARG 1 offset
+	METHOD method_35383 create (Lnet/minecraft/class_5843;)Lnet/minecraft/class_6121;
+		ARG 0 offset
+	METHOD method_35385 getOffset ()Lnet/minecraft/class_5843;
--- a/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping
+++ b/mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping
@ -0,0 +1,6 @@
+CLASS net/minecraft/class_6122 net/minecraft/world/gen/heightprovider/HeightProvider
+	FIELD field_31540 CODEC Lcom/mojang/serialization/Codec;
+	METHOD method_35388 getType ()Lnet/minecraft/class_6123;
+	METHOD method_35391 get (Ljava/util/Random;Lnet/minecraft/class_5868;)I
+		ARG 1 random
+		ARG 2 context
--- a/mappings/net/minecraft/world/gen/heightprovider/HeightProviderType.mapping
+++ b/mappings/net/minecraft/world/gen/heightprovider/HeightProviderType.mapping
@ -0,0 +1,3 @@
+CLASS net/minecraft/class_6123 net/minecraft/world/gen/heightprovider/HeightProviderType
+	METHOD method_35394 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_6123;
+		ARG 0 id
--- a/mappings/net/minecraft/world/gen/heightprovider/UniformHeightProvider.mapping
+++ b/mappings/net/minecraft/world/gen/heightprovider/UniformHeightProvider.mapping
@ -0,0 +1,11 @@
+CLASS net/minecraft/class_6124 net/minecraft/world/gen/heightprovider/UniformHeightProvider
+	FIELD field_31544 UNIFORM_CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_31545 LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD field_31546 minOffset Lnet/minecraft/class_5843;
+	FIELD field_31547 maxOffset Lnet/minecraft/class_5843;
+	METHOD <init> (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)V
+		ARG 1 minOffset
+		ARG 2 maxOffset
+	METHOD method_35396 create (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)Lnet/minecraft/class_6124;
+		ARG 0 minOffset
+		ARG 1 maxOffset
				`@ -0,0 +1 @@`
				`CLASS net/minecraft/class_6330 net/minecraft/world/gen/carver/UnderwaterCanyonCarver`
				`@ -0,0 +1 @@`
				`CLASS net/minecraft/class_6331 net/minecraft/world/gen/carver/UnderwaterCaveCarver`