From b274a2e932f426ee08353f4cf4f585facffc464a Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Fri, 22 May 2020 06:40:53 -0500 Subject: [PATCH] 20w21a brain (#1387) * 20w21a brain Signed-off-by: liach * Update mappings/net/minecraft/entity/ai/brain/Brain.mapping Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> * Update mappings/net/minecraft/entity/ai/brain/Brain.mapping Co-authored-by: Yanis48 Co-authored-by: liach Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> Co-authored-by: Yanis48 --- .../net/minecraft/entity/LivingEntity.mapping | 1 + .../minecraft/entity/ai/brain/Brain.mapping | 69 +++++++++++++++++++ .../minecraft/entity/ai/brain/Memory.mapping | 1 + .../entity/ai/brain/sensor/Sensor.mapping | 2 +- .../minecraft/entity/mob/ZoglinEntity.mapping | 2 + 5 files changed, 74 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index dccce300a1..9f36e83323 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -177,6 +177,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 attribute METHOD method_26827 createLivingAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_27071 shouldDropLoot ()Z + METHOD method_28306 createBrainProfile ()Lnet/minecraft/class_4095$class_5303; METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/entity/ai/brain/Brain.mapping b/mappings/net/minecraft/entity/ai/brain/Brain.mapping index 376f89b74b..61f9bbc47b 100644 --- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping @@ -11,10 +11,18 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain FIELD field_22282 forgettingActivityMemories Ljava/util/Map; COMMENT The map from activities to the memories to forget after the activity is COMMENT completed. + FIELD field_24656 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_24657 codecSupplier Ljava/util/function/Supplier; + METHOD (Ljava/util/Collection;Ljava/util/Collection;Lcom/google/common/collect/ImmutableList;Ljava/util/function/Supplier;)V + ARG 1 memories + ARG 2 sensors + ARG 3 memoryEntries + ARG 4 codecSupplier METHOD method_18871 refreshActivities (JJ)V ARG 1 timeOfDay ARG 3 time METHOD method_18874 canDoActivity (Lnet/minecraft/class_4168;)Z + ARG 1 activity METHOD method_18875 forget (Lnet/minecraft/class_4140;)V ARG 1 type METHOD method_18876 isMemoryInState (Lnet/minecraft/class_4140;Lnet/minecraft/class_4141;)Z @@ -27,43 +35,63 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain ARG 1 type ARG 2 value METHOD method_18880 resetPossibleActivities (Lnet/minecraft/class_4168;)V + ARG 1 except METHOD method_18881 setTaskList (Lnet/minecraft/class_4168;Lcom/google/common/collect/ImmutableList;)V ARG 1 activity ARG 2 indexedTasks METHOD method_18882 setTaskList (Lnet/minecraft/class_4168;ILcom/google/common/collect/ImmutableList;)V + ARG 1 activity + ARG 2 begin + ARG 3 list METHOD method_18884 setSchedule (Lnet/minecraft/class_4170;)V ARG 1 schedule METHOD method_18890 setCoreActivities (Ljava/util/Set;)V ARG 1 coreActivities METHOD method_18891 startTasks (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V + ARG 1 world + ARG 2 entity METHOD method_18894 getSchedule ()Lnet/minecraft/class_4170; METHOD method_18896 hasMemoryModule (Lnet/minecraft/class_4140;)Z ARG 1 type METHOD method_18897 setDefaultActivity (Lnet/minecraft/class_4168;)V + ARG 1 activity METHOD method_18900 stopAllTasks (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V + ARG 1 world + ARG 2 entity METHOD method_18904 getOptionalMemory (Lnet/minecraft/class_4140;)Ljava/util/Optional; ARG 1 type METHOD method_18906 hasActivity (Lnet/minecraft/class_4168;)Z + ARG 1 activity METHOD method_18911 copy ()Lnet/minecraft/class_4095; METHOD method_19542 tick (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V + ARG 1 world ARG 2 entity METHOD method_19545 updateTasks (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V + ARG 1 world + ARG 2 entity METHOD method_19948 isEmptyCollection (Ljava/lang/Object;)Z ARG 1 value METHOD method_24524 indexTaskList (ILcom/google/common/collect/ImmutableList;)Lcom/google/common/collect/ImmutableList; ARG 1 begin COMMENT The beginning of the index of tasks, exclusive + ARG 2 tasks METHOD method_24525 remember (Lnet/minecraft/class_4140;Ljava/lang/Object;J)V ARG 1 type ARG 2 value ARG 3 startTime + METHOD method_24526 doExclusively (Lnet/minecraft/class_4168;)V + ARG 1 activity METHOD method_24527 setTaskList (Lnet/minecraft/class_4168;ILcom/google/common/collect/ImmutableList;Lnet/minecraft/class_4140;)V + ARG 1 activity + ARG 2 begin ARG 3 tasks + ARG 4 memoryType METHOD method_24529 setTaskList (Lnet/minecraft/class_4168;Lcom/google/common/collect/ImmutableList;Ljava/util/Set;)V ARG 1 activity ARG 2 indexedTasks ARG 3 requiredMemories METHOD method_24530 setTaskList (Lnet/minecraft/class_4168;Lcom/google/common/collect/ImmutableList;Ljava/util/Set;Ljava/util/Set;)V + ARG 1 activity ARG 2 indexedTasks ARG 3 requiredMemories ARG 4 forgettingMemories @@ -72,4 +100,45 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain ARG 1 type ARG 2 memory METHOD method_24536 resetPossibleActivities ()V + METHOD method_24537 forgetIrrelevantMemories (Lnet/minecraft/class_4168;)V + ARG 1 except METHOD method_24538 getFirstPossibleNonCoreActivity ()Ljava/util/Optional; + METHOD method_27073 tickSensors (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V + ARG 1 world + ARG 2 entity + METHOD method_27074 getRunningTasks ()Ljava/util/List; + METHOD method_27075 tickMemories ()V + METHOD method_28310 encode (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + METHOD method_28311 createProfile (Ljava/util/Collection;Ljava/util/Collection;)Lnet/minecraft/class_4095$class_5303; + ARG 0 memoryModules + ARG 1 sensors + METHOD method_28313 createBrainCodec (Ljava/util/Collection;Ljava/util/Collection;)Lcom/mojang/serialization/Codec; + ARG 0 memoryModules + ARG 1 sensors + METHOD method_28315 streamMemories ()Ljava/util/stream/Stream; + CLASS class_5302 MemoryEntry + FIELD field_24661 type Lnet/minecraft/class_4140; + FIELD field_24662 data Ljava/util/Optional; + METHOD (Lnet/minecraft/class_4140;Ljava/util/Optional;)V + ARG 1 type + ARG 2 data + METHOD method_28328 apply (Lnet/minecraft/class_4095;)V + ARG 1 brain + METHOD method_28330 serialize (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)V + ARG 1 ops + ARG 2 builder + METHOD method_28333 of (Lnet/minecraft/class_4140;Ljava/util/Optional;)Lnet/minecraft/class_4095$class_5302; + ARG 0 type + ARG 1 data + CLASS class_5303 Profile + COMMENT A simple profile of a brain. Indicates what types of memory modules and + COMMENT sensors a brain can have. + FIELD field_24663 memoryModules Ljava/util/Collection; + FIELD field_24664 sensors Ljava/util/Collection; + FIELD field_24665 codec Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/Collection;Ljava/util/Collection;)V + ARG 1 memoryModules + ARG 2 sensors + METHOD method_28335 deserialize (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_4095; + ARG 1 data diff --git a/mappings/net/minecraft/entity/ai/brain/Memory.mapping b/mappings/net/minecraft/entity/ai/brain/Memory.mapping index 6316c68947..b84554375a 100644 --- a/mappings/net/minecraft/entity/ai/brain/Memory.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Memory.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_4831 net/minecraft/entity/ai/brain/Memory ARG 0 value ARG 1 expiry METHOD method_24637 getValue ()Ljava/lang/Object; + METHOD method_24913 tick ()V diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping index 0f8fb68208..41986f3b9c 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_4148 net/minecraft/entity/ai/brain/sensor/Sensor METHOD (I)V ARG 1 senseInterval METHOD method_19099 getOutputMemoryModules ()Ljava/util/Set; - METHOD method_19100 canSense (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V + METHOD method_19100 tick (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V ARG 2 entity METHOD method_19101 sense (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping index 04f581de2d..b7a1444ee9 100644 --- a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_5136 net/minecraft/entity/mob/ZoglinEntity + FIELD field_23731 USED_SENSORS Lcom/google/common/collect/ImmutableList; FIELD field_23732 movementCooldownTicks I + FIELD field_23733 USED_MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_23734 BABY Lnet/minecraft/class_2940; METHOD method_26933 playAngrySound ()V METHOD method_26937 createZoglinAttributes ()Lnet/minecraft/class_5132$class_5133;