From 898fb4c9be103b9721c7d766ba23a4bc5bd05926 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Sat, 23 Nov 2019 20:18:13 -0500 Subject: [PATCH] Bee mappings (#981) --- .../block/entity/BeeHiveBlockEntity.mapping | 1 + .../minecraft/entity/ai/TargetFinder.mapping | 52 +++++++++++++++++ .../entity/ai/control/LookControl.mapping | 1 + .../entity/ai/goal/MeleeAttackGoal.mapping | 2 + .../ai/pathing/EntityNavigation.mapping | 4 ++ .../ai/pathing/PathNodeNavigator.mapping | 2 + .../entity/passive/BeeEntity.mapping | 56 ++++++++++++++++++- mappings/net/minecraft/world/World.mapping | 3 +- 8 files changed, 119 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/block/entity/BeeHiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeeHiveBlockEntity.mapping index 47b9ce1461..5a2370ef15 100644 --- a/mappings/net/minecraft/block/entity/BeeHiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeeHiveBlockEntity.mapping @@ -23,3 +23,4 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeeHiveBlockEntity METHOD method_21858 tickBees ()V METHOD method_21859 getBees ()Lnet/minecraft/class_2499; METHOD method_22400 hasNoBees ()Z + METHOD method_23280 isNearFire ()Z diff --git a/mappings/net/minecraft/entity/ai/TargetFinder.mapping b/mappings/net/minecraft/entity/ai/TargetFinder.mapping index bdad372e20..5d6568b048 100644 --- a/mappings/net/minecraft/entity/ai/TargetFinder.mapping +++ b/mappings/net/minecraft/entity/ai/TargetFinder.mapping @@ -9,6 +9,58 @@ CLASS net/minecraft/class_1414 net/minecraft/entity/ai/TargetFinder ARG 1 maxHorizontalDistance ARG 2 maxVerticalDistance ARG 3 pos + METHOD method_21756 findGroundTarget (Lnet/minecraft/class_1314;IIILnet/minecraft/class_243;D)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 preferredYDifference + ARG 4 preferredAngle + ARG 5 maxAngleDifference + METHOD method_21757 findAirTarget (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;FII)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 preferredAngle + ARG 4 maxAngleDifference + ARG 5 distanceAboveGroundRange + ARG 6 minDistanceAboveGround + METHOD method_21758 findTarget (Lnet/minecraft/class_1314;IIILnet/minecraft/class_243;ZDLjava/util/function/ToDoubleFunction;ZIIZ)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 preferredYDifference + ARG 4 preferredAngle + ARG 5 notInWater + ARG 6 maxAngleDifference + ARG 8 favorProvider + ARG 9 aboveGround + ARG 10 distanceAboveGroundRange + ARG 11 minDistanceAboveGround + ARG 12 validPositionsOnly + METHOD method_21761 findValidPositionAbove (Lnet/minecraft/class_2338;IILjava/util/function/Predicate;)Lnet/minecraft/class_2338; + ARG 0 pos + ARG 1 minDistanceAboveIllegal + ARG 2 maxOffset + ARG 3 isIllegalPredicate + METHOD method_23735 findTargetTowards (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 pos + METHOD method_23736 findGroundTargetTowards (Lnet/minecraft/class_1314;IIILnet/minecraft/class_243;D)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 preferredYDifference + ARG 4 pos + ARG 5 maxAngleDifference + METHOD method_6374 getRandomOffset (Ljava/util/Random;IIILnet/minecraft/class_243;D)Lnet/minecraft/class_2338; + ARG 0 random + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 preferredYDifference + ARG 4 preferredAngle + ARG 5 maxAngleDifference METHOD method_6375 findTarget (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; ARG 0 mob ARG 1 maxHorizontalDistance diff --git a/mappings/net/minecraft/entity/ai/control/LookControl.mapping b/mappings/net/minecraft/entity/ai/control/LookControl.mapping index 4700b0181d..01a2426385 100644 --- a/mappings/net/minecraft/entity/ai/control/LookControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/LookControl.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_1333 net/minecraft/entity/ai/control/LookControl METHOD method_20249 getLookingHeightFor (Lnet/minecraft/class_1297;)D METHOD method_20250 getTargetPitch ()F METHOD method_20251 getTargetYaw ()F + METHOD method_20433 shouldStayHorizontal ()Z METHOD method_6225 getLookX ()D METHOD method_6226 lookAt (Lnet/minecraft/class_1297;FF)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping index d75e30baf7..088b015dde 100644 --- 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_6500 speed D + FIELD field_6502 pauseWhenMobIdle Z FIELD field_6503 mob Lnet/minecraft/class_1314; FIELD field_6505 ticksUntilAttack I FIELD field_6506 targetZ D @@ -8,6 +9,7 @@ CLASS net/minecraft/class_1366 net/minecraft/entity/ai/goal/MeleeAttackGoal METHOD (Lnet/minecraft/class_1314;DZ)V ARG 1 mob ARG 2 speed + ARG 4 pauseWhenMobIdle METHOD method_6288 attack (Lnet/minecraft/class_1309;D)V ARG 1 target ARG 2 squaredDistance diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index 04ff69e375..731612adff 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation FIELD field_20293 currentTarget Lnet/minecraft/class_2338; + FIELD field_21642 rangeMultiplier F FIELD field_6668 speed D FIELD field_6671 followRange Lnet/minecraft/class_1324; FIELD field_6673 pathNodeNavigator Lnet/minecraft/class_13; @@ -17,6 +18,9 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation METHOD method_21643 findPathToAny (Ljava/util/stream/Stream;I)Lnet/minecraft/class_11; ARG 1 positions ARG 2 distance + METHOD method_23964 setRangeMultiplier (F)V + ARG 1 rangeMultiplier + METHOD method_23965 resetRangeMultiplier ()V METHOD method_6333 isValidPosition (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_6334 startMovingAlong (Lnet/minecraft/class_11;D)Z diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping index 184f54bbe8..2af2a0398f 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping @@ -15,11 +15,13 @@ CLASS net/minecraft/class_13 net/minecraft/entity/ai/pathing/PathNodeNavigator ARG 3 positions ARG 4 followRange ARG 5 distance + ARG 6 rangeMultiplier METHOD method_54 findPathToAny (Lnet/minecraft/class_9;Ljava/util/Map;FIF)Lnet/minecraft/class_11; ARG 1 startNode ARG 2 positions ARG 3 followRange ARG 4 distance + ARG 5 rangeMultiplier METHOD method_55 createPath (Lnet/minecraft/class_9;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_11; ARG 1 endNode ARG 2 target diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index ed161aa8c6..6025650a02 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity METHOD method_21814 canBeeStart ()Z METHOD method_21815 canBeeContinue ()Z CLASS class_4468 StingGoal + METHOD (Lnet/minecraft/class_1314;DZ)V + ARG 1 mob + ARG 2 speed + ARG 4 pauseWhenIdle METHOD (Lnet/minecraft/class_4466;Lnet/minecraft/class_1314;DZ)V ARG 2 mob ARG 3 speed @@ -12,23 +16,50 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity METHOD method_21816 canSting ()Z CLASS class_4470 EnterHiveGoal CLASS class_4472 MoveToHiveGoal + 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 + METHOD method_24006 startMovingToFar (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_24007 isPossibleHive (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_24009 addPossibleHive (Lnet/minecraft/class_2338;)V + ARG 1 pos + METHOD method_24010 isCloseEnough (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_24011 clearPossibleHives ()V + METHOD method_24012 makeChosenHivePossibleHive ()V CLASS class_4473 MoveToFlowerGoal + FIELD field_21650 ticks I + METHOD method_24013 shouldMoveToFlower ()Z CLASS class_4474 GrowCropsGoal CLASS class_4475 BeeRevengeGoal METHOD (Lnet/minecraft/class_4466;Lnet/minecraft/class_4466;)V ARG 2 bee CLASS class_4476 FindHiveGoal + METHOD method_23742 getNearbyFreeHives ()Ljava/util/List; CLASS class_4477 BeeLookControl + METHOD (Lnet/minecraft/class_1308;)V + ARG 1 bee METHOD (Lnet/minecraft/class_4466;Lnet/minecraft/class_1308;)V ARG 2 entity CLASS class_4478 PollinateGoal FIELD field_20378 pollinationTicks I FIELD field_20379 lastPollinationTick I FIELD field_20617 flowerPredicate Ljava/util/function/Predicate; + FIELD field_21080 running Z + FIELD field_21511 nextTarget Lnet/minecraft/class_243; + FIELD field_21651 ticks I METHOD method_21820 completedPollination ()Z METHOD method_21821 getFlower ()Ljava/util/Optional; METHOD method_22326 findFlower (Ljava/util/function/Predicate;D)Ljava/util/Optional; + ARG 1 predicate ARG 2 searchDistance + METHOD method_23346 isRunning ()Z + METHOD method_23748 cancel ()V + METHOD method_23749 moveToNextTarget ()V + METHOD method_23750 getRandomOffset ()F CLASS class_4479 BeeWanderAroundGoal METHOD method_21822 getRandomLocation ()Lnet/minecraft/class_243; FIELD field_20353 multipleByteTracker Lnet/minecraft/class_2940; @@ -41,7 +72,16 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity FIELD field_20360 cannotEnterHiveTicks I FIELD field_20361 cropsGrownSincePollination I FIELD field_20362 flowerPos Lnet/minecraft/class_2338; - FIELD field_20363 hivePos Lnet/minecraft/class_2338; + FIELD field_20363 chosenHive Lnet/minecraft/class_2338; + FIELD field_21079 pollinateGoal Lnet/minecraft/class_4466$class_4478; + FIELD field_21509 ticksInsideWater I + FIELD field_21643 ticksLeftToFindHive I + FIELD field_21644 ticksUntilCanPollinate I + FIELD field_21645 moveToHiveGoal Lnet/minecraft/class_4466$class_4472; + FIELD field_21646 moveToFlowerGoal Lnet/minecraft/class_4466$class_4473; + METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V + ARG 1 type + ARG 2 world METHOD method_21763 setBeeAttacker (Lnet/minecraft/class_1297;)Z ARG 1 attacker METHOD method_21769 addParticle (Lnet/minecraft/class_1937;DDDDDLnet/minecraft/class_2394;)V @@ -87,3 +127,17 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity ARG 1 tickDelta METHOD method_21812 getBeeFlag (I)Z ARG 1 location + METHOD method_23884 getHivePos ()Lnet/minecraft/class_2338; + METHOD method_23979 isWithinDistance (Lnet/minecraft/class_2338;I)Z + ARG 1 pos + ARG 2 distance + METHOD method_23983 failedPollinatingTooLong ()Z + METHOD method_23984 isHiveNearFire ()Z + METHOD method_23987 startMovingTo (Lnet/minecraft/class_2338;)V + ARG 1 pos + METHOD method_23988 doesHiveHaveSpace (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_23990 isTooFar (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_23992 isFlowers (Lnet/minecraft/class_2338;)Z + ARG 1 pos diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 2f3dff8444..dcff899eb3 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -57,6 +57,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 pos ARG 2 oldBlock ARG 3 newBlock + METHOD method_23886 isNight ()Z METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V METHOD method_8419 isRaining ()Z METHOD method_8421 sendEntityStatus (Lnet/minecraft/class_1297;B)V @@ -206,7 +207,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8526 setBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2586;)V ARG 1 pos METHOD method_8527 getGeneratorType ()Lnet/minecraft/class_1942; - METHOD method_8530 isDaylight ()Z + METHOD method_8530 isDay ()Z METHOD method_8532 getTimeOfDay ()J METHOD method_8533 calculateAmbientDarkness ()V METHOD method_8534 isAreaNotEmpty (Lnet/minecraft/class_238;)Z