From fd6792a47692aab54e74469523f07fe53d12af2a Mon Sep 17 00:00:00 2001 From: YanisBft Date: Fri, 7 Oct 2022 11:36:35 +0200 Subject: [PATCH] Map some entity constants (#3306) * Map some entity constants * Update mappings/net/minecraft/entity/mob/ZoglinEntity.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- mappings/net/minecraft/entity/effect/StatusEffects.mapping | 1 + .../net/minecraft/entity/mob/ElderGuardianEntity.mapping | 3 +++ mappings/net/minecraft/entity/mob/HoglinEntity.mapping | 7 +++++++ mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping | 1 + mappings/net/minecraft/entity/mob/WardenBrain.mapping | 4 ++++ mappings/net/minecraft/entity/mob/WardenEntity.mapping | 6 ++++++ mappings/net/minecraft/entity/mob/ZoglinEntity.mapping | 1 + mappings/net/minecraft/entity/passive/AllayEntity.mapping | 1 + .../net/minecraft/entity/passive/VillagerEntity.mapping | 1 + 9 files changed, 25 insertions(+) diff --git a/mappings/net/minecraft/entity/effect/StatusEffects.mapping b/mappings/net/minecraft/entity/effect/StatusEffects.mapping index 775c4383a1..a2fc3db72f 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffects.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffects.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1294 net/minecraft/entity/effect/StatusEffects + FIELD field_38093 DARKNESS_PADDING_DURATION I METHOD method_5594 register (ILjava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; ARG 0 rawId ARG 1 id diff --git a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping index 623e5216e5..0ca9de5941 100644 --- a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_1550 net/minecraft/entity/mob/ElderGuardianEntity FIELD field_17492 SCALE F + FIELD field_38115 AFFECTED_PLAYER_RANGE I + FIELD field_38116 MINING_FATIGUE_DURATION I + FIELD field_38117 MINING_FATIGUE_AMPLIFIER I METHOD method_26909 createElderGuardianAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping index d591f043eb..74690dcd0e 100644 --- a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping @@ -5,6 +5,13 @@ CLASS net/minecraft/class_4760 net/minecraft/entity/mob/HoglinEntity FIELD field_23735 timeInOverworld I FIELD field_23736 cannotBeHunted Z FIELD field_23737 BABY Lnet/minecraft/class_2940; + FIELD field_30526 MAX_HEALTH I + FIELD field_30527 MOVEMENT_SPEED F + FIELD field_30528 ATTACK_KNOCKBACK I + FIELD field_30529 KNOCKBACK_RESISTANCE F + FIELD field_30530 ATTACK_DAMAGE I + FIELD field_30531 BABY_ATTACK_DAMAGE F + FIELD field_30532 CONVERSION_TIME I METHOD method_24349 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping index 0edc06af75..e390c6477f 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5420 net/minecraft/entity/mob/PiglinBruteBrain + FIELD field_30594 TARGET_RANGE D METHOD method_30244 getFollowTasks ()Lnet/minecraft/class_4118; METHOD method_30246 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 target diff --git a/mappings/net/minecraft/entity/mob/WardenBrain.mapping b/mappings/net/minecraft/entity/mob/WardenBrain.mapping index 53d4ed722f..6d1108b11b 100644 --- a/mappings/net/minecraft/entity/mob/WardenBrain.mapping +++ b/mappings/net/minecraft/entity/mob/WardenBrain.mapping @@ -2,6 +2,10 @@ CLASS net/minecraft/class_7261 net/minecraft/entity/mob/WardenBrain FIELD field_38171 EMERGE_DURATION I FIELD field_38172 ROAR_DURATION I FIELD field_38173 DIG_COOLDOWN I + FIELD field_38175 STROLL_SPEED F + FIELD field_38176 CELEBRATE_TIME F + FIELD field_38177 RANGED_APPROACH_SPEED F + FIELD field_38178 MELEE_ATTACK_INTERVAL I FIELD field_38179 DIG_DURATION I FIELD field_38180 SNIFF_DURATION I FIELD field_38182 RESET_DIG_COOLDOWN_TASK Lnet/minecraft/class_4097; diff --git a/mappings/net/minecraft/entity/mob/WardenEntity.mapping b/mappings/net/minecraft/entity/mob/WardenEntity.mapping index 37910a4a0b..355029bbd2 100644 --- a/mappings/net/minecraft/entity/mob/WardenEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WardenEntity.mapping @@ -2,7 +2,13 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity FIELD field_38135 emergingAnimationState Lnet/minecraft/class_7094; FIELD field_38136 diggingAnimationState Lnet/minecraft/class_7094; FIELD field_38137 attackingAnimationState Lnet/minecraft/class_7094; + FIELD field_38138 LOGGER Lorg/slf4j/Logger; FIELD field_38141 angerManager Lnet/minecraft/class_7254; + FIELD field_38143 MAX_HEALTH I + FIELD field_38144 MOVEMENT_SPEED F + FIELD field_38145 KNOCKBACK_RESISTANCE F + FIELD field_38146 ATTACK_KNOCKBACK F + FIELD field_38147 ATTACK_DAMAGE I FIELD field_38148 ANGER Lnet/minecraft/class_2940; FIELD field_38162 tendrilPitch I FIELD field_38163 lastTendrilPitch I diff --git a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping index 65cead769e..0064b077b1 100644 --- a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_5136 net/minecraft/entity/mob/ZoglinEntity FIELD field_23732 movementCooldownTicks I FIELD field_23733 USED_MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_23734 BABY Lnet/minecraft/class_2940; + FIELD field_30511 ATTACK_TARGET_DURATION I METHOD method_26928 addCoreTasks (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_26929 addIdleTasks (Lnet/minecraft/class_4095;)V diff --git a/mappings/net/minecraft/entity/passive/AllayEntity.mapping b/mappings/net/minecraft/entity/passive/AllayEntity.mapping index ead3c30be5..f7bd7bbfe7 100644 --- a/mappings/net/minecraft/entity/passive/AllayEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AllayEntity.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_7298 net/minecraft/entity/passive/AllayEntity FIELD field_38402 inventory Lnet/minecraft/class_1277; FIELD field_38403 MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_38937 THROW_SOUND_PITCHES Lcom/google/common/collect/ImmutableList; + FIELD field_39045 LOGGER Lorg/slf4j/Logger; FIELD field_39464 DUPLICATION_INGREDIENT Lnet/minecraft/class_1856; FIELD field_39465 DUPLICATION_COOLDOWN I FIELD field_39466 DANCING Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 8504632f21..013a38cebb 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity FIELD field_19427 restocksToday I FIELD field_20332 lastRestockCheckTime J FIELD field_25167 natural Z + FIELD field_36335 LOGGER Lorg/slf4j/Logger; FIELD field_7445 VILLAGER_DATA Lnet/minecraft/class_2940; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_3854;)V ARG 1 entityType