From 9937826d462a1301aacb0b0dff01c17579bb9378 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Sun, 28 Jun 2020 14:22:37 +0200 Subject: [PATCH] MobEntityWithAi -> PathAwareEntity (#1517) --- mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping | 2 ++ mappings/net/minecraft/entity/mob/EndermanEntity.mapping | 2 ++ .../mob/{MobEntityWithAi.mapping => PathAwareEntity.mapping} | 2 +- mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping | 2 ++ mappings/net/minecraft/entity/passive/BeeEntity.mapping | 1 + mappings/net/minecraft/entity/passive/PolarBearEntity.mapping | 2 ++ mappings/net/minecraft/entity/passive/WolfEntity.mapping | 2 +- 7 files changed, 11 insertions(+), 2 deletions(-) rename mappings/net/minecraft/entity/mob/{MobEntityWithAi.mapping => PathAwareEntity.mapping} (83%) diff --git a/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping b/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping index 03bc9828ab..2acf130f6c 100644 --- a/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1343 net/minecraft/entity/ai/goal/DoorInteractGoal FIELD field_6412 doorValid Z FIELD field_6413 mob Lnet/minecraft/class_1308; FIELD field_6414 doorPos Lnet/minecraft/class_2338; + METHOD (Lnet/minecraft/class_1308;)V + ARG 1 mob METHOD method_19995 setDoorOpen (Z)V ARG 1 open METHOD method_6256 isDoorOpen ()Z diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index 5d57bfe981..bc1ac95979 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -1,6 +1,8 @@ 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_25376 angerTime I + FIELD field_25377 targetUuid Ljava/util/UUID; FIELD field_7252 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7253 lastAngrySoundAge I FIELD field_7254 ageWhenTargetSet I diff --git a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping similarity index 83% rename from mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping rename to mappings/net/minecraft/entity/mob/PathAwareEntity.mapping index a361a05fc7..82f64c1b9f 100644 --- a/mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping +++ b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1314 net/minecraft/entity/mob/MobEntityWithAi +CLASS net/minecraft/class_1314 net/minecraft/entity/mob/PathAwareEntity METHOD method_6142 updateForLeashLength (F)V ARG 1 leashLength METHOD method_6144 getPathfindingFavor (Lnet/minecraft/class_2338;Lnet/minecraft/class_4538;)F diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index e040dde1fb..d17ff1bedc 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity + FIELD field_25380 angerTime I + FIELD field_25381 targetUuid Ljava/util/UUID; FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7308 angrySoundDelay I FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 0efe54ee4b..73dd5438db 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity 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; + FIELD field_25364 targetUuid Ljava/util/UUID; METHOD method_21769 addParticle (Lnet/minecraft/class_1937;DDDDDLnet/minecraft/class_2394;)V ARG 1 world ARG 2 lastX diff --git a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping index b0221c991f..3130402c68 100644 --- a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1456 net/minecraft/entity/passive/PolarBearEntity + FIELD field_25368 targetUuid Ljava/util/UUID; + FIELD field_25370 angerTime I FIELD field_6837 warningAnimationProgress F FIELD field_6838 lastWarningAnimationProgress F FIELD field_6839 warningSoundCooldown I diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 077aa68a51..6bc58c6c07 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity FIELD field_18004 FOLLOW_TAMED_PREDICATE Ljava/util/function/Predicate; FIELD field_25371 ANGER_TIME_RANGE Lnet/minecraft/class_4801; - FIELD field_25372 angryAt Ljava/util/UUID; + FIELD field_25372 targetUuid Ljava/util/UUID; FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940; FIELD field_6944 furWet Z FIELD field_6945 lastShakeProgress F