2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-11-27 09:11:43 +01:00
|
|
|
From: MiniDigger <admin@benndorf.dev>
|
2021-06-11 14:02:28 +02:00
|
|
|
Date: Fri, 3 Jan 2020 16:24:46 +0100
|
|
|
|
Subject: [PATCH] Add Mob Goal API
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java b/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java
|
|
|
|
new file mode 100644
|
2024-09-30 01:48:34 +02:00
|
|
|
index 0000000000000000000000000000000000000000..88f64a84c6b81246a4936e37c9f0410eefc847fd
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/Goal.java
|
2024-09-30 01:48:34 +02:00
|
|
|
@@ -0,0 +1,63 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
|
|
+
|
|
|
|
+import java.util.EnumSet;
|
|
|
|
+import org.bukkit.entity.Mob;
|
2024-09-30 01:48:34 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Represents an AI goal of an entity
|
|
|
|
+ */
|
2024-09-30 01:48:34 +02:00
|
|
|
+@NullMarked
|
2021-06-11 14:02:28 +02:00
|
|
|
+public interface Goal<T extends Mob> {
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Checks if this goal should be activated
|
|
|
|
+ *
|
|
|
|
+ * @return if this goal should be activated
|
|
|
|
+ */
|
|
|
|
+ boolean shouldActivate();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Checks if this goal should stay active, defaults to {@link Goal#shouldActivate()}
|
|
|
|
+ *
|
|
|
|
+ * @return if this goal should stay active
|
|
|
|
+ */
|
|
|
|
+ default boolean shouldStayActive() {
|
2024-09-30 01:48:34 +02:00
|
|
|
+ return this.shouldActivate();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Called when this goal gets activated
|
|
|
|
+ */
|
|
|
|
+ default void start() {
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Called when this goal gets stopped
|
|
|
|
+ */
|
|
|
|
+ default void stop() {
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Called each tick the goal is activated
|
|
|
|
+ */
|
|
|
|
+ default void tick() {
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * A unique key that identifies this type of goal. Plugins should use their own namespace, not the minecraft
|
|
|
|
+ * namespace. Additionally, this key also specifies to what mobs this goal can be applied to
|
|
|
|
+ *
|
|
|
|
+ * @return the goal key
|
|
|
|
+ */
|
|
|
|
+ GoalKey<T> getKey();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns a list of all applicable flags for this goal.<br>
|
2024-09-30 01:48:34 +02:00
|
|
|
+ * <p>
|
2021-06-11 14:02:28 +02:00
|
|
|
+ * This method is only called on construction.
|
|
|
|
+ *
|
|
|
|
+ * @return the subtypes.
|
|
|
|
+ */
|
|
|
|
+ EnumSet<GoalType> getTypes();
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java b/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java
|
|
|
|
new file mode 100644
|
2024-09-30 01:48:34 +02:00
|
|
|
index 0000000000000000000000000000000000000000..fb626065c642a3f43075f2ae751419e23431763c
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java
|
2024-09-30 01:48:34 +02:00
|
|
|
@@ -0,0 +1,59 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
|
|
+
|
|
|
|
+import com.google.common.base.Objects;
|
|
|
|
+import java.util.StringJoiner;
|
|
|
|
+import org.bukkit.NamespacedKey;
|
|
|
|
+import org.bukkit.entity.Mob;
|
2024-09-30 01:48:34 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
|
|
|
+import org.jspecify.annotations.Nullable;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Used to identify a Goal. Consists of a {@link NamespacedKey} and the type of mob the goal can be applied to
|
|
|
|
+ *
|
|
|
|
+ * @param <T> the type of mob the goal can be applied to
|
|
|
|
+ */
|
2024-09-30 01:48:34 +02:00
|
|
|
+@NullMarked
|
|
|
|
+public final class GoalKey<T extends Mob> {
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+ private final Class<T> entityClass;
|
|
|
|
+ private final NamespacedKey namespacedKey;
|
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ private GoalKey(Class<T> entityClass, NamespacedKey namespacedKey) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ this.entityClass = entityClass;
|
|
|
|
+ this.namespacedKey = namespacedKey;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public Class<T> getEntityClass() {
|
2024-09-30 01:48:34 +02:00
|
|
|
+ return this.entityClass;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public NamespacedKey getNamespacedKey() {
|
2024-09-30 01:48:34 +02:00
|
|
|
+ return this.namespacedKey;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2024-09-30 01:48:34 +02:00
|
|
|
+ public boolean equals(@Nullable Object o) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (this == o) return true;
|
2024-09-30 01:48:34 +02:00
|
|
|
+ if (o == null || this.getClass() != o.getClass()) return false;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ GoalKey<?> goalKey = (GoalKey<?>) o;
|
2024-09-30 01:48:34 +02:00
|
|
|
+ return Objects.equal(this.entityClass, goalKey.entityClass) &&
|
|
|
|
+ Objects.equal(this.namespacedKey, goalKey.namespacedKey);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int hashCode() {
|
2024-09-30 01:48:34 +02:00
|
|
|
+ return Objects.hashCode(this.entityClass, this.namespacedKey);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String toString() {
|
|
|
|
+ return new StringJoiner(", ", GoalKey.class.getSimpleName() + "[", "]")
|
2024-09-30 01:48:34 +02:00
|
|
|
+ .add("entityClass=" + this.entityClass)
|
|
|
|
+ .add("namespacedKey=" + this.namespacedKey)
|
2021-06-11 14:02:28 +02:00
|
|
|
+ .toString();
|
|
|
|
+ }
|
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ public static <A extends Mob> GoalKey<A> of(Class<A> entityClass, NamespacedKey namespacedKey) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return new GoalKey<>(entityClass, namespacedKey);
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java b/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000000000000000000000000000000000000..7024c8f484d2460abf3abfe65a29771d814105ec
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/GoalType.java
|
|
|
|
@@ -0,0 +1,17 @@
|
|
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Represents the subtype of a goal. Used by minecraft to disable certain types of goals if needed.
|
|
|
|
+ */
|
|
|
|
+public enum GoalType {
|
|
|
|
+
|
|
|
|
+ MOVE,
|
|
|
|
+ LOOK,
|
|
|
|
+ JUMP,
|
|
|
|
+ TARGET,
|
|
|
|
+ /**
|
|
|
|
+ * Used to map vanilla goals, that are a behavior goal but don't have a type set...
|
|
|
|
+ */
|
|
|
|
+ UNKNOWN_BEHAVIOR,
|
|
|
|
+
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java
|
|
|
|
new file mode 100644
|
2024-09-30 01:48:34 +02:00
|
|
|
index 0000000000000000000000000000000000000000..0203e7efbb8c729ed378c53c2630a523b697314f
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java
|
2024-09-30 01:48:34 +02:00
|
|
|
@@ -0,0 +1,42 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.entity.ai;
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+import java.util.Collection;
|
|
|
|
+import org.bukkit.entity.Mob;
|
2024-09-30 01:48:34 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
|
|
|
+import org.jspecify.annotations.Nullable;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Represents a part of the "brain" of a mob. It tracks all tasks (running or not), allows adding and removing goals
|
|
|
|
+ */
|
2024-09-30 01:48:34 +02:00
|
|
|
+@NullMarked
|
2021-06-11 14:02:28 +02:00
|
|
|
+public interface MobGoals {
|
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> void addGoal(T mob, int priority, Goal<T> goal);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> void removeGoal(T mob, Goal<T> goal);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> void removeAllGoals(T mob);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> void removeAllGoals(T mob, GoalType type);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> void removeGoal(T mob, GoalKey<T> key);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> boolean hasGoal(T mob, GoalKey<T> key);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> @Nullable Goal<T> getGoal(T mob, GoalKey<T> key);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> Collection<Goal<T>> getGoals(T mob, GoalKey<T> key);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> Collection<Goal<T>> getAllGoals(T mob);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> Collection<Goal<T>> getAllGoals(T mob, GoalType type);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> Collection<Goal<T>> getAllGoalsWithout(T mob, GoalType type);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> Collection<Goal<T>> getRunningGoals(T mob);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> Collection<Goal<T>> getRunningGoals(T mob, GoalType type);
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-09-30 01:48:34 +02:00
|
|
|
+ <T extends Mob> Collection<Goal<T>> getRunningGoalsWithout(T mob, GoalType type);
|
2021-06-11 14:02:28 +02:00
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
2024-11-09 17:01:35 +01:00
|
|
|
index a5ab6b1af7da41ccab0ee0810e0ef35a74b3eaca..1393e4b146bdbf55004b54a5fc96e88a7dd7b8f6 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2024-11-09 17:01:35 +01:00
|
|
|
@@ -2584,6 +2584,16 @@ public final class Bukkit {
|
2021-06-11 14:02:28 +02:00
|
|
|
public static boolean isStopping() {
|
|
|
|
return server.isStopping();
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns the {@link com.destroystokyo.paper.entity.ai.MobGoals} manager
|
|
|
|
+ *
|
|
|
|
+ * @return the mob goals manager
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
|
|
|
|
+ return server.getMobGoals();
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
@NotNull
|
|
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
2024-11-09 17:01:35 +01:00
|
|
|
index 1c45e65a3f2c09c1b22f7647ac1093582d4ba109..89e51b10bd8d89e4bab608a7fb9b491e4e147c0a 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2024-11-09 17:01:35 +01:00
|
|
|
@@ -2250,5 +2250,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
2021-06-11 14:02:28 +02:00
|
|
|
* @return true if server is in the process of being shutdown
|
|
|
|
*/
|
|
|
|
boolean isStopping();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns the {@link com.destroystokyo.paper.entity.ai.MobGoals} manager
|
|
|
|
+ *
|
|
|
|
+ * @return the mob goals manager
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
|
|
|
|
// Paper end
|
|
|
|
}
|