From a0592ba0ce2a0d80153818a489a0776ea4d87ce6 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 8 Sep 2021 20:21:48 +0900 Subject: [PATCH] 1.17.1 passive entity stuff (#2664) * 1.17.1 passive entity stuff * Update AxolotlBrain.mapping --- .../entity/passive/AxolotlBrain.mapping | 14 +++++++++--- .../entity/passive/AxolotlEntity.mapping | 2 ++ .../entity/passive/BeeEntity.mapping | 2 ++ .../entity/passive/CatEntity.mapping | 3 +++ .../entity/passive/FoxEntity.mapping | 1 + .../entity/passive/GoatBrain.mapping | 22 +++++++++++++++++++ .../entity/passive/GoatEntity.mapping | 2 ++ .../entity/passive/HorseBaseEntity.mapping | 5 +++++ .../entity/passive/LlamaEntity.mapping | 2 ++ .../entity/passive/MerchantEntity.mapping | 1 + .../entity/passive/OcelotEntity.mapping | 3 +++ .../entity/passive/PandaEntity.mapping | 3 +++ .../entity/passive/PassiveEntity.mapping | 1 + .../entity/passive/SheepEntity.mapping | 1 + .../entity/passive/SnowGolemEntity.mapping | 1 + .../entity/passive/TropicalFishEntity.mapping | 6 +++++ .../entity/passive/TurtleEntity.mapping | 8 +++++++ 17 files changed, 74 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping b/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping index 62294874c6..4431253ff4 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping @@ -47,20 +47,28 @@ CLASS net/minecraft/class_5768 net/minecraft/entity/passive/AxolotlBrain COMMENT COMMENT FIELD field_28351 WALK_TOWARD_ADULT_RANGE Lnet/minecraft/class_6019; + FIELD field_30394 BREEDING_SPEED F + FIELD field_30395 ON_LAND_SPEED F + FIELD field_30396 IDLE_SPEED F + FIELD field_30397 TARGET_APPROACHING_SPEED F + FIELD field_30398 ADULT_FOLLOWING_SPEED F METHOD method_33241 getTemptItems ()Lnet/minecraft/class_1856; - METHOD method_33242 (Lnet/minecraft/class_1309;)F + METHOD method_33242 getTargetApproachingSpeed (Lnet/minecraft/class_1309;)F + COMMENT {@return the axolotl's speed when approaching the attack target} ARG 0 entity METHOD method_33243 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain METHOD method_33244 updateActivities (Lnet/minecraft/class_5762;)V ARG 0 axolotl - METHOD method_33245 (Lnet/minecraft/class_1309;)F + METHOD method_33245 getAdultFollowingSpeed (Lnet/minecraft/class_1309;)F + COMMENT {@return the axolotl's speed when a baby axolotl is following an adult} ARG 0 entity METHOD method_33246 addPlayDeadActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_33247 getAttackTarget (Lnet/minecraft/class_5762;)Ljava/util/Optional; ARG 0 axolotl - METHOD method_33248 (Lnet/minecraft/class_1309;)F + METHOD method_33248 getTemptedSpeed (Lnet/minecraft/class_1309;)F + COMMENT {@return the axolotl's speed when the axolotl is being tempted} ARG 0 entity METHOD method_33249 addFightActivities (Lnet/minecraft/class_4095;)V ARG 0 brain diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 2fbcd1535f..c2be94f344 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -44,7 +44,9 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity FIELD field_30391 VARIANT_KEY Ljava/lang/String; FIELD field_30392 MAX_AIR I FIELD field_30393 BUFF_DURATION I + FIELD field_33485 HYDRATION_BY_POTION I FIELD field_33764 modelAngles Ljava/util/Map; + FIELD field_34005 MAX_REGENERATION_BUFF_DURATION I METHOD method_33219 setVariant (Lnet/minecraft/class_5762$class_5767;)V ARG 1 variant METHOD method_33221 shouldBabyBeDifferent (Ljava/util/Random;)Z diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index ae21a6e587..e3ec492d83 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity FIELD field_30281 NEAR_TARGET_FLAG I FIELD field_30282 HAS_STUNG_FLAG I FIELD field_30283 HAS_NECTAR_FLAG I + FIELD field_30284 MAX_LIFETIME_AFTER_STINGING I FIELD field_30285 FLOWER_NAVIGATION_START_TICKS I COMMENT A bee will start moving to a flower once this time in ticks has passed from a pollination. FIELD field_30286 POLLINATION_FAIL_TICKS I @@ -156,4 +157,5 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity METHOD method_23749 moveToNextTarget ()V METHOD method_23750 getRandomOffset ()F CLASS class_4479 BeeWanderAroundGoal + FIELD field_30309 MAX_DISTANCE I METHOD method_21822 getRandomLocation ()Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index e903265f08..ebcc602b52 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -10,6 +10,9 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity FIELD field_16290 sleepAnimation F FIELD field_16291 prevSleepAnimation F FIELD field_16292 HEAD_DOWN Lnet/minecraft/class_2940; + FIELD field_30310 CROUCHING_SPEED D + FIELD field_30311 NORMAL_SPEED D + FIELD field_30312 SPRINTING_SPEED D FIELD field_30313 TABBY_TYPE I COMMENT The tabby cat type, whose value is {@value}. FIELD field_30314 BLACK_TYPE I diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 39d9813bc2..6b2f33467b 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity FIELD field_30332 SLEEPING_FLAG I FIELD field_30333 WALKING_FLAG I FIELD field_30334 AGGRESSIVE_FLAG I + FIELD field_30335 EATING_DURATION I METHOD method_18253 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_18254 (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping index 5bca763b1f..179aa83eec 100644 --- a/mappings/net/minecraft/entity/passive/GoatBrain.mapping +++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping @@ -6,10 +6,22 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain FIELD field_30409 FOLLOW_ADULT_WALK_SPEED F FIELD field_30410 NORMAL_WALK_SPEED F FIELD field_30411 LONG_JUMP_COOLDOWN_RANGE Lnet/minecraft/class_6019; + FIELD field_33490 PREPARE_RAM_DURATION I + FIELD field_33491 MAX_RAM_TARGET_DISTANCE I + FIELD field_33492 LONG_JUMP_VERTICAL_RANGE I + FIELD field_33493 LONG_JUMP_HORIZONTAL_RANGE I + FIELD field_33494 LONG_JUMP_MAX_RANGE F + FIELD field_33495 MIN_RAM_TARGET_DISTANCE I + FIELD field_33496 ADULT_RAM_STRENGTH_MULTIPLIER F + FIELD field_33497 BABY_RAM_STRENGTH_MULTIPLIER F + FIELD field_33498 PREPARING_RAM_WALK_SPEED F FIELD field_33499 RAM_COOLDOWN_RANGE Lnet/minecraft/class_6019; FIELD field_33500 RAM_TARGET_PREDICATE Lnet/minecraft/class_4051; + FIELD field_33501 RAM_SPEED F FIELD field_33693 SCREAMING_RAM_COOLDOWN_RANGE Lnet/minecraft/class_6019; METHOD method_35181 getTemptItems ()Lnet/minecraft/class_1856; + METHOD method_35182 (Lnet/minecraft/class_1309;)Ljava/lang/Float; + ARG 0 goat METHOD method_35183 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain METHOD method_35184 resetLongJumpCooldown (Lnet/minecraft/class_6053;)V @@ -22,9 +34,19 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain ARG 0 brain METHOD method_35188 addLongJumpActivities (Lnet/minecraft/class_4095;)V ARG 0 brain + METHOD method_36285 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + METHOD method_36286 (Lnet/minecraft/class_6053;)Lnet/minecraft/class_3414; + ARG 0 goat + METHOD method_36287 (Lnet/minecraft/class_6053;)Lnet/minecraft/class_3414; + ARG 0 goat METHOD method_36288 addRamActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_36289 (Lnet/minecraft/class_6053;)D ARG 0 goat METHOD method_36290 (Lnet/minecraft/class_6053;)Lnet/minecraft/class_6019; ARG 0 goat + METHOD method_36291 (Lnet/minecraft/class_6053;)Lnet/minecraft/class_3414; + ARG 0 goat + METHOD method_36553 (Lnet/minecraft/class_6053;)I + ARG 0 goat diff --git a/mappings/net/minecraft/entity/passive/GoatEntity.mapping b/mappings/net/minecraft/entity/passive/GoatEntity.mapping index d90486a072..545a1a58a9 100644 --- a/mappings/net/minecraft/entity/passive/GoatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/GoatEntity.mapping @@ -5,11 +5,13 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity FIELD field_30402 FALL_DAMAGE_SUBTRACTOR I FIELD field_30403 SCREAMING_CHANCE D FIELD field_33486 SCREAMING Lnet/minecraft/class_2940; + FIELD field_33487 preparingRam Z FIELD field_34022 DEFAULT_ATTACK_DAMAGE I FIELD field_34023 BABY_ATTACK_DAMAGE I METHOD method_35178 isScreaming ()Z METHOD method_35179 createGoatAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_35180 getMilkingSound ()Lnet/minecraft/class_3414; + METHOD method_36283 getHeadPitch ()F METHOD method_36284 setScreaming (Z)V ARG 1 screaming CLASS class_6339 GoatPathNodeMaker diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index 8c16e3fc71..cb51f892d1 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -28,6 +28,9 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity FIELD field_6975 soundTicks I FIELD field_6976 jumpStrength F METHOD method_26899 createBaseHorseAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_27930 locateSafeDismountingPos (Lnet/minecraft/class_243;Lnet/minecraft/class_1309;)Lnet/minecraft/class_243; + ARG 1 offset + ARG 2 passenger METHOD method_28368 getEatSound ()Lnet/minecraft/class_3414; METHOD method_30009 interactHorse (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; ARG 1 player @@ -39,6 +42,8 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity ARG 1 stack METHOD method_32337 (Lnet/minecraft/class_1799;)Z ARG 0 stack + METHOD method_33338 areInventoriesDifferent (Lnet/minecraft/class_1263;)Z + ARG 1 inventory METHOD method_6001 initAttributes ()V METHOD method_6721 onChestedStatusChanged ()V METHOD method_6722 openInventory (Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 4a0f0d6ea6..cb9875a77b 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity FIELD field_25375 TAMING_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_30425 MAX_STRENGTH I + FIELD field_30426 VARIANTS I FIELD field_6995 CARPET_COLOR Lnet/minecraft/class_2940; FIELD field_6996 VARIANT Lnet/minecraft/class_2940; FIELD field_6997 follower Lnet/minecraft/class_1501; diff --git a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping index 5f375e2011..3095eacde3 100644 --- a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity FIELD field_17722 customer Lnet/minecraft/class_1657; FIELD field_17723 inventory Lnet/minecraft/class_1277; FIELD field_19295 HEAD_ROLLING_TIME_LEFT Lnet/minecraft/class_2940; + FIELD field_30600 INVENTORY_SIZE I METHOD method_18007 produceParticles (Lnet/minecraft/class_2394;)V ARG 1 parameters METHOD method_18008 afterUsing (Lnet/minecraft/class_1914;)V diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index 5288ba6322..ee41ba5699 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity FIELD field_16300 fleeGoal Lnet/minecraft/class_3701$class_3702; FIELD field_16301 TRUSTING Lnet/minecraft/class_2940; FIELD field_16302 temptGoal Lnet/minecraft/class_3701$class_3703; + FIELD field_30340 CROUCHING_SPEED D + FIELD field_30341 NORMAL_SPEED D + FIELD field_30342 SPRINTING_SPEED D METHOD method_16099 isTrusting ()Z METHOD method_16100 showEmoteParticle (Z)V ARG 1 positive diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 9aa735a61e..de62ed5c7b 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -2,10 +2,13 @@ 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_30343 MAIN_GENE_MUTATION_CHANCE I FIELD field_30344 SNEEZING_FLAG I FIELD field_30345 PLAYING_FLAG I FIELD field_30346 SCARED_FLAG I FIELD field_30347 LYING_ON_BACK_FLAG I + FIELD field_30348 EATING_ANIMATION_INTERVAL I + FIELD field_30349 HIDDEN_GENE_MUTATION_CHANCE I FIELD field_6764 ASK_FOR_BAMBOO_TICKS Lnet/minecraft/class_2940; FIELD field_6765 IS_FOOD Ljava/util/function/Predicate; FIELD field_6766 MAIN_GENE Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping index fe0a13109c..a354815a3d 100644 --- a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1296 net/minecraft/entity/passive/PassiveEntity FIELD field_29969 BABY_AGE I + FIELD field_29970 HAPPY_TICKS I FIELD field_5947 happyTicksRemaining I FIELD field_5948 forcedAge I FIELD field_5949 CHILD Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 6f1699e66d..64ebefab06 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity + FIELD field_30371 MAX_GRASS_TIMER I FIELD field_6865 eatGrassTimer I FIELD field_6867 COLORS Ljava/util/Map; FIELD field_6868 DROPS Ljava/util/Map; diff --git a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping index 9189cd68f8..610bdd8d91 100644 --- a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1473 net/minecraft/entity/passive/SnowGolemEntity FIELD field_30373 HAS_PUMPKIN_FLAG B + FIELD field_30374 EYE_HEIGHT F FIELD field_6873 SNOW_GOLEM_FLAGS Lnet/minecraft/class_2940; METHOD method_20255 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V ARG 1 player diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping index b90473a9fd..ad66d7d741 100644 --- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping @@ -52,3 +52,9 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity FIELD field_6897 baseColor I FIELD field_6898 pattern I FIELD field_6899 shape I + METHOD (Lnet/minecraft/class_1474;IIII)V + ARG 1 leader + ARG 2 shape + ARG 3 pattern + ARG 4 baseColor + ARG 5 patternColor diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index 3536136681..984775746a 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity ARG 1 turtle ARG 2 speed CLASS class_1483 GoHomeGoal + FIELD field_30384 MAX_TRY_TICKS I FIELD field_6927 speed D FIELD field_6928 homeReachingTryTicks I FIELD field_6929 noPath Z @@ -50,6 +51,9 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity ARG 2 speed CLASS class_1484 WanderInWaterGoal FIELD field_6931 turtle Lnet/minecraft/class_1481; + METHOD (Lnet/minecraft/class_1481;D)V + ARG 1 turtle + ARG 2 speed CLASS class_1485 LayEggGoal FIELD field_6932 turtle Lnet/minecraft/class_1481; METHOD (Lnet/minecraft/class_1481;D)V @@ -70,6 +74,10 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity ARG 2 world CLASS class_1489 WanderOnLandGoal FIELD field_6934 turtle Lnet/minecraft/class_1481; + METHOD (Lnet/minecraft/class_1481;DI)V + ARG 1 turtle + ARG 2 speed + ARG 4 chance CLASS class_1491 TravelGoal FIELD field_6940 speed D FIELD field_6941 noPath Z