From 56d442309ef4dba48cfd57fb8c695a724ec6a984 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 1 Apr 2021 15:21:58 +0300 Subject: [PATCH] Goat mappings (#2220) * Goat mappings * Fix Goat renderer and model packages --- .../render/entity/GoatEntityRenderer.mapping | 2 ++ .../render/entity/model/GoatEntityModel.mapping | 4 ++++ .../net/minecraft/entity/LivingEntity.mapping | 1 + ...nsSensor.mapping => TemptationsSensor.mapping} | 4 +++- .../brain/task/WalkTowardClosestAdultTask.mapping | 2 ++ .../minecraft/entity/passive/GoatBrain.mapping | 15 +++++++++++++++ .../minecraft/entity/passive/GoatEntity.mapping | 8 ++++++++ 7 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/client/render/entity/GoatEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/GoatEntityModel.mapping rename mappings/net/minecraft/entity/ai/brain/sensor/{AxolotlTemptationsSensor.mapping => TemptationsSensor.mapping} (80%) create mode 100644 mappings/net/minecraft/entity/passive/GoatBrain.mapping create mode 100644 mappings/net/minecraft/entity/passive/GoatEntity.mapping diff --git a/mappings/net/minecraft/client/render/entity/GoatEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/GoatEntityRenderer.mapping new file mode 100644 index 0000000000..e3c7d43552 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/GoatEntityRenderer.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_6256 net/minecraft/client/render/entity/GoatEntityRenderer + FIELD field_32923 TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/model/GoatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/GoatEntityModel.mapping new file mode 100644 index 0000000000..2c50f4027a --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/GoatEntityModel.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_6227 net/minecraft/client/render/entity/model/GoatEntityModel + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root + METHOD method_35742 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 2e569a6131..893003f082 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -134,6 +134,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 world ARG 2 stack METHOD method_18867 deserializeBrain (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_4095; + ARG 1 dynamic METHOD method_18868 getBrain ()Lnet/minecraft/class_4095; METHOD method_18869 getEatSound (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3414; ARG 1 stack diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/AxolotlTemptationsSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/TemptationsSensor.mapping similarity index 80% rename from mappings/net/minecraft/entity/ai/brain/sensor/AxolotlTemptationsSensor.mapping rename to mappings/net/minecraft/entity/ai/brain/sensor/TemptationsSensor.mapping index f8aca361f6..85d2705967 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/AxolotlTemptationsSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/TemptationsSensor.mapping @@ -1,8 +1,10 @@ -CLASS net/minecraft/class_5760 net/minecraft/entity/ai/brain/sensor/AxolotlTemptationsSensor +CLASS net/minecraft/class_5760 net/minecraft/entity/ai/brain/sensor/TemptationsSensor FIELD field_28330 TEMPTER_PREDICATE Lnet/minecraft/class_4051; FIELD field_28331 ingredient Lnet/minecraft/class_1856; METHOD (Lnet/minecraft/class_1856;)V ARG 1 ingredient + METHOD method_33214 (Lnet/minecraft/class_1314;Lnet/minecraft/class_3222;)Z + ARG 1 player METHOD method_33215 test (Lnet/minecraft/class_1657;)Z ARG 1 player METHOD method_33216 test (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping index 1a1bdc61ba..ef95ebd6c3 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/class_5355 net/minecraft/entity/ai/brain/task/WalkTowardClos ARG 2 speed METHOD method_29520 getNearestVisibleAdult (Lnet/minecraft/class_1296;)Lnet/minecraft/class_1296; ARG 1 entity + METHOD method_33192 (FLnet/minecraft/class_1309;)Ljava/lang/Float; + ARG 1 entity diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping new file mode 100644 index 0000000000..e72582afa9 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain + FIELD field_30411 LONG_JUMP_COOLDOWN_RANGE Lnet/minecraft/class_6019; + METHOD method_35181 getTemptItems ()Lnet/minecraft/class_1856; + METHOD method_35183 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; + ARG 0 brain + METHOD method_35184 resetLongJumpCooldown (Lnet/minecraft/class_6053;)V + ARG 0 goat + METHOD method_35185 addCoreActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_35186 updateActivities (Lnet/minecraft/class_6053;)V + ARG 0 goat + METHOD method_35187 addIdleActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_35188 addLongJumpActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain diff --git a/mappings/net/minecraft/entity/passive/GoatEntity.mapping b/mappings/net/minecraft/entity/passive/GoatEntity.mapping new file mode 100644 index 0000000000..5aeeef4fa3 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/GoatEntity.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity + FIELD field_30399 LONG_JUMPING_DIMENSIONS Lnet/minecraft/class_4048; + FIELD field_30400 SENSORS Lcom/google/common/collect/ImmutableList; + FIELD field_30401 MEMORY_MODULES Lcom/google/common/collect/ImmutableList; + FIELD field_30404 screaming Z + METHOD method_35178 isScreaming ()Z + METHOD method_35179 createGoatAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_35180 getMilkingSound ()Lnet/minecraft/class_3414;