From 5d6034cbb0922586257cc616f6df094aba4bedbb Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 23 Nov 2021 02:28:47 +1100 Subject: [PATCH] Mapping Bonanza Part 3: Entity stuff (#2847) * Entity stuff * Apply suggestions from code review * Update ShulkerEntity.mapping --- mappings/net/minecraft/entity/Entity.mapping | 1 + mappings/net/minecraft/entity/EntityType.mapping | 7 +++++++ .../entity/attribute/AttributeContainer.mapping | 9 +++++++++ .../attribute/DefaultAttributeRegistry.mapping | 6 ++++++ .../minecraft/entity/data/DataTracker.mapping | 5 +++++ .../data/TrackedDataHandlerRegistry.mapping | 4 ++++ .../entity/effect/StatusEffectInstance.mapping | 4 ++++ .../net/minecraft/entity/mob/GhastEntity.mapping | 2 ++ .../net/minecraft/entity/mob/HoglinBrain.mapping | 2 ++ .../net/minecraft/entity/mob/MobEntity.mapping | 2 ++ .../net/minecraft/entity/mob/PiglinBrain.mapping | 9 +++++++++ .../entity/mob/PiglinBruteBrain.mapping | 16 +++++++++++----- .../minecraft/entity/mob/ShulkerEntity.mapping | 11 ++++++++--- .../minecraft/entity/mob/ZoglinEntity.mapping | 2 ++ .../minecraft/entity/passive/BeeEntity.mapping | 2 ++ .../minecraft/entity/passive/PandaEntity.mapping | 3 +++ .../entity/passive/RabbitEntity.mapping | 8 ++++++++ .../minecraft/entity/passive/SheepEntity.mapping | 2 ++ .../entity/passive/SnowGolemEntity.mapping | 2 ++ .../entity/passive/StriderEntity.mapping | 3 +++ .../minecraft/entity/player/PlayerEntity.mapping | 8 ++++++++ .../projectile/FireworkRocketEntity.mapping | 2 ++ .../entity/projectile/ProjectileUtil.mapping | 15 +++++++++++++++ .../minecraft/entity/raid/RaiderEntity.mapping | 2 ++ 24 files changed, 119 insertions(+), 8 deletions(-) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 22173a06c7..1b2cc5de98 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -309,6 +309,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 destWorld ARG 2 destPos ARG 3 destIsNether + ARG 4 worldBorder METHOD method_30331 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5459$class_5460;)Lnet/minecraft/class_5454; ARG 2 rect METHOD method_30632 collidesWithStateAtPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 0464ff06af..361cb03207 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -34,12 +34,16 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 nbt METHOD method_17685 getWidth ()F METHOD method_17686 getHeight ()F + METHOD method_17839 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_17842 loadEntityWithPassengers (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;Ljava/util/function/Function;)Lnet/minecraft/class_1297; ARG 0 nbt ARG 1 world ARG 2 entityProcessor METHOD method_17843 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;Ljava/util/function/Function;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; ARG 3 entity + METHOD method_17846 (Lnet/minecraft/class_1937;Lnet/minecraft/class_1299;)Lnet/minecraft/class_1297; + ARG 1 entityType METHOD method_17848 loadEntityFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;)Ljava/util/Optional; ARG 0 nbt ARG 1 world @@ -125,6 +129,9 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 6 spawnReason ARG 7 alignPosition ARG 8 invertY + CLASS 1 + METHOD method_31491 (Ljava/util/function/Consumer;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; + ARG 1 entity CLASS class_1300 Builder FIELD field_18071 dimensions Lnet/minecraft/class_4048; FIELD field_18982 fireImmune Z diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index fb8a70af95..7db0c117bb 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -8,17 +8,26 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer METHOD method_26841 getTracked ()Ljava/util/Set; METHOD method_26842 getCustomInstance (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; ARG 1 attribute + METHOD method_26843 (Lnet/minecraft/class_1320;Lnet/minecraft/class_1322;)V + ARG 1 attribute + ARG 2 attributeModifier + METHOD method_26844 (Lnet/minecraft/class_1320;Ljava/util/Collection;)V + ARG 1 attribute METHOD method_26845 updateTrackedStatus (Lnet/minecraft/class_1324;)V ARG 1 instance METHOD method_26846 setFrom (Lnet/minecraft/class_5131;)V ARG 1 other METHOD method_26847 removeModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers + METHOD method_26849 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1320;)V + ARG 2 attribute METHOD method_26850 readNbt (Lnet/minecraft/class_2499;)V ARG 1 nbt METHOD method_26851 getAttributesToSend ()Ljava/util/Collection; METHOD method_26852 getValue (Lnet/minecraft/class_1320;)D ARG 1 attribute + METHOD method_26853 (Lnet/minecraft/class_1324;)V + ARG 1 attributeInstance METHOD method_26854 addTemporaryModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers METHOD method_26855 toNbt ()Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/entity/attribute/DefaultAttributeRegistry.mapping b/mappings/net/minecraft/entity/attribute/DefaultAttributeRegistry.mapping index 75668940a6..6c704b3945 100644 --- a/mappings/net/minecraft/entity/attribute/DefaultAttributeRegistry.mapping +++ b/mappings/net/minecraft/entity/attribute/DefaultAttributeRegistry.mapping @@ -4,5 +4,11 @@ CLASS net/minecraft/class_5135 net/minecraft/entity/attribute/DefaultAttributeRe METHOD method_26872 checkMissing ()V METHOD method_26873 get (Lnet/minecraft/class_1299;)Lnet/minecraft/class_5132; ARG 0 type + METHOD method_26874 (Lnet/minecraft/class_2960;)V + ARG 0 id METHOD method_26875 hasDefinitionFor (Lnet/minecraft/class_1299;)Z ARG 0 type + METHOD method_26876 (Lnet/minecraft/class_1299;)Z + ARG 0 entityType + METHOD method_26877 (Lnet/minecraft/class_1299;)Z + ARG 0 entityType diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index f595a8e283..1cd3d753fa 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker ARG 1 key ARG 2 value METHOD method_12779 writeUpdatedEntries (Ljava/util/List;)V + ARG 1 entries METHOD method_12781 getDirtyEntries ()Ljava/util/List; METHOD method_12782 writeEntryToPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2945$class_2946;)V ARG 0 buf @@ -24,8 +25,12 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker ARG 1 key ARG 2 initialValue METHOD method_12785 copyToFrom (Lnet/minecraft/class_2945$class_2946;Lnet/minecraft/class_2945$class_2946;)V + ARG 1 to + ARG 2 from METHOD method_12786 isDirty ()Z METHOD method_12787 entriesToPacket (Ljava/util/List;Lnet/minecraft/class_2540;)V + ARG 0 entries + ARG 1 buf METHOD method_12788 deserializePacket (Lnet/minecraft/class_2540;)Ljava/util/List; ARG 0 buf METHOD method_12789 get (Lnet/minecraft/class_2940;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 8b457b6e95..c96dc02e2f 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -25,3 +25,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis ARG 0 handler METHOD method_12721 get (I)Lnet/minecraft/class_2941; ARG 0 id + CLASS 2 + METHOD method_12744 read (Lnet/minecraft/class_2540;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; + ARG 1 buf + ARG 2 type diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index cdbda6d0be..1a5065f87e 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5895 duration I FIELD field_5896 type Lnet/minecraft/class_1291; FIELD field_5897 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnet/minecraft/class_1291;)V + ARG 1 type METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type ARG 2 duration @@ -41,6 +43,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 5 showParticles ARG 6 showIcon ARG 7 hiddenEffect + METHOD (Lnet/minecraft/class_1293;)V + ARG 1 toCopy METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/entity/mob/GhastEntity.mapping b/mappings/net/minecraft/entity/mob/GhastEntity.mapping index 7f97c9e7e6..1a34e36ede 100644 --- a/mappings/net/minecraft/entity/mob/GhastEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GhastEntity.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_1571 net/minecraft/entity/mob/GhastEntity FIELD field_7272 fireballStrength I FIELD field_7273 SHOOTING Lnet/minecraft/class_2940; + METHOD method_18450 (Lnet/minecraft/class_1309;)Z + ARG 1 entity METHOD method_20675 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 diff --git a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping index a5ce2cdec5..35b36aa624 100644 --- a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping @@ -65,5 +65,7 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain ARG 1 activity METHOD method_30083 getSoundEvent (Lnet/minecraft/class_4760;)Ljava/util/Optional; ARG 0 hoglin + METHOD method_30084 (Lnet/minecraft/class_4760;Lnet/minecraft/class_4168;)Lnet/minecraft/class_3414; + ARG 1 activity METHOD method_30085 hasNearestRepellent (Lnet/minecraft/class_4760;)Z ARG 0 hoglin diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 74a95f5ab7..efe3c256f0 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -93,6 +93,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 1 player ARG 2 mobStack ARG 3 playerStack + METHOD method_24522 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1308;)V + ARG 2 entity 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 diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index afa6678455..51225f96c1 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24727 dropBarteredItem (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;Ljava/util/List;)V ARG 0 piglin ARG 1 player + ARG 2 items METHOD method_24728 playerInteract (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 0 piglin ARG 1 player @@ -39,6 +40,8 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 1 stack METHOD method_24731 drop (Lnet/minecraft/class_4836;Ljava/util/List;Lnet/minecraft/class_243;)V ARG 0 piglin + ARG 1 items + ARG 2 pos METHOD method_24732 create (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 piglin ARG 1 brain @@ -117,11 +120,13 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 1 target METHOD method_24772 doBarter (Lnet/minecraft/class_4836;Ljava/util/List;)V ARG 0 piglin + ARG 1 items METHOD method_24773 runAwayFrom (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 target METHOD method_24774 dropBarteredItem (Lnet/minecraft/class_4836;Ljava/util/List;)V ARG 0 piglin + ARG 1 items METHOD method_24776 getBarteredItem (Lnet/minecraft/class_4836;)Ljava/util/List; ARG 0 piglin METHOD method_24777 getPreferredTarget (Lnet/minecraft/class_4836;)Ljava/util/Optional; @@ -187,9 +192,13 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_30087 getSound (Lnet/minecraft/class_4836;Lnet/minecraft/class_4168;)Lnet/minecraft/class_3414; ARG 0 piglin ARG 1 activity + METHOD method_30088 (Lnet/minecraft/class_4836;Lnet/minecraft/class_4168;)Lnet/minecraft/class_3414; + ARG 1 activity METHOD method_30089 swapItemWithOffHand (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V ARG 0 piglin ARG 1 stack METHOD method_30090 goToNemesisTask ()Lnet/minecraft/class_4809; METHOD method_30091 getCurrentActivitySound (Lnet/minecraft/class_4836;)Ljava/util/Optional; ARG 0 piglin + METHOD method_35197 hasNearestPlayerHoldingWantedItem (Lnet/minecraft/class_4836;)Z + ARG 0 piglin diff --git a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping index b77e216f6f..624daf9bf8 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_5420 net/minecraft/entity/mob/PiglinBruteBrain - METHOD method_30247 (Lnet/minecraft/class_5418;)Ljava/util/Optional; + METHOD method_30247 getTarget (Lnet/minecraft/class_5418;)Ljava/util/Optional; ARG 0 piglin - METHOD method_30248 (Lnet/minecraft/class_5418;Lnet/minecraft/class_1309;)Z + METHOD method_30248 isTarget (Lnet/minecraft/class_5418;Lnet/minecraft/class_1309;)Z ARG 0 piglin + ARG 1 entity METHOD method_30249 (Lnet/minecraft/class_5418;Lnet/minecraft/class_4140;)Ljava/util/Optional; ARG 0 piglin METHOD method_30250 setCurrentPosAsHome (Lnet/minecraft/class_5419;)V @@ -13,18 +14,23 @@ CLASS net/minecraft/class_5420 net/minecraft/entity/mob/PiglinBruteBrain METHOD method_30252 create (Lnet/minecraft/class_5419;Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 piglinBrute ARG 1 brain - METHOD method_30256 (Lnet/minecraft/class_5419;)V + METHOD method_30253 (Lnet/minecraft/class_5419;Lnet/minecraft/class_4168;)V + ARG 1 activity + METHOD method_30256 tick (Lnet/minecraft/class_5419;)V ARG 0 piglinBrute METHOD method_30257 addCoreActivities (Lnet/minecraft/class_5419;Lnet/minecraft/class_4095;)V ARG 0 piglinBrute ARG 1 brain - METHOD method_30258 (Lnet/minecraft/class_5419;)V + METHOD method_30258 playSoundRandomly (Lnet/minecraft/class_5419;)V ARG 0 piglinBrute METHOD method_30260 addIdleActivities (Lnet/minecraft/class_5419;Lnet/minecraft/class_4095;)V ARG 0 piglinBrute ARG 1 brain - METHOD method_30261 (Lnet/minecraft/class_5419;)V + METHOD method_30261 playSoundIfAngry (Lnet/minecraft/class_5419;)V ARG 0 piglinBrute METHOD method_30262 addFightActivities (Lnet/minecraft/class_5419;Lnet/minecraft/class_4095;)V ARG 0 piglinBrute ARG 1 brain + METHOD method_35198 setTarget (Lnet/minecraft/class_5419;Lnet/minecraft/class_1309;)V + ARG 0 piglinBrute + ARG 1 target diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index 4701f36b67..a45cf13a36 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -18,14 +18,19 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity METHOD method_31546 setColor (Lnet/minecraft/class_1767;)V ARG 1 color METHOD method_31547 spawnNewShulker ()V - METHOD method_33346 (Lnet/minecraft/class_2350;F)Lnet/minecraft/class_238; + METHOD method_33342 getExtraLength (F)F + ARG 0 openProgress + METHOD method_33346 calculateBoundingBox (Lnet/minecraft/class_2350;F)Lnet/minecraft/class_238; ARG 0 direction - METHOD method_33347 (Lnet/minecraft/class_2350;FF)Lnet/minecraft/class_238; + ARG 1 extraLength + METHOD method_33347 calculateBoundingBox (Lnet/minecraft/class_2350;FF)Lnet/minecraft/class_238; ARG 0 direction + ARG 1 prevExtraLength + ARG 2 extraLength METHOD method_33348 tryAttachOrTeleport ()V METHOD method_33349 tickOpenProgress ()Z METHOD method_33350 moveEntities ()V - METHOD method_33351 (Lnet/minecraft/class_2338;)Z + METHOD method_33351 isInvalidPosition (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_35192 setAttachedFace (Lnet/minecraft/class_2350;)V ARG 1 face diff --git a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping index c7e8088e24..65cead769e 100644 --- a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping @@ -9,9 +9,11 @@ CLASS net/minecraft/class_5136 net/minecraft/entity/mob/ZoglinEntity ARG 0 brain METHOD method_26930 addFightTasks (Lnet/minecraft/class_4095;)V ARG 0 brain + METHOD method_26931 tickBrain ()V METHOD method_26933 playAngrySound ()V METHOD method_26934 getHoglinTarget ()Ljava/util/Optional; METHOD method_26936 shouldAttack (Lnet/minecraft/class_1309;)Z + ARG 1 entity METHOD method_26937 createZoglinAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_26938 setAttackTarget (Lnet/minecraft/class_1309;)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 00b9fa0738..9a424d949d 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -135,6 +135,8 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity ARG 2 bee CLASS class_4476 FindHiveGoal METHOD method_23742 getNearbyFreeHives ()Ljava/util/List; + METHOD method_23743 (Lnet/minecraft/class_4158;)Z + ARG 0 poiType CLASS class_4477 BeeLookControl METHOD (Lnet/minecraft/class_4466;Lnet/minecraft/class_1308;)V ARG 2 entity diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index a3f88e39c1..dd03459cfc 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -103,6 +103,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;D)V + ARG 1 panda + ARG 2 chance METHOD method_6561 isBambooClose ()Z CLASS class_1443 Gene FIELD field_6785 id I diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 9a86684c21..0b214c518c 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity METHOD method_6607 wantsCarrots ()Z METHOD method_6608 doScheduleJump ()V METHOD method_6610 getRabbitType ()I + METHOD method_6611 enableJump ()V METHOD method_6614 isTempting (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_6615 getJumpSound ()Lnet/minecraft/class_3414; @@ -37,6 +38,7 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 1 rabbitType METHOD method_6618 startJump ()V METHOD method_6619 scheduleJump ()V + METHOD method_6621 disableJump ()V METHOD method_6622 chooseType (Lnet/minecraft/class_1936;)I ARG 1 world CLASS class_1464 RabbitAttackGoal @@ -72,4 +74,10 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 1 rabbit CLASS class_5197 RabbitJumpControl FIELD field_24090 rabbit Lnet/minecraft/class_1463; + FIELD field_24091 canJump Z + METHOD (Lnet/minecraft/class_1463;)V + ARG 1 rabbit + METHOD method_27311 setCanJump (Z)V + ARG 1 canJump METHOD method_27312 isActive ()Z + METHOD method_27313 canJump ()Z diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 64ebefab06..bc97b01ee7 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity FIELD field_6868 DROPS Ljava/util/Map; FIELD field_6869 eatGrassGoal Lnet/minecraft/class_1345; FIELD field_6870 COLOR Lnet/minecraft/class_2940; + METHOD method_17689 (Lnet/minecraft/class_1715;Lnet/minecraft/class_3955;)Lnet/minecraft/class_1799; + ARG 1 recipe METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1715; ARG 0 firstColor ARG 1 secondColor diff --git a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping index 610bdd8d91..e7decda1b0 100644 --- a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping @@ -2,6 +2,8 @@ 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_18443 (Lnet/minecraft/class_1309;)Z + ARG 0 entity METHOD method_20255 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_26894 createSnowGolemAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping index 5dbd9a1389..6a64362e25 100644 --- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -35,3 +35,6 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity ARG 2 world CLASS class_5494 GoBackToLavaGoal FIELD field_26632 strider Lnet/minecraft/class_4985; + METHOD (Lnet/minecraft/class_4985;D)V + ARG 1 strider + ARG 2 speed diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 30b15614fc..238d57dca5 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -60,6 +60,12 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 2 category ARG 3 volume ARG 4 pitch + METHOD method_17852 (Lnet/minecraft/class_1299;)Z + ARG 0 entityType + METHOD method_17853 (Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD method_20266 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 player METHOD method_21701 isBlockBreakingRestricted (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1934;)Z ARG 1 world ARG 2 pos @@ -223,6 +229,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7318 updatePose ()V METHOD method_7320 setScore (I)V ARG 1 score + METHOD method_7321 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 2 style METHOD method_7322 addExhaustion (F)V ARG 1 exhaustion METHOD method_7323 openCommandBlockScreen (Lnet/minecraft/class_2593;)V diff --git a/mappings/net/minecraft/entity/projectile/FireworkRocketEntity.mapping b/mappings/net/minecraft/entity/projectile/FireworkRocketEntity.mapping index 2155395499..34313edb9d 100644 --- a/mappings/net/minecraft/entity/projectile/FireworkRocketEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FireworkRocketEntity.mapping @@ -38,6 +38,8 @@ CLASS net/minecraft/class_1671 net/minecraft/entity/projectile/FireworkRocketEnt ARG 2 stack ARG 3 shooter METHOD method_16830 explodeAndRemove ()V + METHOD method_18072 (I)V + ARG 1 id METHOD method_20308 hasExplosionEffects ()Z METHOD method_7475 explode ()V METHOD method_7476 wasShotByEntity ()Z diff --git a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping b/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping index 9c33222cf7..1717181c1c 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping @@ -3,9 +3,17 @@ CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil ARG 0 entity METHOD method_18075 raycast (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;D)Lnet/minecraft/class_3966; ARG 0 entity + ARG 1 min + ARG 2 max + ARG 3 box + ARG 4 predicate METHOD method_18077 getEntityCollision (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Lnet/minecraft/class_3966; ARG 0 world ARG 1 entity + ARG 2 min + ARG 3 max + ARG 4 box + ARG 5 predicate METHOD method_18812 getHandPossiblyHolding (Lnet/minecraft/class_1309;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1268; ARG 0 entity ARG 1 item @@ -13,3 +21,10 @@ CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil ARG 0 entity ARG 1 stack ARG 2 damageModifier + METHOD method_37226 getEntityCollision (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;F)Lnet/minecraft/class_3966; + ARG 0 world + ARG 1 entity + ARG 2 min + ARG 3 max + ARG 4 box + ARG 5 predicate diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping index b829890a07..cc9966664a 100644 --- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping +++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping @@ -53,6 +53,8 @@ CLASS net/minecraft/class_3763 net/minecraft/entity/raid/RaiderEntity ARG 1 raider ARG 2 speed ARG 4 distance + METHOD method_20037 (Lnet/minecraft/class_4158;)Z + ARG 0 poiType METHOD method_20038 canLootHome (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_20039 isRaiding ()Z