From 7725dcb8278d1f97a1a11b9ba2a9ec961283be91 Mon Sep 17 00:00:00 2001 From: Joseph Burton Date: Wed, 6 May 2020 21:49:35 +0100 Subject: [PATCH] Lots of entity mappings (#1322) * Lots of entity mappings * Apply review suggestions * Apply more review suggestions * Tweak drowned and enderman mappings * Properly rename EndermanEntity.chasing -> provoked * capChange -> stepTowards --- .../entity/feature/FeatureRenderer.mapping | 2 +- .../render/entity/model/EntityModel.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 1 + .../net/minecraft/entity/LivingEntity.mapping | 1 + .../entity/ai/goal/FollowTargetGoal.mapping | 2 ++ .../minecraft/entity/mob/BlazeEntity.mapping | 6 +++++ .../entity/mob/DrownedEntity.mapping | 2 ++ .../entity/mob/EndermanEntity.mapping | 11 ++++++++++ .../minecraft/entity/mob/EvokerEntity.mapping | 1 + .../entity/mob/EvokerFangsEntity.mapping | 4 +++- .../minecraft/entity/mob/GhastEntity.mapping | 4 ++++ .../net/minecraft/entity/mob/Hoglin.mapping | 4 ++++ .../minecraft/entity/mob/MobEntity.mapping | 22 ++++++++++++++++++- .../minecraft/entity/mob/PatrolEntity.mapping | 10 +++++---- .../entity/mob/PhantomEntity.mapping | 16 ++++++++++++++ .../minecraft/entity/mob/PiglinBrain.mapping | 1 + .../minecraft/entity/mob/PiglinEntity.mapping | 5 +++++ .../entity/mob/ShulkerEntity.mapping | 20 +++++++++++++++++ .../minecraft/entity/mob/SlimeEntity.mapping | 1 + .../minecraft/entity/mob/SpiderEntity.mapping | 5 +++-- .../passive/AbstractDonkeyEntity.mapping | 1 + .../entity/passive/BeeEntity.mapping | 3 ++- .../entity/passive/CatEntity.mapping | 1 + .../entity/passive/ChickenEntity.mapping | 5 +++++ .../entity/passive/DolphinEntity.mapping | 3 +++ .../entity/passive/FoxEntity.mapping | 1 + .../entity/passive/HorseBaseEntity.mapping | 4 ++++ .../entity/passive/HorseEntity.mapping | 4 +++- .../entity/passive/OcelotEntity.mapping | 1 + .../entity/passive/PandaEntity.mapping | 5 +++++ .../entity/passive/ParrotEntity.mapping | 6 +++++ .../entity/passive/RabbitEntity.mapping | 12 +++++++++- .../entity/passive/SheepEntity.mapping | 8 +++++++ .../entity/passive/TameableEntity.mapping | 9 +++++--- .../entity/passive/TraderLlamaEntity.mapping | 2 ++ .../entity/passive/VillagerEntity.mapping | 2 ++ .../entity/player/PlayerInventory.mapping | 3 +++ .../inventory/BasicInventory.mapping | 2 ++ mappings/net/minecraft/item/Item.mapping | 3 ++- .../net/minecraft/item/MiningToolItem.mapping | 2 ++ .../server/network/ServerPlayerEntity.mapping | 1 + .../minecraft/util/math/MathHelper.mapping | 21 ++++++++++++++---- .../net/minecraft/util/math/Vec3d.mapping | 20 +++++++++++++++++ mappings/net/minecraft/village/Trader.mapping | 1 + 44 files changed, 219 insertions(+), 21 deletions(-) diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index 5ebc8c986e..f50f2ba7b0 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -40,6 +40,6 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/Featur ARG 5 limbAngle ARG 6 limbDistance ARG 7 tickDelta - ARG 8 customAngle + ARG 8 animationProgress ARG 9 headYaw ARG 10 headPitch diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping index b4008a5bcb..679e02036a 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping @@ -13,6 +13,6 @@ CLASS net/minecraft/class_583 net/minecraft/client/render/entity/model/EntityMod ARG 1 entity ARG 2 limbAngle ARG 3 limbDistance - ARG 4 customAngle + ARG 4 animationProgress ARG 5 headYaw ARG 6 headPitch diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 65a3392398..4c7fa178bf 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -223,6 +223,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_24830 setOnGround (Z)V ARG 1 onGround METHOD method_25936 getLandingBlockState ()Lnet/minecraft/class_2680; + METHOD method_27298 shouldSpawnSprintingParticles ()Z METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V ARG 1 state diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 5f6ca28186..7ffef6e5aa 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -176,6 +176,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_26826 getAttributeBaseValue (Lnet/minecraft/class_1320;)D ARG 1 attribute METHOD method_26827 createLivingAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_27071 shouldDropLoot ()Z METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping index 720d135ba2..a26e76064e 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping @@ -20,5 +20,7 @@ CLASS net/minecraft/class_1400 net/minecraft/entity/ai/goal/FollowTargetGoal ARG 3 checkVisibility ARG 4 checkCanNavigate METHOD method_18415 findClosestTarget ()V + METHOD method_24632 setTargetEntity (Lnet/minecraft/class_1309;)V + ARG 1 targetEntity METHOD method_6321 getSearchBox (D)Lnet/minecraft/class_238; ARG 1 distance diff --git a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping index 9e6196a996..ac508c879c 100644 --- a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping @@ -1,10 +1,16 @@ CLASS net/minecraft/class_1545 net/minecraft/entity/mob/BlazeEntity + FIELD field_7214 eyeOffset F + FIELD field_7215 eyeOffsetCooldown I FIELD field_7216 BLAZE_FLAGS Lnet/minecraft/class_2940; METHOD method_26906 createBlazeAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6993 setFireActive (Z)V ARG 1 fireActive METHOD method_6994 isFireActive ()Z CLASS class_1546 ShootFireballGoal + FIELD field_19420 targetNotVisibleTicks I + FIELD field_7217 fireballCooldown I + FIELD field_7218 fireballsFired I FIELD field_7219 blaze Lnet/minecraft/class_1545; METHOD (Lnet/minecraft/class_1545;)V ARG 1 blaze + METHOD method_6995 getFollowRange ()D diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping index b2747b9de3..82bb5fa667 100644 --- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/class_1551 net/minecraft/entity/mob/DrownedEntity ARG 2 spawnType ARG 3 pos ARG 4 random + METHOD method_7012 canDrownedAttackTarget (Lnet/minecraft/class_1309;)Z + ARG 1 target METHOD method_7013 setTargetingUnderwater (Z)V ARG 1 targetingUnderwater METHOD method_7016 hasFinishedCurrentPath ()Z diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index c812de0abc..f7d2248567 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -1,11 +1,14 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity FIELD field_18126 PLAYER_ENDERMITE_PREDICATE Ljava/util/function/Predicate; + FIELD field_20618 PROVOKED Lnet/minecraft/class_2940; FIELD field_7252 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7253 lastAngrySoundAge I FIELD field_7254 ageWhenTargetSet I FIELD field_7255 ANGRY Lnet/minecraft/class_2940; FIELD field_7256 ATTACKING_SPEED_BOOST_UUID Ljava/util/UUID; FIELD field_7257 CARRIED_BLOCK Lnet/minecraft/class_2940; + METHOD method_22330 isProvoked ()Z + METHOD method_22331 setProvoked ()V METHOD method_26910 createEndermanAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_7024 teleportTo (DDD)Z ARG 1 x @@ -25,6 +28,13 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity FIELD field_7258 enderman Lnet/minecraft/class_1560; METHOD (Lnet/minecraft/class_1560;)V ARG 1 enderman + METHOD method_7033 canPlaceOn (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 posAbove + ARG 3 carriedState + ARG 4 stateAbove + ARG 5 state + ARG 6 pos CLASS class_1562 TeleportTowardsPlayerGoal FIELD field_18127 staringPlayerPredicate Lnet/minecraft/class_4051; FIELD field_18876 validTargetPredicate Lnet/minecraft/class_4051; @@ -42,5 +52,6 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity ARG 1 enderman CLASS class_4159 ChasePlayerGoal FIELD field_18524 enderman Lnet/minecraft/class_1560; + FIELD field_21513 target Lnet/minecraft/class_1309; METHOD (Lnet/minecraft/class_1560;)V ARG 1 enderman diff --git a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping index 8a51c98073..1a81900ce3 100644 --- a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_1564 net/minecraft/entity/mob/EvokerEntity ARG 3 z ARG 5 maxY ARG 7 y + ARG 9 yaw ARG 10 warmup CLASS class_1566 LookAtTargetOrWololoTarget CLASS class_1567 SummonVexGoal diff --git a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping index e0fb9d49a0..31e7dc6c78 100644 --- a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping @@ -2,13 +2,15 @@ CLASS net/minecraft/class_1669 net/minecraft/entity/mob/EvokerFangsEntity FIELD field_7605 owner Lnet/minecraft/class_1309; FIELD field_7606 ownerUuid Ljava/util/UUID; FIELD field_7607 ticksLeft I - FIELD field_7608 hasAttacked Z + FIELD field_7608 playingAnimation Z FIELD field_7609 warmup I + FIELD field_7610 startedAttack Z METHOD (Lnet/minecraft/class_1937;DDDFILnet/minecraft/class_1309;)V ARG 1 world ARG 2 x ARG 4 y ARG 6 z + ARG 8 yaw ARG 9 warmup ARG 10 owner METHOD method_7470 getOwner ()Lnet/minecraft/class_1309; diff --git a/mappings/net/minecraft/entity/mob/GhastEntity.mapping b/mappings/net/minecraft/entity/mob/GhastEntity.mapping index 01b5f89efb..fc3ba5951c 100644 --- a/mappings/net/minecraft/entity/mob/GhastEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GhastEntity.mapping @@ -18,8 +18,12 @@ CLASS net/minecraft/class_1571 net/minecraft/entity/mob/GhastEntity ARG 1 ghast CLASS class_1573 GhastMoveControl FIELD field_7275 ghast Lnet/minecraft/class_1571; + FIELD field_7276 collisionCheckCooldown I METHOD (Lnet/minecraft/class_1571;)V ARG 1 ghast + METHOD method_7051 willCollide (Lnet/minecraft/class_243;I)Z + ARG 1 direction + ARG 2 steps CLASS class_1574 ShootFireballGoal FIELD field_7277 ghast Lnet/minecraft/class_1571; FIELD field_7278 cooldown I diff --git a/mappings/net/minecraft/entity/mob/Hoglin.mapping b/mappings/net/minecraft/entity/mob/Hoglin.mapping index 746f9b94ff..7868933702 100644 --- a/mappings/net/minecraft/entity/mob/Hoglin.mapping +++ b/mappings/net/minecraft/entity/mob/Hoglin.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_5137 net/minecraft/entity/mob/Hoglin METHOD method_24657 getMovementCooldownTicks ()I METHOD method_26950 tryAttack (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z + ARG 0 attacker + ARG 1 target METHOD method_26951 knockback (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V + ARG 0 attacker + ARG 1 target diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index bd45933bde..c44730223c 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_19540 setAttacking (Z)V ARG 1 attacking METHOD method_20240 getLookYawSpeed ()I + METHOD method_20417 updateGoalControls ()V METHOD method_20636 canMobSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type ARG 1 world @@ -53,20 +54,34 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_20820 canGather (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_23734 isDisallowedInPeaceful ()Z + METHOD method_24521 disablePlayerShield (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V + ARG 1 player + ARG 2 mobStack + ARG 3 playerStack METHOD method_24523 tryEquip (Lnet/minecraft/class_1799;)Z ARG 1 equipment METHOD method_24834 equipLootStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V + ARG 1 slot ARG 2 stack + METHOD method_25938 canUseRangedWeapon (Lnet/minecraft/class_1811;)Z + ARG 1 weapon + METHOD method_25939 updateDropChances (Lnet/minecraft/class_1304;)V + ARG 1 slot + METHOD method_26320 prefersNewDamageableItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 newStack + ARG 2 oldStack METHOD method_26323 movesIndependently ()Z COMMENT When true, causes this entity to take over pathfinding for its controlling passenger. METHOD method_26828 createMobAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F + ARG 1 slot METHOD method_5930 setForwardSpeed (F)V ARG 1 forwardSpeed METHOD method_5931 canBeLeashedBy (Lnet/minecraft/class_1657;)Z ARG 1 player METHOD method_5932 detachLeash (ZZ)V ARG 1 sendPacket + ARG 2 dropItem METHOD method_5933 getHoldingEntity ()Lnet/minecraft/class_1297; METHOD method_5934 isLeashed ()Z METHOD method_5935 canEquipmentSlotContain (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)Z @@ -95,6 +110,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5945 getLimitPerChunk ()I METHOD method_5946 setEquipmentDropChance (Lnet/minecraft/class_1304;F)V ARG 1 slot + ARG 2 chance METHOD method_5947 isPersistent ()Z METHOD method_5948 getEquipmentForSlot (Lnet/minecraft/class_1304;I)Lnet/minecraft/class_1792; ARG 0 equipmentSlot @@ -106,11 +122,15 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 2 maxYawChange ARG 3 maxPitchChange METHOD method_5952 setCanPickUpLoot (Z)V + ARG 1 pickUpLoot METHOD method_5953 getPreferredEquipmentSlot (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1304; ARG 0 stack METHOD method_5954 attachLeash (Lnet/minecraft/class_1297;Z)V ARG 1 entity - METHOD method_5955 isBetterItemFor (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 2 sendPacket + METHOD method_5955 prefersNewEquipment (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 newStack + ARG 2 oldStack METHOD method_5956 canBeControlledByRider ()Z METHOD method_5957 canSpawn (Lnet/minecraft/class_4538;)Z ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping index 01c836de0d..e3f7ee0eec 100644 --- a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping @@ -23,10 +23,12 @@ CLASS net/minecraft/class_3732 net/minecraft/entity/mob/PatrolEntity ARG 1 patrolling CLASS class_3733 PatrolGoal FIELD field_16480 leaderSpeed D - FIELD field_16481 actor Lnet/minecraft/class_3732; - FIELD field_16535 fellowSpeed D + FIELD field_16481 entity Lnet/minecraft/class_3732; + FIELD field_16535 followSpeed D + FIELD field_20701 nextPatrolSearchTime J METHOD (Lnet/minecraft/class_3732;DD)V - ARG 1 actor + ARG 1 entity ARG 2 leaderSpeed - ARG 4 fellowSpeed + ARG 4 followSpeed METHOD method_16222 wander ()Z + METHOD method_22333 findPatrolTargets ()Ljava/util/List; diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index d8f42a7818..c8df1f05f4 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1593 net/minecraft/entity/mob/PhantomEntity + FIELD field_7312 circlingCenter Lnet/minecraft/class_2338; FIELD field_7313 SIZE Lnet/minecraft/class_2940; + FIELD field_7314 targetPosition Lnet/minecraft/class_243; FIELD field_7315 movementType Lnet/minecraft/class_1593$class_1594; METHOD method_7084 getPhantomSize ()I METHOD method_7091 setPhantomSize (I)V @@ -10,11 +12,25 @@ CLASS net/minecraft/class_1593 net/minecraft/entity/mob/PhantomEntity FIELD field_18130 PLAYERS_IN_RANGE_PREDICATE Lnet/minecraft/class_4051; FIELD field_7320 delay I CLASS class_1596 StartAttackGoal + FIELD field_7322 cooldown I + METHOD method_7102 startSwoop ()V CLASS class_1597 PhantomBodyControl + METHOD (Lnet/minecraft/class_1593;Lnet/minecraft/class_1308;)V + ARG 2 entity CLASS class_1598 CircleMovementGoal + FIELD field_7324 circlingDirection F + FIELD field_7326 yOffset F + FIELD field_7327 radius F + FIELD field_7328 angle F + METHOD method_7103 adjustDirection ()V CLASS class_1599 PhantomLookControl + METHOD (Lnet/minecraft/class_1593;Lnet/minecraft/class_1308;)V + ARG 2 entity CLASS class_1600 PhantomMoveControl + FIELD field_7331 targetSpeed F + COMMENT The movement speed that the phantom tends towards METHOD (Lnet/minecraft/class_1593;Lnet/minecraft/class_1308;)V ARG 2 owner CLASS class_1601 MovementGoal + METHOD method_7104 isCloseToTarget ()Z CLASS class_1602 SwoopMovementGoal diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index 70cf6064fd..c60f6d980e 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain FIELD field_22391 AVOID_MEMORY_DURATION Lnet/minecraft/class_4801; FIELD field_22392 FOOD Ljava/util/Set; FIELD field_22395 GOLDEN_ITEMS Ljava/util/Set; + FIELD field_23826 BARTERING_ITEM Lnet/minecraft/class_1792; METHOD method_24713 hasZombifiedPiglinNearby (Lnet/minecraft/class_4836;)Z ARG 0 piglin METHOD method_24714 hasBeenHitByPlayer (Lnet/minecraft/class_4836;)Z diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index 92bf5abf31..149c8d94b4 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity FIELD field_22380 BABY_SPEED_BOOST_MODIFIER Lnet/minecraft/class_1322; FIELD field_22381 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; FIELD field_22419 IMMUNE_TO_ZOMBIFICATION Lnet/minecraft/class_2940; + FIELD field_23738 cannotHunt Z METHOD method_24694 zombify (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_24695 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z @@ -41,6 +42,10 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity ARG 1 stack METHOD method_24847 setImmuneToZombification (Z)V ARG 1 immuneToZombification + METHOD method_26952 canHunt ()Z METHOD method_26953 createPiglinAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_26954 setCannotHunt (Z)V + ARG 1 cannotHunt + METHOD method_27085 canInsertIntoInventory (Lnet/minecraft/class_1799;)Z + ARG 1 stack CLASS class_4837 Activity diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index 9a975237bd..556b58bf02 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -1,20 +1,40 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity + FIELD field_7337 openProgress F FIELD field_7338 ATTACHED_BLOCK Lnet/minecraft/class_2940; + FIELD field_7339 prevOpenProgress F + FIELD field_7340 teleportLerpTimer I FIELD field_7341 ATTR_COVERED_ARMOR_BONUS_UUID Ljava/util/UUID; FIELD field_7342 ATTR_COVERED_ARMOR_BONUS Lnet/minecraft/class_1322; FIELD field_7343 COLOR Lnet/minecraft/class_2940; FIELD field_7344 ATTACHED_FACE Lnet/minecraft/class_2940; + FIELD field_7345 prevAttachedBlock Lnet/minecraft/class_2338; FIELD field_7346 PEEK_AMOUNT Lnet/minecraft/class_2940; + METHOD method_24350 canStay (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 pos + ARG 2 attachSide + METHOD method_24351 findAttachSide (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350; + ARG 1 pos METHOD method_26921 createShulkerAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_7113 getTeleportLerpTimer ()I METHOD method_7115 getPeekAmount ()I + METHOD method_7116 getOpenProgress (F)F + ARG 1 delta + METHOD method_7117 hasAttachedBlock ()Z METHOD method_7119 getAttachedFace ()Lnet/minecraft/class_2350; + METHOD method_7120 getPrevAttachedBlock ()Lnet/minecraft/class_2338; METHOD method_7121 getColor ()Lnet/minecraft/class_1767; METHOD method_7122 setPeekAmount (I)V + ARG 1 peekAmount METHOD method_7123 getAttachedBlock ()Lnet/minecraft/class_2338; + METHOD method_7124 isClosed ()Z METHOD method_7125 setAttachedBlock (Lnet/minecraft/class_2338;)V + ARG 1 pos + METHOD method_7127 tryTeleport ()Z CLASS class_1607 ShootBulletGoal FIELD field_7347 counter I CLASS class_1608 ShulkerBodyControl + METHOD (Lnet/minecraft/class_1606;Lnet/minecraft/class_1308;)V + ARG 2 entity CLASS class_1609 SearchForTargetGoal METHOD (Lnet/minecraft/class_1606;)V ARG 1 shulker diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index 61c785c183..806f8fcb89 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_1621 net/minecraft/entity/mob/SlimeEntity ARG 2 spawnType ARG 3 pos ARG 4 random + METHOD method_24353 getJumpSoundPitch ()F METHOD method_7152 getSize ()I METHOD method_7153 getJumpSound ()Lnet/minecraft/class_3414; METHOD method_7154 getTicksUntilNextJump ()I diff --git a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping index 6c28779362..bc51482214 100644 --- a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_1628 net/minecraft/entity/mob/SpiderEntity FIELD field_7403 SPIDER_FLAGS Lnet/minecraft/class_2940; METHOD method_26923 createSpiderAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_7166 setCanClimb (Z)V - METHOD method_7167 getCanClimb ()Z + METHOD method_7166 setClimbingWall (Z)V + ARG 1 climbing + METHOD method_7167 isClimbingWall ()Z CLASS class_1629 AttackGoal METHOD (Lnet/minecraft/class_1628;)V ARG 1 spider diff --git a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping index 00cedf7857..dcda10515b 100644 --- a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1492 net/minecraft/entity/passive/AbstractDonkeyEntity FIELD field_6943 CHEST Lnet/minecraft/class_2940; METHOD method_26898 createAbstractDonkeyAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_6702 getInventoryColumns ()I METHOD method_6703 hasChest ()Z METHOD method_6704 setHasChest (Z)V ARG 1 hasChest diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 125d2051b0..37fab16fcb 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -93,7 +93,8 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity FIELD field_21647 ticks I FIELD field_21648 possibleHives Ljava/util/List; FIELD field_21649 path Lnet/minecraft/class_11; - METHOD method_23885 reset ()V + FIELD field_23133 ticksUntilLost I + METHOD method_23885 setLost ()V METHOD method_24006 startMovingToFar (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_24007 isPossibleHive (Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 2eb1315af3..ab8c0feef7 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity METHOD method_16092 getTexture ()Lnet/minecraft/class_2960; METHOD method_16093 isHeadDown ()Z METHOD method_16094 setCollarColor (Lnet/minecraft/class_1767;)V + ARG 1 color METHOD method_16095 getHeadDownAnimation (F)F ARG 1 tickDelta METHOD method_16096 getCollarColor ()Lnet/minecraft/class_1767; diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping index ff9e40f47e..2d41d9edd8 100644 --- a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping @@ -1,7 +1,12 @@ CLASS net/minecraft/class_1428 net/minecraft/entity/passive/ChickenEntity + FIELD field_6736 prevFlapProgress F + FIELD field_6737 flapSpeed F + FIELD field_6738 prevMaxWingDeviation F FIELD field_6739 eggLayTime I FIELD field_6740 jockey Z + FIELD field_6741 flapProgress F FIELD field_6742 BREEDING_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_6743 maxWingDeviation F METHOD method_26882 createChickenAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6472 hasJockey ()Z METHOD method_6473 setHasJockey (Z)V diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping index 29e9ed3563..36aa03cde3 100644 --- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping +++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping @@ -25,8 +25,11 @@ CLASS net/minecraft/class_1433 net/minecraft/entity/passive/DolphinEntity METHOD method_6494 getTreasurePos ()Lnet/minecraft/class_2338; CLASS class_1434 DolphinMoveControl FIELD field_6751 dolphin Lnet/minecraft/class_1433; + METHOD (Lnet/minecraft/class_1433;)V + ARG 1 dolphin CLASS class_1435 LeadToNearbyTreasureGoal FIELD field_6752 dolphin Lnet/minecraft/class_1433; + FIELD field_6753 noPathToStructure Z METHOD (Lnet/minecraft/class_1433;)V ARG 1 dolphin CLASS class_1436 SwimWithPlayerGoal diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index c3640b2ca0..576be18621 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -103,6 +103,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity CLASS class_4029 AttackGoal METHOD (Lnet/minecraft/class_4019;DZ)V ARG 2 speed + ARG 4 pauseWhenIdle CLASS class_4030 FoxMoveControl CLASS class_4031 GoToVillageGoal METHOD (Lnet/minecraft/class_4019;II)V diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index ae020e1b2e..31161f3f9b 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -2,11 +2,13 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity FIELD field_18118 PARENT_HORSE_PREDICATE Lnet/minecraft/class_4051; FIELD field_6955 temper I FIELD field_6956 IS_BRED_HORSE Ljava/util/function/Predicate; + FIELD field_6957 tailWagTicks I FIELD field_6959 HORSE_FLAGS Lnet/minecraft/class_2940; FIELD field_6960 jumping Z FIELD field_6961 lastEatingAnimationProgress F FIELD field_6962 items Lnet/minecraft/class_1277; FIELD field_6963 lastAngryAnimationProgress F + FIELD field_6964 playExtraHorseSounds Z FIELD field_6965 eatingAnimationProgress F FIELD field_6966 lastEatingGrassAnimationProgress F FIELD field_6967 angryAnimationProgress F @@ -20,6 +22,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity FIELD field_6976 jumpStrength F METHOD method_26899 createBaseHorseAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6001 initAttributes ()V + METHOD method_6721 onChestedStatusChanged ()V METHOD method_6722 openInventory (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_6723 playJumpSound ()V @@ -70,6 +73,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity METHOD method_6757 playAngrySound ()V METHOD method_6758 setInAir (Z)V ARG 1 inAir + METHOD method_6759 wagTail ()V METHOD method_6760 spawnPlayerReactionParticles (Z)V ARG 1 positive METHOD method_6761 playWalkSound (Lnet/minecraft/class_2498;)V diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index 7feaabe1b9..dfa6646ff0 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -15,4 +15,6 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity METHOD method_6790 setArmorTypeFromStack (Lnet/minecraft/class_1799;)V ARG 1 stack CLASS class_1499 HorseData - FIELD field_6994 variant Lnet/minecraft/class_5149; + FIELD field_6994 color Lnet/minecraft/class_5149; + METHOD (Lnet/minecraft/class_5149;)V + ARG 1 color diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index f1f795d8e4..c13abcba2d 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity ARG 2 spawnType ARG 3 pos ARG 4 random + METHOD method_22329 getAttackDamage ()F METHOD method_26887 createOcelotAttributes ()Lnet/minecraft/class_5132$class_5133; CLASS class_3702 FleeGoal FIELD field_16303 ocelot Lnet/minecraft/class_3701; diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 962227ce21..c835d02b0b 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity FIELD field_18277 playingJump Lnet/minecraft/class_243; + FIELD field_21803 ASK_FOR_BAMBOO_TARGET Lnet/minecraft/class_4051; FIELD field_21804 lookAtPlayerGoal Lnet/minecraft/class_1440$class_4056; FIELD field_6764 ASK_FOR_BAMBOO_TICKS Lnet/minecraft/class_2940; FIELD field_6765 IS_FOOD Ljava/util/function/Predicate; @@ -92,6 +93,9 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity CLASS class_1442 PandaMateGoal FIELD field_6783 nextAskPlayerForBambooAge I FIELD field_6784 panda Lnet/minecraft/class_1440; + METHOD (Lnet/minecraft/class_1440;Lnet/minecraft/class_1440;D)V + ARG 2 panda + ARG 3 chance METHOD method_6561 isBambooClose ()Z CLASS class_1443 Gene FIELD field_6785 id I @@ -109,6 +113,7 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity METHOD method_6566 byId (I)Lnet/minecraft/class_1440$class_1443; ARG 0 id METHOD method_6567 byName (Ljava/lang/String;)Lnet/minecraft/class_1440$class_1443; + ARG 0 name METHOD method_6568 isRecessive ()Z METHOD method_6569 getProductGene (Lnet/minecraft/class_1440$class_1443;Lnet/minecraft/class_1440$class_1443;)Lnet/minecraft/class_1440$class_1443; ARG 0 mainGene diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index bb243e67d5..16472b3b27 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -1,11 +1,16 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity + FIELD field_6818 flapProgress F + FIELD field_6819 maxWingDeviation F FIELD field_6820 songSource Lnet/minecraft/class_2338; FIELD field_6821 CAN_IMITATE Ljava/util/function/Predicate; FIELD field_6822 MOB_SOUNDS Ljava/util/Map; FIELD field_6823 songPlaying Z + FIELD field_6824 flapSpeed F FIELD field_6825 TAMING_INGREDIENTS Ljava/util/Set; FIELD field_6826 ATTR_VARIANT Lnet/minecraft/class_2940; + FIELD field_6827 prevMaxWingDeviation F FIELD field_6828 COOKIE Lnet/minecraft/class_1792; + FIELD field_6829 prevFlapProgress F METHOD method_20667 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type ARG 1 world @@ -13,6 +18,7 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity ARG 3 pos ARG 4 random METHOD method_26889 createParrotAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_6578 flapWings ()V METHOD method_6580 getSoundPitch (Ljava/util/Random;)F ARG 0 random METHOD method_6581 isInAir ()Z diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 2d53ed273b..609c668f48 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -12,10 +12,12 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 2 spawnType ARG 3 pos METHOD method_26892 createRabbitAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_6605 getJumpProgress (F)F + ARG 1 delta METHOD method_6606 setSpeed (D)V ARG 1 speed METHOD method_6607 wantsCarrots ()Z - METHOD method_6608 scheduleJump ()V + METHOD method_6608 doScheduleJump ()V METHOD method_6610 getRabbitType ()I METHOD method_6614 isBreedingItem (Lnet/minecraft/class_1792;)Z ARG 1 item @@ -26,6 +28,7 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity METHOD method_6617 setRabbitType (I)V ARG 1 rabbitType METHOD method_6618 startJump ()V + METHOD method_6619 scheduleJump ()V METHOD method_6622 chooseType (Lnet/minecraft/class_1936;)I ARG 1 world CLASS class_1464 RabbitAttackGoal @@ -44,6 +47,7 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity METHOD (I)V ARG 1 type CLASS class_1468 RabbitMoveControl + FIELD field_6858 rabbitSpeed D FIELD field_6859 rabbit Lnet/minecraft/class_1463; METHOD (Lnet/minecraft/class_1463;)V ARG 1 owner @@ -53,7 +57,13 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 1 rabbit ARG 2 speed CLASS class_1470 EatCarrotCropGoal + FIELD field_6861 hasTarget Z FIELD field_6862 wantsCarrots Z FIELD field_6863 rabbit Lnet/minecraft/class_1463; METHOD (Lnet/minecraft/class_1463;)V ARG 1 rabbit + CLASS class_5197 RabbitJumpControl + FIELD field_24090 rabbit Lnet/minecraft/class_1463; + METHOD (Lnet/minecraft/class_1463;Lnet/minecraft/class_1463;)V + ARG 2 rabbit + METHOD method_27312 isActive ()Z diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index de4815e893..b13e80c531 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -5,7 +5,11 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity FIELD field_6869 eatGrassGoal Lnet/minecraft/class_1345; FIELD field_6870 COLOR Lnet/minecraft/class_2940; METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1715; + ARG 0 firstColor + ARG 1 secondColor METHOD method_26893 createSheepAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_6628 getNeckAngle (F)F + ARG 1 delta METHOD method_6629 isSheared ()Z METHOD method_6630 getDyedColor (Lnet/minecraft/class_1767;)[F ARG 0 color @@ -18,3 +22,7 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity METHOD method_6635 setSheared (Z)V ARG 1 sheared METHOD method_6639 getChildColor (Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;)Lnet/minecraft/class_1767; + ARG 1 firstParent + ARG 2 secondParent + METHOD method_6641 getHeadAngle (F)F + ARG 1 delta diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping index a269df2ced..053d09c50a 100644 --- a/mappings/net/minecraft/entity/passive/TameableEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TameableEntity.mapping @@ -2,12 +2,15 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity FIELD field_21974 sitting Z FIELD field_6320 OWNER_UUID Lnet/minecraft/class_2940; FIELD field_6322 TAMEABLE_FLAGS Lnet/minecraft/class_2940; + METHOD method_24345 isSitting ()Z + METHOD method_24346 setSitting (Z)V + ARG 1 sitting METHOD method_6139 getOwnerUuid ()Ljava/util/UUID; 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 isSitting ()Z + METHOD method_6172 isInSittingPose ()Z METHOD method_6173 setTamed (Z)V ARG 1 tamed METHOD method_6174 setOwnerUuid (Ljava/util/UUID;)V @@ -17,8 +20,8 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity METHOD method_6178 canAttackWithOwner (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 target ARG 2 owner - METHOD method_6179 setSitting (Z)V - ARG 1 sitting + METHOD method_6179 setInSittingPose (Z)V + ARG 1 inSittingPose METHOD method_6180 showEmoteParticle (Z)V ARG 1 positive METHOD method_6181 isTamed ()Z diff --git a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping index e39d1e7fd1..bd7b634bcf 100644 --- a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_3986 net/minecraft/entity/passive/TraderLlamaEntity FIELD field_17716 despawnDelay I + METHOD method_20501 tryDespawn ()V + METHOD method_20502 canDespawn ()Z METHOD method_20503 heldByTrader ()Z METHOD method_20504 leashedByPlayer ()Z CLASS class_3987 DefendTraderGoal diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index fc661c028e..45740df758 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity ARG 1 brain METHOD method_19176 releaseTicketFor (Lnet/minecraft/class_4140;)V METHOD method_19177 talkWithVillager (Lnet/minecraft/class_1646;J)V + ARG 1 villager ARG 2 time METHOD method_19179 reinitializeBrain (Lnet/minecraft/class_3218;)V ARG 1 world @@ -69,6 +70,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_20822 shouldRestock ()Z METHOD method_20823 needRestock ()Z METHOD method_20824 canRestock ()Z + METHOD method_21650 setGossipDataFromTag (Lnet/minecraft/class_2520;)V METHOD method_21651 getGossip ()Lnet/minecraft/class_4136; METHOD method_21724 updatePricesOnDemand ()V METHOD method_26955 createVillagerAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 81918cde3d..adff145303 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -18,6 +18,9 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 1 slot ARG 2 stack METHOD method_7368 getHotbarSize ()I + METHOD method_7369 clearItem (Ljava/util/function/Predicate;I)I + ARG 1 itemPredicate + ARG 2 amount METHOD method_7370 getBlockBreakingSpeed (Lnet/minecraft/class_2680;)F ARG 1 block METHOD method_7372 getArmorStack (I)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/inventory/BasicInventory.mapping b/mappings/net/minecraft/inventory/BasicInventory.mapping index fa3f0996b1..3360f8bc22 100644 --- a/mappings/net/minecraft/inventory/BasicInventory.mapping +++ b/mappings/net/minecraft/inventory/BasicInventory.mapping @@ -24,6 +24,8 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/BasicInventory METHOD method_24825 canCombine (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 one ARG 2 two + METHOD method_27070 canInsert (Lnet/minecraft/class_1799;)Z + ARG 1 stack METHOD method_5488 removeListener (Lnet/minecraft/class_1265;)V ARG 1 listener METHOD method_5489 addListener (Lnet/minecraft/class_1265;)V diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 27782f31a2..9141168884 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -38,7 +38,8 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 1 stack ARG 2 world ARG 3 player - METHOD method_7844 getModifiers (Lnet/minecraft/class_1304;)Lcom/google/common/collect/Multimap; + METHOD method_7844 getAttributeModifiers (Lnet/minecraft/class_1304;)Lcom/google/common/collect/Multimap; + ARG 1 slot METHOD method_7846 isDamageable ()Z METHOD method_7847 useOnEntity (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;)Z ARG 1 stack diff --git a/mappings/net/minecraft/item/MiningToolItem.mapping b/mappings/net/minecraft/item/MiningToolItem.mapping index 476f3ea076..f0f7404e41 100644 --- a/mappings/net/minecraft/item/MiningToolItem.mapping +++ b/mappings/net/minecraft/item/MiningToolItem.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem + FIELD field_23742 attributeModifiers Lcom/google/common/collect/Multimap; FIELD field_7939 attackDamage F FIELD field_7940 miningSpeed F FIELD field_7941 effectiveBlocks Ljava/util/Set; @@ -12,3 +13,4 @@ CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem ARG 0 e METHOD method_20274 (Lnet/minecraft/class_1309;)V ARG 0 e + METHOD method_26366 getAttackDamage ()F diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 70546479b9..38faaaa706 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -78,6 +78,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14238 getClientChatVisibility ()Lnet/minecraft/class_1659; METHOD method_14239 isDisconnected ()Z METHOD method_14240 onTeleportationDone ()V + METHOD method_14241 updateCursorStack ()V METHOD method_14242 getCameraEntity ()Lnet/minecraft/class_1297; METHOD method_14245 moveToSpawn (Lnet/minecraft/class_3218;)V ARG 1 world diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index f16ec3f7c0..33b42a4edd 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -28,6 +28,11 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper METHOD method_15347 approximatelyEquals (FF)Z ARG 0 a ARG 1 b + METHOD method_15348 stepTowards (FFF)F + COMMENT Steps from {@code from} towards {@code to}, changing the value by at most {@code step}. + ARG 0 from + ARG 1 to + ARG 2 step METHOD method_15349 atan2 (DD)D ARG 0 y ARG 2 x @@ -106,6 +111,13 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 value METHOD method_15386 ceil (F)I METHOD method_15387 floorMod (II)I + METHOD method_15388 stepUnwrappedAngleTowards (FFF)F + COMMENT Steps from {@code from} degrees towards {@code to} degrees, changing the value by at most {@code step} degrees. + COMMENT + COMMENT

This method does not wrap the resulting angle, so {@link #stepAngleTowards(float, float, float)} should be used in preference.

+ ARG 0 from + ARG 1 to + ARG 2 step METHOD method_15389 hashCode (Lnet/minecraft/class_2382;)J ARG 0 vec METHOD method_15390 clampedLerp (DDD)D @@ -172,10 +184,11 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 1 start ARG 2 end METHOD method_17822 sign (D)I - METHOD method_20306 capRotation (FFF)F - ARG 0 start - ARG 1 end - ARG 2 speed + METHOD method_20306 stepAngleTowards (FFF)F + COMMENT Steps from {@code from} degrees towards {@code to} degrees, changing the value by at most {@code step} degrees. + ARG 0 from + ARG 1 to + ARG 2 step METHOD method_20390 approximatelyEquals (DD)Z ARG 0 a ARG 2 b diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index 0e2da8665b..4762a1b84b 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -7,20 +7,28 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d ARG 1 x ARG 3 y ARG 5 z + METHOD (Lnet/minecraft/class_1160;)V + ARG 1 vec METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_1019 add (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 vec METHOD method_1020 subtract (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 vec METHOD method_1021 multiply (D)Lnet/minecraft/class_243; ARG 1 mult METHOD method_1022 distanceTo (Lnet/minecraft/class_243;)D + ARG 1 vec METHOD method_1023 subtract (DDD)Lnet/minecraft/class_243; ARG 1 x ARG 3 y ARG 5 z METHOD method_1024 rotateY (F)Lnet/minecraft/class_243; + ARG 1 angle METHOD method_1025 squaredDistanceTo (Lnet/minecraft/class_243;)D + ARG 1 vec METHOD method_1026 dotProduct (Lnet/minecraft/class_243;)D + ARG 1 vec METHOD method_1027 lengthSquared ()D METHOD method_1028 squaredDistanceTo (DDD)D ARG 1 x @@ -40,8 +48,11 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d METHOD method_1034 fromPolar (Lnet/minecraft/class_241;)Lnet/minecraft/class_243; ARG 0 polar METHOD method_1035 reverseSubtract (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 vec METHOD method_1036 crossProduct (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 vec METHOD method_1037 rotateX (F)Lnet/minecraft/class_243; + ARG 1 angle METHOD method_18043 getComponentAlongAxis (Lnet/minecraft/class_2350$class_2351;)D METHOD method_18805 multiply (DDD)Lnet/minecraft/class_243; ARG 1 multX @@ -55,3 +66,12 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d METHOD method_24802 isInRange (Lnet/minecraft/class_2374;D)Z ARG 1 pos ARG 2 radius + METHOD method_24953 ofCenter (Lnet/minecraft/class_2382;)Lnet/minecraft/class_243; + ARG 0 vec + METHOD method_24954 of (Lnet/minecraft/class_2382;)Lnet/minecraft/class_243; + ARG 0 vec + METHOD method_24955 ofBottomCenter (Lnet/minecraft/class_2382;)Lnet/minecraft/class_243; + ARG 0 vec + METHOD method_26410 ofCenter (Lnet/minecraft/class_2382;D)Lnet/minecraft/class_243; + ARG 0 vec + ARG 1 deltaY diff --git a/mappings/net/minecraft/village/Trader.mapping b/mappings/net/minecraft/village/Trader.mapping index 7c1d0f5576..703c8f669b 100644 --- a/mappings/net/minecraft/village/Trader.mapping +++ b/mappings/net/minecraft/village/Trader.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_1915 net/minecraft/village/Trader ARG 1 customer METHOD method_8260 getTraderWorld ()Lnet/minecraft/class_1937; METHOD method_8261 setOffersFromServer (Lnet/minecraft/class_1916;)V + ARG 1 offers METHOD method_8262 trade (Lnet/minecraft/class_1914;)V ARG 1 offer METHOD method_8264 getOffers ()Lnet/minecraft/class_1916;