Updated to 6.28.1

This reverts commit 9e92ea6062.

.github/workflows/checkstyle.yml

@@ -0,0 +1,15 @@
+name: Check PR Codestyle
+on: [ pull_request ]
+
+jobs:
+  checkstyle:
+    name: Checkstyle
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dbelyaev/action-checkstyle@v0.5.1
+        with:
+          github_token: ${{ secrets.github_token }}
+          reporter: github-pr-review
+          level: warning
+          checkstyle_config: ../../config/checkstyle/checkstyle.xml

.github/workflows/java-ci.yml

@@ -1,6 +1,6 @@
 name: Java CI
 
-on: [push]
+on: [ push, pull_request ]
 
 jobs:
   build:

.github/workflows/test-publish.yml

@@ -0,0 +1,42 @@
+name: Publish API (Dev)
+
+on: [ push, pull_request ]
+
+jobs:
+  publish-release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout latest code
+        uses: actions/checkout@v2
+
+      - name: Set outputs
+        id: vars
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Setup build cache
+        uses: actions/cache@v2.1.6
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+
+      - name: Publish artifact
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+        # The GITHUB_REF tag comes in the format 'refs/tags/xxx'.
+        # So if we split on '/' and take the 3rd value, we can get the release name.
+        run: |
+          NEW_VERSION=$(echo "${GITHUB_REF}" | cut -d "/" -f3)
+          echo "New version: ${{ steps.vars.outputs.sha_short }}"
+          echo "Github username: ${GITHUB_ACTOR}"
+          ./gradlew -Pversion=dev-${{ steps.vars.outputs.sha_short }} publish

CONTRIBUTING.md

@@ -1,24 +1,38 @@
 # How to contribute to eco
 
 ## Codestyle
+
 1. The eco checkstyle is in /config/checkstyle.xml
+
 - The pull request must not have any checkstyle issues.
 - Every method and field must have a javadoc attached.
 
 2. Use JetBrains annotations
+
 - Every parameter should be annotated with @NotNull or @Nullable
-- Use @NotNull over lombok @NonNull
 
 3. Imports
+
 - No group (*) imports.
 - No static imports.
 
+4. Kotlin
+
+- Kotlin should be the only language used in the backend, java should be the only language used in the frontend.
+- Kotlin API extensions should only be for creating extension functions and extra niceties that aren't possible in java.
+  Do not write API components in kotlin.
+- Kotlin code should never be called directly from the frontend Java API. Kotlin API extensions should always rely on
+  java, not the other way round.
+
 ## Dependency Injection
+
 - eco uses Dependency Injection
 - Any calls to Eco#getHandler#getEcoPlugin are code smells and should never be used unless **absolutely necessary**.
 - NamespacedKeys, FixedMetadataValues, Runnables, and Schedules should be managed using AbstractEcoPlugin through DI.
-- Any DI class should extend PluginDependent where possible. If the class extends another, then you **must** store the plugin instance in a private final variable called **plugin** with a private or protected getter.
+- Any DI class should extend PluginDependent where possible. If the class extends another, then you **must** store the
+  plugin instance in a private final variable called **plugin** with a private or protected getter.
 
 ## Other
+
 - All drops **must** be sent through a DropQueue - calls to World#dropItem will get your PR rejected.
 - eco is built with java 17.

README.md

@@ -29,7 +29,7 @@ and many more.
 
 # For server owners
 - Requires ProtocolLib to be installed: get the latest version [here](https://www.spigotmc.org/resources/protocollib.1997/)
-- Supports 1.16.5+
+- Supports 1.17+
 
 ## Downloads
 
@@ -39,7 +39,7 @@ and many more.
 # For developers
 
 ## Javadoc
-The 6.13.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.13.0/javadoc/)
+The 6.27.2 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.27.2/javadoc/)
 
 ## Plugin Information
 
@@ -68,7 +68,7 @@ dependencies {
 }
 ```
 
-Replace `Tag` with a release tag for eco, eg `6.13.0`.
+Replace `Tag` with a release tag for eco, eg `6.27.2`.
 
 Maven:
 
@@ -88,7 +88,7 @@ Maven:
 </dependency>
 ```
 
-Replace `Tag` with a release tag for eco, eg `6.13.0`.
+Replace `Tag` with a release tag for eco, eg `6.27.2`.
 
 ## Build locally:
 

build.gradle.kts

@@ -1,8 +1,19 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
+    }
+}
+
 plugins {
     id("java-library")
-    id("com.github.johnrengelman.shadow") version "7.1.0"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
     id("maven-publish")
     id("java")
+    kotlin("jvm") version "1.6.10"
 }
 
 dependencies {
@@ -10,9 +21,9 @@ dependencies {
     implementation(project(":eco-core:core-plugin"))
     implementation(project(":eco-core:core-proxy"))
     implementation(project(":eco-core:core-backend"))
-    implementation(project(":eco-core:core-nms:v1_16_R3"))
     implementation(project(path = ":eco-core:core-nms:v1_17_R1", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_18_R1", configuration = "reobf"))
+    implementation(project(path = ":eco-core:core-nms:v1_18_R2", configuration = "reobf"))
 }
 
 allprojects {
@@ -20,6 +31,7 @@ allprojects {
     apply(plugin = "java-library")
     apply(plugin = "maven-publish")
     apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "kotlin")
 
     repositories {
         mavenCentral()
@@ -73,19 +85,20 @@ allprojects {
     }
 
     dependencies {
+        compileOnly(kotlin("stdlib", version = "1.6.10"))
         compileOnly("org.jetbrains:annotations:23.0.0")
 
         // Test
-        testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
+        testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
         
         // Adventure
-        compileOnly("net.kyori:adventure-api:4.9.3")
-        compileOnly("net.kyori:adventure-text-serializer-gson:4.9.3")
-        compileOnly("net.kyori:adventure-text-serializer-legacy:4.9.3")
+        compileOnly("net.kyori:adventure-api:4.10.0")
+        compileOnly("net.kyori:adventure-text-serializer-gson:4.10.0")
+        compileOnly("net.kyori:adventure-text-serializer-legacy:4.10.0")
 
         // Other
-        compileOnly("com.google.guava:guava:31.0.1-jre")
+        compileOnly("com.google.guava:guava:31.1-jre")
         compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.5")
     }
 
@@ -101,12 +114,25 @@ allprojects {
         exclude(group = "org.spongepowered", module = "configurate-hocon")
         exclude(group = "com.darkblade12", module = "particleeffect")
         exclude(group = "com.github.cryptomorin", module = "XSeries")
+        exclude(group = "net.wesjd", module = "anvilgui")
+    }
+
+    configurations.testImplementation {
+        setExtendsFrom(listOf(configurations.compileOnly.get()))
     }
 
     tasks {
+        compileKotlin {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+            targetCompatibility = "17"
+            sourceCompatibility = "17"
+        }
+
         shadowJar {
-            relocate("org.bstats", "com.willfp.eco.shaded.bstats")
-            relocate("net.kyori.adventure.text.minimessage", "com.willfp.eco.shaded.minimessage")
+            relocate("org.bstats", "com.willfp.eco.libs.bstats")
+            relocate("redempt.crunch", "com.willfp.eco.libs.crunch")
         }
 
         compileJava {

config/checkstyle/checkstyle.xml

@@ -32,10 +32,6 @@
 -->
 
 <module name="Checker">
-    <module name="SuppressionFilter">
-        <property name="file" value="config/checkstyle/suppression.xml"/>
-    </module>
-
     <!--
         If you set the basedir property below, then all reported file
         names will be relative to the specified directory. See

config/checkstyle/suppression.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-        "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-    <!-- Internals don't need javadoc. -->
-    <suppress files="[\\/]internal[\\/]" checks="MissingJavadocMethod"/>
-    <suppress files="[\\/]internal[\\/]" checks="JavadocVariable"/>
-    <suppress files="[\\/]eco[\\/]spigot[\\/]" checks="MissingJavadocMethod"/>
-    <suppress files="[\\/]eco[\\/]spigot[\\/]" checks="JavadocVariable"/>
-    <suppress files="[\\/]eco[\\/]proxy[\\/]" checks="MissingJavadocMethod"/>
-    <suppress files="[\\/]eco[\\/]proxy[\\/]" checks="JavadocVariable"/>
-
-    <!-- Modified version of library -->
-    <suppress files="ArmorEquipEvent.java" checks="JavadocVariable"/>
-    <suppress files="ArmorEquipEvent.java" checks="MissingJavadocMethod"/>
-    <suppress files="ArmorEquipEvent.java" checks="JavadocStyle"/>
-    <suppress files="ArmorListener.java" checks="JavadocVariable"/>
-    <suppress files="ArmorListener.java" checks="MissingJavadocMethod"/>
-    <suppress files="ArmorType.java" checks="JavadocVariable"/>
-    <suppress files="ArmorType.java" checks="MissingJavadocMethod"/>
-</suppressions>

eco-api/build.gradle

@@ -1,14 +1,6 @@
-plugins {
-    id 'com.github.johnrengelman.shadow'
-}
-
-group 'com.willfp'
-version rootProject.version
-
 dependencies {
     // Adventure
-    compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
-    compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
+    compileOnly 'net.kyori:adventure-platform-bukkit:4.1.0'
 
     // Other
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
@@ -17,11 +9,13 @@ dependencies {
     compileOnly 'com.google.code.gson:gson:2.8.8'
 }
 
+group 'com.willfp'
+version rootProject.version
+
 java {
     withJavadocJar()
 }
 
-
 build.dependsOn publishToMavenLocal
 
 publishing {
@@ -42,4 +36,4 @@ publishing {
             }
         }
     }
-}
+}

eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java

@@ -152,10 +152,14 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     private final ProxyFactory proxyFactory;
 
     /**
-     * Create a new plugin without a specified color, proxy support, polymart, or bStats.
+     * Create a new plugin.
+     * <p>
+     * Will read from eco.yml (like plugin.yml) to fetch values that would otherwise be passed
+     * into the constructor. If no eco.yml is present, the plugin will load without extension
+     * support, without proxy support, with no update-checker or bStats, and with the color white.
      */
     protected EcoPlugin() {
-        this("&f");
+        this((PluginProps) null);
     }
 
     /**
@@ -236,6 +240,23 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
                         @NotNull final String proxyPackage,
                         @NotNull final String color,
                         final boolean supportingExtensions) {
+        this(
+                PluginProps.createSimple(
+                        resourceId,
+                        bStatsId,
+                        proxyPackage,
+                        color,
+                        supportingExtensions
+                )
+        );
+    }
+
+    /**
+     * Create a new plugin.
+     *
+     * @param pluginProps The props. If left null, it will read from eco.yml.
+     */
+    protected EcoPlugin(@Nullable final PluginProps pluginProps) {
         /*
         The handler must be initialized before any plugin's constructors
         are called, as the constructors call Eco#getHandler().
@@ -253,15 +274,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         a standalone handler class, but then there would be an interface
         left in the API that doesn't really help anything.
 
-        The other alternative would be do use reflection to get a 'createHandler'
-        method that only exists in EcoSpigotPlugin - but that feels really dirty
+        The other alternative would be to use reflection to get a 'createHandler'
+        method that only exists in EcoSpigotPlugin - but that feels filthy,
         and I'd rather only use reflection where necessary.
         */
 
         if (Eco.getHandler() == null && this instanceof Handler) {
             /*
             This code is only ever called by EcoSpigotPlugin (EcoHandler)
-            as it's the first plugin to load and it is a handler.
+            as it's the first plugin to load, and it is a handler.
 
             Any other plugins will never call this code as the handler
             will have already been initialized.
@@ -272,11 +293,16 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
 
         assert Eco.getHandler() != null;
 
-        this.resourceId = resourceId;
-        this.bStatsId = bStatsId;
-        this.proxyPackage = proxyPackage;
-        this.color = color;
-        this.supportingExtensions = supportingExtensions;
+        PluginProps generatedProps = Eco.getHandler().getProps(pluginProps, this.getClass());
+        generatedProps.validate();
+        PluginProps props = this.mutateProps(generatedProps);
+        props.validate();
+
+        this.resourceId = props.getResourceId();
+        this.bStatsId = props.getBStatsId();
+        this.proxyPackage = props.getProxyPackage();
+        this.color = props.getColor();
+        this.supportingExtensions = props.isSupportingExtensions();
 
         this.scheduler = Eco.getHandler().createScheduler(this);
         this.eventManager = Eco.getHandler().createEventManager(this);
@@ -296,8 +322,8 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         /*
         The minimum eco version check was moved here because it's very common
         to add a lot of code in the constructor of plugins; meaning that the plugin
-        can throw errors without it being obvious to the user that the reason is
-        because they have an outdated version of eco installed.
+        can throw errors without it being obvious to the user that the reason is that
+        they have an outdated version of eco installed.
          */
 
         DefaultArtifactVersion runningVersion = new DefaultArtifactVersion(Eco.getHandler().getEcoPlugin().getDescription().getVersion());
@@ -534,6 +560,21 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
 
     }
 
+    /**
+     * Mutate the plugin props.
+     * <p>
+     * Useful for eco-based plugin libraries to enforce certain properties, such as
+     * forcing extensions to be enabled.
+     * <p>
+     * Props are validated both before and after calling this method.
+     *
+     * @param props The props.
+     * @return The mutated props.
+     */
+    protected PluginProps mutateProps(@NotNull final PluginProps props) {
+        return props;
+    }
+
     /**
      * The plugin-specific integrations to be tested and loaded.
      *
@@ -635,7 +676,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @return The proxy.
      */
     public final <T> T getProxy(@NotNull final Class<T> proxyClass) {
-        Validate.notNull(proxyFactory, "Plugin does not support proxy!");
+        Validate.notNull(proxyFactory, "Plugin does not support proxies!");
 
         return proxyFactory.getProxy(proxyClass);
     }

eco-api/src/main/java/com/willfp/eco/core/Handler.java

@@ -5,6 +5,7 @@ import com.willfp.eco.core.config.wrapper.ConfigFactory;
 import com.willfp.eco.core.data.ProfileHandler;
 import com.willfp.eco.core.data.keys.KeyRegistry;
 import com.willfp.eco.core.drops.DropQueueFactory;
+import com.willfp.eco.core.entities.ai.EntityController;
 import com.willfp.eco.core.events.EventManager;
 import com.willfp.eco.core.extensions.ExtensionLoader;
 import com.willfp.eco.core.factory.MetadataValueFactory;
@@ -15,12 +16,12 @@ import com.willfp.eco.core.gui.GUIFactory;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderIntegration;
 import com.willfp.eco.core.proxy.Cleaner;
 import com.willfp.eco.core.proxy.ProxyFactory;
-import com.willfp.eco.core.requirement.RequirementFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.Mob;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -204,14 +205,6 @@ public interface Handler {
      */
     void registerBStats(@NotNull EcoPlugin plugin);
 
-    /**
-     * Get the requirement factory.
-     *
-     * @return The factory.
-     */
-    @NotNull
-    RequirementFactory getRequirementFactory();
-
     /**
      * Get Adventure audiences.
      *
@@ -259,4 +252,34 @@ public interface Handler {
     @NotNull
     NamespacedKey createNamespacedKey(@NotNull String namespace,
                                       @NotNull String key);
+
+    /**
+     * Return or get props for a plugin.
+     *
+     * @param existing The existing constructor props.
+     * @param plugin   The plugin.
+     * @return The props.
+     */
+    @NotNull
+    PluginProps getProps(@Nullable PluginProps existing,
+                         @NotNull Class<? extends EcoPlugin> plugin);
+
+    /**
+     * Format a string with MiniMessage.
+     *
+     * @param message The message.
+     * @return The formatted string.
+     */
+    @NotNull
+    String formatMiniMessage(@NotNull String message);
+
+    /**
+     * Create controlled entity from a mob.
+     *
+     * @param mob The mob.
+     * @param <T> The mob type.
+     * @return The controlled entity.
+     */
+    @NotNull
+    <T extends Mob> EntityController<T> createEntityController(@NotNull T mob);
 }

eco-api/src/main/java/com/willfp/eco/core/PluginProps.java

@@ -0,0 +1,275 @@
+package com.willfp.eco.core;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Plugin props are the arguments related to the plugin that are required on start-up.
+ * <p>
+ * This class is complex in how it works intentionally. This is done so that fields can be
+ * added to the props without breaking API backwards compatibility. Thus, there is no public
+ * constructor and no way to instantiate props without creating a parser.
+ */
+public final class PluginProps {
+    /**
+     * All registered parsers.
+     */
+    private static final Map<Class<?>, PropsParser<?>> REGISTERED_PARSERS = new HashMap<>();
+
+    /**
+     * The polymart resource ID.
+     */
+    @Nullable
+    private Integer resourceId;
+
+    /**
+     * The bStats ID.
+     */
+    @Nullable
+    private Integer bStatsId;
+
+    /**
+     * The proxy package.
+     */
+    @Nullable
+    private String proxyPackage;
+
+    /**
+     * The color.
+     */
+    @Nullable
+    private String color;
+
+    /**
+     * If extensions are supported.
+     */
+    @Nullable
+    private Boolean supportingExtensions;
+
+    /**
+     * Create new blank props.
+     */
+    private PluginProps() {
+
+    }
+
+    /**
+     * Get resource ID.
+     *
+     * @return The resource ID.
+     */
+    public int getResourceId() {
+        assert resourceId != null;
+        return resourceId;
+    }
+
+    /**
+     * Set resource ID.
+     *
+     * @param resourceId The resource ID.
+     */
+    public void setResourceId(final int resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    /**
+     * Get bStats ID.
+     *
+     * @return The bStats ID.
+     */
+    public int getBStatsId() {
+        assert bStatsId != null;
+        return bStatsId;
+    }
+
+    /**
+     * Set bStats ID.
+     *
+     * @param bStatsId The bStats ID.
+     */
+    public void setBStatsId(final int bStatsId) {
+        this.bStatsId = bStatsId;
+    }
+
+    /**
+     * Get the proxy package.
+     *
+     * @return The package.
+     */
+    @NotNull
+    public String getProxyPackage() {
+        assert proxyPackage != null;
+        return proxyPackage;
+    }
+
+    /**
+     * Set the proxy package.
+     *
+     * @param proxyPackage The proxy package.
+     */
+    public void setProxyPackage(@NotNull final String proxyPackage) {
+        this.proxyPackage = proxyPackage;
+    }
+
+    /**
+     * Get color.
+     *
+     * @return The color.
+     */
+    @NotNull
+    public String getColor() {
+        assert color != null;
+        return color;
+    }
+
+    /**
+     * Set the color.
+     *
+     * @param color The color.
+     */
+    public void setColor(@NotNull final String color) {
+        this.color = color;
+    }
+
+    /**
+     * Get if extensions are supported.
+     *
+     * @return If supported.
+     */
+    public boolean isSupportingExtensions() {
+        assert supportingExtensions != null;
+        return supportingExtensions;
+    }
+
+    /**
+     * Set if extensions are supported.
+     *
+     * @param supportingExtensions If supported.
+     */
+    public void setSupportingExtensions(final boolean supportingExtensions) {
+        this.supportingExtensions = supportingExtensions;
+    }
+
+    /**
+     * Ensure that all required props have been set.
+     */
+    public void validate() {
+        if (
+                supportingExtensions == null
+                        || proxyPackage == null
+                        || color == null
+                        || bStatsId == null
+                        || resourceId == null
+        ) {
+            throw new IllegalStateException("Missing required props!");
+        }
+    }
+
+    /**
+     * Parse props from source.
+     *
+     * @param source      The source.
+     * @param sourceClass The source class.
+     * @param <T>         The source type.
+     * @return The props.
+     */
+    public static <T> PluginProps parse(@NotNull final T source,
+                                        @NotNull final Class<? extends T> sourceClass) {
+        for (Map.Entry<Class<?>, PropsParser<?>> entry : REGISTERED_PARSERS.entrySet()) {
+            Class<?> clazz = entry.getKey();
+
+            if (clazz.equals(sourceClass)) {
+                @SuppressWarnings("unchecked")
+                PropsParser<T> parser = (PropsParser<T>) entry.getValue();
+                return parser.parseFrom(source);
+            }
+        }
+
+        throw new IllegalArgumentException("No parser exists for class " + sourceClass);
+    }
+
+    /**
+     * Register a parser for a type.
+     *
+     * @param clazz  The class.
+     * @param parser The parser.
+     * @param <T>    The source type.
+     */
+    public static <T> void registerParser(@NotNull final Class<T> clazz,
+                                          @NotNull final PropsParser<T> parser) {
+        REGISTERED_PARSERS.put(clazz, parser);
+    }
+
+    /**
+     * Get if there is a registered parser for a class.
+     *
+     * @param clazz The class.
+     * @return If there is a parser registered.
+     */
+    public static boolean hasParserFor(@NotNull final Class<?> clazz) {
+        for (Class<?> test : REGISTERED_PARSERS.keySet()) {
+            if (test.equals(clazz)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Create new props from known values.
+     *
+     * Marked as internal as this method will break whenever the properties themselves
+     * are updated (e.g. if a new property is added) - so to prevent any potential
+     * backwards-compatibility bugs, this method cannot be invoked outside eco itself.
+     *
+     * @param resourceId         The ID of the plugin on polymart.
+     * @param bStatsId           The ID of the plugin on bStats.
+     * @param proxyPackage       The package where proxies can be found.
+     * @param color              The primary color of the plugin.
+     * @param supportsExtensions If the plugin should attempt to look for extensions.
+     * @return The props.
+     */
+    @ApiStatus.Internal
+    static PluginProps createSimple(final int resourceId,
+                                    final int bStatsId,
+                                    @NotNull final String proxyPackage,
+                                    @NotNull final String color,
+                                    final boolean supportsExtensions) {
+        PluginProps props = new PluginProps();
+        props.setResourceId(resourceId);
+        props.setBStatsId(bStatsId);
+        props.setProxyPackage(proxyPackage);
+        props.setColor(color);
+        props.setSupportingExtensions(supportsExtensions);
+        return props;
+    }
+
+    /**
+     * Parse arguments into props for a plugin.
+     *
+     * @param <T> The type of source.
+     */
+    public interface PropsParser<T> {
+        /**
+         * Parse props from a given source.
+         *
+         * @param source The source.
+         * @return The props.
+         */
+        PluginProps parseFrom(@NotNull T source);
+
+        /**
+         * Get a new, blank props instance.
+         *
+         * @return Blank props.
+         */
+        default PluginProps getBlankProps() {
+            return new PluginProps();
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java

@@ -51,7 +51,10 @@ public class Prerequisite {
 
     /**
      * Requires the server to be running 1.17.
+     *
+     * @deprecated eco no longer supports versions before 1.17.
      */
+    @Deprecated(since = "6.25.2")
     public static final Prerequisite HAS_1_17 = new Prerequisite(
             () -> ProxyConstants.NMS_VERSION.contains("17") || HAS_1_18.isMet(),
             "Requires server to be running 1.17+"

eco-api/src/main/java/com/willfp/eco/core/command/CommandBase.java

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.command;
 
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
@@ -66,6 +67,13 @@ public interface CommandBase {
         return new ArrayList<>();
     }
 
+    /**
+     * Get the plugin.
+     *
+     * @return The plugin.
+     */
+    EcoPlugin getPlugin();
+
     /**
      * Get the handler.
      *

eco-api/src/main/java/com/willfp/eco/core/command/impl/HandledCommand.java

@@ -1,7 +1,6 @@
 package com.willfp.eco.core.command.impl;
 
 import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
 import com.willfp.eco.core.command.CommandBase;
 import com.willfp.eco.core.command.CommandHandler;
 import com.willfp.eco.core.command.TabCompleteHandler;
@@ -25,7 +24,12 @@ import java.util.stream.Collectors;
  * layer, hence why it's a package-private class.
  */
 @SuppressWarnings({"DeprecatedIsStillUsed"})
-abstract class HandledCommand extends PluginDependent<EcoPlugin> implements CommandBase {
+abstract class HandledCommand implements CommandBase {
+    /**
+     * The plugin.
+     */
+    private final EcoPlugin plugin;
+
     /**
      * The name of the command.
      */
@@ -78,7 +82,7 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
                    @NotNull final String name,
                    @NotNull final String permission,
                    final boolean playersOnly) {
-        super(plugin);
+        this.plugin = plugin;
         this.name = name;
         this.permission = permission;
         this.playersOnly = playersOnly;
@@ -98,6 +102,16 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
         return this;
     }
 
+    /**
+     * Get the plugin.
+     *
+     * @return The plugin.
+     */
+    @Override
+    public EcoPlugin getPlugin() {
+        return this.plugin;
+    }
+
     /**
      * Handle the command.
      *
@@ -124,6 +138,11 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
             }
         }
 
+        if (this.isPlayersOnly() && !(sender instanceof Player)) {
+            sender.sendMessage(this.getPlugin().getLangYml().getMessage("not-player"));
+            return;
+        }
+
         if (this.getHandler() != null) {
             this.getHandler().onExecute(sender, Arrays.asList(args));
         } else {
@@ -193,11 +212,6 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
     public static boolean canExecute(@NotNull final CommandSender sender,
                                      @NotNull final CommandBase command,
                                      @NotNull final EcoPlugin plugin) {
-        if (command.isPlayersOnly() && !(sender instanceof Player)) {
-            sender.sendMessage(plugin.getLangYml().getMessage("not-player"));
-            return false;
-        }
-
         if (!sender.hasPermission(command.getPermission()) && sender instanceof Player) {
             sender.sendMessage(plugin.getLangYml().getNoPermission());
             return false;

eco-api/src/main/java/com/willfp/eco/core/config/TransientConfig.java

@@ -5,7 +5,10 @@ import com.willfp.eco.core.config.interfaces.Config;
 import com.willfp.eco.core.config.wrapper.ConfigWrapper;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Map;
 
 /**
@@ -21,6 +24,15 @@ public class TransientConfig extends ConfigWrapper<Config> {
         super(Eco.getHandler().getConfigFactory().createConfig(config));
     }
 
+    /**
+     * @param stream The InputStream.
+     */
+    public TransientConfig(@Nullable final InputStream stream) {
+        super(stream != null ? Eco.getHandler().getConfigFactory().createConfig(YamlConfiguration.loadConfiguration(
+                new InputStreamReader(stream)
+        )) : new TransientConfig());
+    }
+
     /**
      * Create a new empty transient config.
      *

eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java

@@ -2,6 +2,8 @@ package com.willfp.eco.core.config.interfaces;
 
 import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.TransientConfig;
+import com.willfp.eco.core.placeholder.PlaceholderInjectable;
+import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.StringUtils;
 import org.bukkit.entity.Player;
@@ -9,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,7 +21,7 @@ import java.util.Objects;
  * Contains all methods that must exist in yaml and json configurations.
  */
 @SuppressWarnings("unused")
-public interface Config extends Cloneable {
+public interface Config extends Cloneable, PlaceholderInjectable {
     /**
      * Clears cache.
      */
@@ -235,7 +238,7 @@ public interface Config extends Cloneable {
      */
     @NotNull
     default String getString(@NotNull String path) {
-        return getString(path, false);
+        return getString(path, false, StringUtils.FormatOption.WITHOUT_PLACEHOLDERS);
     }
 
     /**
@@ -563,7 +566,7 @@ public interface Config extends Cloneable {
      */
     default double getDoubleFromExpression(@NotNull String path,
                                            @Nullable Player player) {
-        return NumberUtils.evaluateExpression(this.getString(path), player);
+        return NumberUtils.evaluateExpression(this.getString(path), player, this.getInjectedPlaceholders());
     }
 
     /**
@@ -629,4 +632,19 @@ public interface Config extends Cloneable {
      * @return The clone.
      */
     Config clone();
+
+    @Override
+    default void injectPlaceholders(@NotNull Iterable<StaticPlaceholder> placeholders) {
+        // Do nothing.
+    }
+
+    @Override
+    default List<StaticPlaceholder> getInjectedPlaceholders() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    default void clearInjectedPlaceholders() {
+        // Do nothing.
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/config/wrapper/ConfigWrapper.java

@@ -2,6 +2,7 @@ package com.willfp.eco.core.config.wrapper;
 
 import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -134,6 +135,26 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getType();
     }
 
+    @Override
+    public void injectPlaceholders(@NotNull final StaticPlaceholder... placeholders) {
+        handle.injectPlaceholders(placeholders);
+    }
+
+    @Override
+    public void injectPlaceholders(@NotNull final Iterable<StaticPlaceholder> placeholders) {
+        handle.injectPlaceholders(placeholders);
+    }
+
+    @Override
+    public List<StaticPlaceholder> getInjectedPlaceholders() {
+        return handle.getInjectedPlaceholders();
+    }
+
+    @Override
+    public void clearInjectedPlaceholders() {
+        handle.clearInjectedPlaceholders();
+    }
+
     /**
      * Get the handle.
      *

eco-api/src/main/java/com/willfp/eco/core/data/keys/KeyRegistry.java

@@ -1,12 +1,18 @@
 package com.willfp.eco.core.data.keys;
 
+import com.willfp.eco.core.Eco;
+import org.bukkit.NamespacedKey;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
 
 /**
  * API to register persistent data keys.
  */
+@ApiStatus.Internal
+@Eco.HandlerComponent
 public interface KeyRegistry {
     /**
      * Register a persistent data key to be stored.
@@ -21,4 +27,37 @@ public interface KeyRegistry {
      * @return The keys.
      */
     Set<PersistentDataKey<?>> getRegisteredKeys();
+
+    /**
+     * Mark key as category.
+     *
+     * @param key      The key.
+     * @param category The category.
+     */
+    void markKeyAs(@NotNull PersistentDataKey<?> key,
+                   @NotNull KeyRegistry.KeyCategory category);
+
+    /**
+     * Get persistent data key from namespaced key.
+     *
+     * @param namespacedKey The key.
+     * @return The key, or null if not found.
+     */
+    @Nullable
+    PersistentDataKey<?> getKeyFrom(@NotNull NamespacedKey namespacedKey);
+
+    /**
+     * Locations for key categorization.
+     */
+    enum KeyCategory {
+        /**
+         * Player keys.
+         */
+        PLAYER,
+
+        /**
+         * Server keys.
+         */
+        SERVER
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java

@@ -3,7 +3,9 @@ package com.willfp.eco.core.data.keys;
 import com.willfp.eco.core.Eco;
 import org.bukkit.NamespacedKey;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -11,7 +13,7 @@ import java.util.Set;
  *
  * @param <T> The type of the data.
  */
-public class PersistentDataKey<T> {
+public final class PersistentDataKey<T> {
     /**
      * The key of the persistent data value.
      */
@@ -80,6 +82,32 @@ public class PersistentDataKey<T> {
         return this.type;
     }
 
+    /**
+     * Categorize key as a server key, will register new column to MySQL
+     * database immediately rather than waiting for auto-categorization.
+     * <p>
+     * This will improve performance.
+     *
+     * @return The key.
+     */
+    public PersistentDataKey<T> server() {
+        Eco.getHandler().getKeyRegistry().markKeyAs(this, KeyRegistry.KeyCategory.SERVER);
+        return this;
+    }
+
+    /**
+     * Categorize key as a player key, will register new column to MySQL
+     * database immediately rather than waiting for auto-categorization.
+     * <p>
+     * This will improve performance.
+     *
+     * @return The key.
+     */
+    public PersistentDataKey<T> player() {
+        Eco.getHandler().getKeyRegistry().markKeyAs(this, KeyRegistry.KeyCategory.PLAYER);
+        return this;
+    }
+
     /**
      * Get all persistent data keys.
      *
@@ -88,4 +116,20 @@ public class PersistentDataKey<T> {
     public static Set<PersistentDataKey<?>> values() {
         return Eco.getHandler().getKeyRegistry().getRegisteredKeys();
     }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof PersistentDataKey that)) {
+            return false;
+        }
+        return Objects.equals(this.getKey(), that.getKey());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getKey());
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/entities/DummyEntity.java

@@ -0,0 +1,10 @@
+package com.willfp.eco.core.entities;
+
+import org.bukkit.entity.Entity;
+
+/**
+ * Interface for Dummy Entities in order to filter them using instanceof.
+ */
+public interface DummyEntity extends Entity {
+
+}

eco-api/src/main/java/com/willfp/eco/core/entities/Entities.java

@@ -6,7 +6,6 @@ import com.willfp.eco.core.entities.impl.EmptyTestableEntity;
 import com.willfp.eco.core.entities.impl.ModifiedTestableEntity;
 import com.willfp.eco.core.entities.impl.SimpleTestableEntity;
 import com.willfp.eco.util.NamespacedKeyUtils;
-import com.willfp.eco.util.StringUtils;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;
@@ -37,6 +36,11 @@ public final class Entities {
      */
     private static final List<EntityArgParser> ARG_PARSERS = new ArrayList<>();
 
+    /**
+     * The lookup handler.
+     */
+    private static final EntitiesLookupHandler ENTITIES_LOOKUP_HANDLER = new EntitiesLookupHandler(Entities::doParse);
+
     /**
      * Register a new custom item.
      *
@@ -87,20 +91,11 @@ public final class Entities {
      */
     @NotNull
     public static TestableEntity lookup(@NotNull final String key) {
-        if (key.contains("?")) {
-            String[] options = key.split("\\?");
-            for (String option : options) {
-                TestableEntity lookup = lookup(option);
-                if (!(lookup instanceof EmptyTestableEntity)) {
-                    return lookup;
-                }
-            }
-
-            return new EmptyTestableEntity();
-        }
-
-        String[] args = StringUtils.parseTokens(key);
+        return ENTITIES_LOOKUP_HANDLER.parseKey(key);
+    }
 
+    @NotNull
+    private static TestableEntity doParse(@NotNull final String[] args) {
         if (args.length == 0) {
             return new EmptyTestableEntity();
         }
@@ -131,7 +126,6 @@ public final class Entities {
             entity = part;
         }
 
-
         String[] modifierArgs = Arrays.copyOfRange(args, 1, args.length);
 
         List<EntityArgParseResult> parseResults = new ArrayList<>();
@@ -172,7 +166,6 @@ public final class Entities {
         return entity;
     }
 
-
     /**
      * Get a Testable Entity from an ItemStack.
      * <p>

eco-api/src/main/java/com/willfp/eco/core/entities/EntitiesLookupHandler.java

@@ -0,0 +1,48 @@
+package com.willfp.eco.core.entities;
+
+import com.willfp.eco.core.entities.impl.EmptyTestableEntity;
+import com.willfp.eco.core.entities.impl.GroupedTestableEntities;
+import com.willfp.eco.core.lookup.LookupHandler;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.function.Function;
+
+/**
+ * Handle item lookup strings.
+ */
+public class EntitiesLookupHandler implements LookupHandler<TestableEntity> {
+    /**
+     * The parser.
+     */
+    private final Function<String[], @NotNull TestableEntity> parser;
+
+    /**
+     * Create new lookup handler.
+     *
+     * @param parser The parser.
+     */
+    public EntitiesLookupHandler(@NotNull final Function<String[], @NotNull TestableEntity> parser) {
+        this.parser = parser;
+    }
+
+    @Override
+    public @NotNull TestableEntity parse(@NotNull final String[] args) {
+        return parser.apply(args);
+    }
+
+    @Override
+    public boolean validate(@NotNull final TestableEntity object) {
+        return !(object instanceof EmptyTestableEntity);
+    }
+
+    @Override
+    public @NotNull TestableEntity getFailsafe() {
+        return new EmptyTestableEntity();
+    }
+
+    @Override
+    public @NotNull TestableEntity join(@NotNull final Collection<TestableEntity> options) {
+        return new GroupedTestableEntities(options);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/TestableEntity.java

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.entities;
 
+import com.willfp.eco.core.lookup.Testable;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.NotNull;
@@ -8,13 +9,14 @@ import org.jetbrains.annotations.Nullable;
 /**
  * An item with a test to see if any item is that item.
  */
-public interface TestableEntity {
+public interface TestableEntity extends Testable<Entity> {
     /**
      * If an Entity matches the test.
      *
      * @param entity The entity to test.
      * @return If the entity matches.
      */
+    @Override
     boolean matches(@Nullable Entity entity);
 
     /**

eco-api/src/main/java/com/willfp/eco/core/entities/ai/CustomGoal.java

@@ -0,0 +1,122 @@
+package com.willfp.eco.core.entities.ai;
+
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Base interface for all custom goals.
+ * <p>
+ * Can be used both for entity goals and target goals.
+ *
+ * @param <T> The type of mob that this goal can be applied to.
+ */
+public abstract class CustomGoal<T extends Mob> implements EntityGoal<T>, TargetGoal<T> {
+    /**
+     * The flags for the goal.
+     */
+    private final Set<GoalFlag> flags = EnumSet.noneOf(GoalFlag.class);
+
+    /**
+     * Initialize the goal with a mob.
+     * <p>
+     * This will be run before any implementation code, treat this as the constructor.
+     *
+     * @param mob The mob.
+     */
+    public abstract void initialize(@NotNull T mob);
+
+    /**
+     * Get if the goal can be used.
+     * Will start the goal if this returns true.
+     *
+     * @return If the goal can be used.
+     */
+    public abstract boolean canUse();
+
+    /**
+     * Tick the goal.
+     * <p>
+     * Runs ever tick as long as canUse returns true.
+     * <p>
+     * Runs after start().
+     */
+    public void tick() {
+        // Override when needed.
+    }
+
+    /**
+     * Start the goal.
+     * <p>
+     * Runs once canUse() returns true.
+     */
+    public void start() {
+        // Override when needed.
+    }
+
+    /**
+     * Stop the goal.
+     * <p>
+     * Runs once canUse() returns false.
+     */
+    public void stop() {
+        // Override when needed.
+    }
+
+    /**
+     * Get if the goal can continue to be used.
+     *
+     * @return If the goal can continue to be used.
+     */
+    public boolean canContinueToUse() {
+        return this.canUse();
+    }
+
+    /**
+     * Get if the goal is interruptable.
+     *
+     * @return If interruptable.
+     */
+    public boolean isInterruptable() {
+        return true;
+    }
+
+    /**
+     * Get the goal flags.
+     *
+     * @return The flags.
+     */
+    public EnumSet<GoalFlag> getFlags() {
+        return EnumSet.copyOf(this.flags);
+    }
+
+    /**
+     * Set the flags for the goal.
+     *
+     * @param flags The flags.
+     */
+    public final void setFlags(@NotNull final GoalFlag... flags) {
+        this.setFlags(EnumSet.copyOf(List.of(flags)));
+    }
+
+    /**
+     * Set the flags for the goal.
+     *
+     * @param flags The flags.
+     */
+    public void setFlags(@NotNull final EnumSet<GoalFlag> flags) {
+        this.flags.clear();
+        this.flags.addAll(flags);
+    }
+
+    @Override
+    public T addToEntity(@NotNull final T entity,
+                         final int priority) {
+        throw new UnsupportedOperationException(
+                "Shorthand syntax is not supported for custom goals by default as they can be both entity and target goals."
+        );
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/EntityController.java

@@ -0,0 +1,106 @@
+package com.willfp.eco.core.entities.ai;
+
+import com.willfp.eco.core.Eco;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An entity controller allows for adding targets and goals to entities.
+ *
+ * @param <T> The wrapped mob.
+ */
+public interface EntityController<T extends Mob> {
+    /**
+     * Add a target goal to the entity.
+     * <p>
+     * Mutates the instance.
+     *
+     * @param priority The priority.
+     * @param goal     The goal.
+     * @return The entity controller.
+     */
+    EntityController<T> addTargetGoal(int priority,
+                                      @NotNull TargetGoal<? super T> goal);
+
+    /**
+     * Remove all target goals from the entity.
+     * <p>
+     * Mutates the instance.
+     *
+     * @return The entity controller.
+     */
+    EntityController<T> clearTargetGoals();
+
+    /**
+     * Remove a target goal from the entity.
+     * <p>
+     * Mutates the instance.
+     *
+     * @param goal The goal.
+     * @return The entity controller.
+     */
+    EntityController<T> removeTargetGoal(@NotNull TargetGoal<? super T> goal);
+
+    /**
+     * Add an entity goal to the entity.
+     * <p>
+     * Mutates the instance.
+     *
+     * @param priority The priority.
+     * @param goal     The goal.
+     * @return The entity controller.
+     */
+    EntityController<T> addEntityGoal(int priority,
+                                      @NotNull EntityGoal<? super T> goal);
+
+    /**
+     * Remove an entity goal from the entity.
+     * <p>
+     * Mutates the instance.
+     *
+     * @param goal The goal.
+     * @return The entity controller.
+     */
+    EntityController<T> removeEntityGoal(@NotNull EntityGoal<? super T> goal);
+
+    /**
+     * Remove all entity goals from the entity.
+     * <p>
+     * Mutates the instance.
+     *
+     * @return The entity controller.
+     */
+    EntityController<T> clearEntityGoals();
+
+    /**
+     * Remove all goals from the entity.
+     * <p>
+     * Mutates the instance.
+     *
+     * @return The entity controller.
+     */
+    default EntityController<T> clearAllGoals() {
+        this.clearTargetGoals();
+        return this.clearEntityGoals();
+    }
+
+    /**
+     * Get the mob back from the controlled entity.
+     * <p>
+     * Not required to apply changes, as the mob instance will be altered.
+     *
+     * @return The mob.
+     */
+    T getEntity();
+
+    /**
+     * Create an entity controller for an entity in order to modify targets and goals.
+     *
+     * @param entity The entity.
+     * @param <T>    The mob type.
+     * @return The entity controller.
+     */
+    static <T extends Mob> EntityController<T> getFor(@NotNull final T entity) {
+        return Eco.getHandler().createEntityController(entity);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/EntityGoal.java

@@ -0,0 +1,18 @@
+package com.willfp.eco.core.entities.ai;
+
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A goal for entity AI.
+ *
+ * @param <T> The type of mob that the goal can be applied to.
+ */
+public interface EntityGoal<T extends Mob> extends Goal<T> {
+    @Override
+    default T addToEntity(@NotNull T entity, int priority) {
+        return EntityController.getFor(entity)
+                .addEntityGoal(priority, this)
+                .getEntity();
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/EntityGoals.java

@@ -0,0 +1,175 @@
+package com.willfp.eco.core.entities.ai;
+
+import com.google.common.collect.HashBiMap;
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalAvoidEntity;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalBreakDoors;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalBreatheAir;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalBreed;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalCatLieOnBed;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalCatSitOnBed;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalEatGrass;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalFleeSun;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalFloat;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalFollowBoats;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalFollowMobs;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalIllusionerBlindnessSpell;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalIllusionerMirrorSpell;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalInteract;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalLeapAtTarget;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalLookAtPlayer;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalMeleeAttack;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalMoveBackToVillage;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalMoveThroughVillage;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalMoveTowardsRestriction;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalMoveTowardsTarget;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalOcelotAttack;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalOpenDoors;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalPanic;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalRandomLookAround;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalRandomStroll;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalRandomSwimming;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalRangedAttack;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalRangedBowAttack;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalRangedCrossbowAttack;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalRestrictSun;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalStrollThroughVillage;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalTempt;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalTryFindWater;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalUseItem;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalWaterAvoidingRandomFlying;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalWaterAvoidingRandomStroll;
+import com.willfp.eco.core.entities.ai.entity.EntityGoalWolfBeg;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+
+/**
+ * Class to manage entity goals.
+ */
+public final class EntityGoals {
+    /**
+     * All registered deserializers.
+     */
+    private static final Map<NamespacedKey, KeyedDeserializer<? extends EntityGoal<?>>> BY_KEY = HashBiMap.create();
+
+    static {
+        register(EntityGoalAvoidEntity.DESERIALIZER);
+        register(EntityGoalBreakDoors.DESERIALIZER);
+        register(EntityGoalBreatheAir.DESERIALIZER);
+        register(EntityGoalEatGrass.DESERIALIZER);
+        register(EntityGoalFleeSun.DESERIALIZER);
+        register(EntityGoalFloat.DESERIALIZER);
+        register(EntityGoalFollowBoats.DESERIALIZER);
+        register(EntityGoalFollowMobs.DESERIALIZER);
+        register(EntityGoalInteract.DESERIALIZER);
+        register(EntityGoalLeapAtTarget.DESERIALIZER);
+        register(EntityGoalLookAtPlayer.DESERIALIZER);
+        register(EntityGoalMeleeAttack.DESERIALIZER);
+        register(EntityGoalMoveBackToVillage.DESERIALIZER);
+        register(EntityGoalMoveThroughVillage.DESERIALIZER);
+        register(EntityGoalMoveTowardsRestriction.DESERIALIZER);
+        register(EntityGoalMoveTowardsTarget.DESERIALIZER);
+        register(EntityGoalOcelotAttack.DESERIALIZER);
+        register(EntityGoalOpenDoors.DESERIALIZER);
+        register(EntityGoalPanic.DESERIALIZER);
+        register(EntityGoalRandomLookAround.DESERIALIZER);
+        register(EntityGoalRandomStroll.DESERIALIZER);
+        register(EntityGoalRandomSwimming.DESERIALIZER);
+        register(EntityGoalRangedAttack.DESERIALIZER);
+        register(EntityGoalRangedBowAttack.DESERIALIZER);
+        register(EntityGoalRangedCrossbowAttack.DESERIALIZER);
+        register(EntityGoalRestrictSun.DESERIALIZER);
+        register(EntityGoalStrollThroughVillage.DESERIALIZER);
+        register(EntityGoalTempt.DESERIALIZER);
+        register(EntityGoalTryFindWater.DESERIALIZER);
+        register(EntityGoalUseItem.DESERIALIZER);
+        register(EntityGoalWaterAvoidingRandomFlying.DESERIALIZER);
+        register(EntityGoalWaterAvoidingRandomStroll.DESERIALIZER);
+        register(EntityGoalWolfBeg.DESERIALIZER);
+        register(EntityGoalBreed.DESERIALIZER);
+        register(EntityGoalCatSitOnBed.DESERIALIZER);
+        register(EntityGoalCatLieOnBed.DESERIALIZER);
+        register(EntityGoalIllusionerBlindnessSpell.DESERIALIZER);
+        register(EntityGoalIllusionerMirrorSpell.DESERIALIZER);
+    }
+
+    /**
+     * Get deserializer by key.
+     *
+     * @param key The key.
+     * @return The deserializer, or null if not found.
+     */
+    @Nullable
+    public static KeyedDeserializer<? extends EntityGoal<? extends Mob>> getByKey(@NotNull final NamespacedKey key) {
+        return BY_KEY.get(key);
+    }
+
+    /**
+     * Get deserializer by key, with a defined type (to prevent cluttering code with unsafe casts).
+     *
+     * @param key   The key.
+     * @param clazz The type of target goal.
+     * @param <T>   The type of mob the goal can be applied to.
+     * @return The deserializer, or null if not found.
+     */
+    @Nullable
+    @SuppressWarnings({"unchecked", "unused"})
+    public static <T extends Mob> KeyedDeserializer<EntityGoal<T>> getByKeyOfType(@NotNull final NamespacedKey key,
+                                                                                  @NotNull final Class<T> clazz) {
+        return (KeyedDeserializer<EntityGoal<T>>) BY_KEY.get(key);
+    }
+
+    /**
+     * Apply goal to entity given key and config.
+     * <p>
+     * If the key or config are invalid, the goal will not be applied.
+     *
+     * @param entity   The entity.
+     * @param key      The key.
+     * @param config   The config.
+     * @param priority The priority.
+     * @param <T>      The entity type.
+     * @return The entity.
+     */
+    @NotNull
+    @SuppressWarnings("unchecked")
+    public static <T extends Mob> T applyToEntity(@NotNull final T entity,
+                                                  @NotNull final NamespacedKey key,
+                                                  @NotNull final Config config,
+                                                  final int priority) {
+        KeyedDeserializer<EntityGoal<T>> deserializer = getByKeyOfType(key, (Class<T>) entity.getClass());
+        if (deserializer == null) {
+            return entity;
+        }
+
+        EntityGoal<T> goal = deserializer.deserialize(config);
+
+        if (goal == null) {
+            return entity;
+        }
+
+        return goal.addToEntity(entity, priority);
+    }
+
+    /**
+     * Register a deserializer for an entity goal.
+     *
+     * @param toRegister The entity goal to register.
+     * @param <T>        The type of deserializer.
+     * @return The deserializer.
+     */
+    @NotNull
+    public static <T extends KeyedDeserializer<? extends EntityGoal<?>>> T register(@NotNull final T toRegister) {
+        BY_KEY.put(toRegister.getKey(), toRegister);
+        return toRegister;
+    }
+
+    private EntityGoals() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/Goal.java

@@ -0,0 +1,24 @@
+package com.willfp.eco.core.entities.ai;
+
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A generic goal for entity AI.
+ *
+ * @param <T> The type of mob that the goal can be applied to.
+ */
+public interface Goal<T extends Mob> {
+    /**
+     * Add the entity goal to an entity.
+     * <p>
+     * The lower the priority, the higher up the execution order; so
+     * priority 0 will execute first. Lower priority (higher number) goals
+     * will only execute if all higher priority goals are stopped.
+     *
+     * @param entity   The entity.
+     * @param priority The priority.
+     * @return The entity, modified.
+     */
+    T addToEntity(@NotNull T entity, int priority);
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/GoalFlag.java

@@ -0,0 +1,26 @@
+package com.willfp.eco.core.entities.ai;
+
+/**
+ * Flags for ai goals.
+ */
+public enum GoalFlag {
+    /**
+     * Move.
+     */
+    MOVE,
+
+    /**
+     * Look around.
+     */
+    LOOK,
+
+    /**
+     * Jump.
+     */
+    JUMP,
+
+    /**
+     * Target.
+     */
+    TARGET
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/TargetGoal.java

@@ -0,0 +1,18 @@
+package com.willfp.eco.core.entities.ai;
+
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A goal for entity target AI.
+ *
+ * @param <T> The type of mob that the goal can be applied to.
+ */
+public interface TargetGoal<T extends Mob> extends Goal<T> {
+    @Override
+    default T addToEntity(@NotNull T entity, int priority) {
+        return EntityController.getFor(entity)
+                .addTargetGoal(priority, this)
+                .getEntity();
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/TargetGoals.java

@@ -0,0 +1,117 @@
+package com.willfp.eco.core.entities.ai;
+
+import com.google.common.collect.HashBiMap;
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.target.TargetGoalDefendVillage;
+import com.willfp.eco.core.entities.ai.target.TargetGoalHurtBy;
+import com.willfp.eco.core.entities.ai.target.TargetGoalNearestAttackable;
+import com.willfp.eco.core.entities.ai.target.TargetGoalNearestAttackableWitch;
+import com.willfp.eco.core.entities.ai.target.TargetGoalNearestHealableRaider;
+import com.willfp.eco.core.entities.ai.target.TargetGoalNonTameRandom;
+import com.willfp.eco.core.entities.ai.target.TargetGoalOwnerHurtBy;
+import com.willfp.eco.core.entities.ai.target.TargetGoalOwnerTarget;
+import com.willfp.eco.core.entities.ai.target.TargetGoalResetUniversalAnger;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+
+/**
+ * Class to manage target goals.
+ */
+public final class TargetGoals {
+    /**
+     * All registered deserializers.
+     */
+    private static final Map<NamespacedKey, KeyedDeserializer<? extends TargetGoal<?>>> BY_KEY = HashBiMap.create();
+
+    static {
+        register(TargetGoalDefendVillage.DESERIALIZER);
+        register(TargetGoalHurtBy.DESERIALIZER);
+        register(TargetGoalNearestAttackable.DESERIALIZER);
+        register(TargetGoalNearestAttackableWitch.DESERIALIZER);
+        register(TargetGoalNearestHealableRaider.DESERIALIZER);
+        register(TargetGoalNonTameRandom.DESERIALIZER);
+        register(TargetGoalOwnerTarget.DESERIALIZER);
+        register(TargetGoalOwnerHurtBy.DESERIALIZER);
+        register(TargetGoalResetUniversalAnger.DESERIALIZER);
+    }
+
+    /**
+     * Get deserializer by key.
+     *
+     * @param key The key.
+     * @return The deserializer, or null if not found.
+     */
+    @Nullable
+    public static KeyedDeserializer<? extends TargetGoal<? extends Mob>> getByKey(@NotNull final NamespacedKey key) {
+        return BY_KEY.get(key);
+    }
+
+    /**
+     * Get deserializer by key, with a defined type (to prevent cluttering code with unsafe casts).
+     *
+     * @param key   The key.
+     * @param clazz The type of target goal.
+     * @param <T>   The type of mob the goal can be applied to.
+     * @return The deserializer, or null if not found.
+     */
+    @Nullable
+    @SuppressWarnings({"unchecked", "unused"})
+    public static <T extends Mob> KeyedDeserializer<TargetGoal<T>> getByKeyOfType(@NotNull final NamespacedKey key,
+                                                                                  @NotNull final Class<T> clazz) {
+        return (KeyedDeserializer<TargetGoal<T>>) BY_KEY.get(key);
+    }
+
+    /**
+     * Apply goal to entity given key and config.
+     * <p>
+     * If the key or config are invalid, the goal will not be applied.
+     *
+     * @param entity   The entity.
+     * @param key      The key.
+     * @param config   The config.
+     * @param priority The priority.
+     * @param <T>      The entity type.
+     * @return The entity.
+     */
+    @NotNull
+    @SuppressWarnings("unchecked")
+    public static <T extends Mob> T applyToEntity(@NotNull final T entity,
+                                                  @NotNull final NamespacedKey key,
+                                                  @NotNull final Config config,
+                                                  final int priority) {
+        KeyedDeserializer<TargetGoal<T>> deserializer = getByKeyOfType(key, (Class<T>) entity.getClass());
+        if (deserializer == null) {
+            return entity;
+        }
+
+        TargetGoal<T> goal = deserializer.deserialize(config);
+
+        if (goal == null) {
+            return entity;
+        }
+
+        return goal.addToEntity(entity, priority);
+    }
+
+    /**
+     * Register a deserializer for a target goal.
+     *
+     * @param toRegister The target goal to register.
+     * @param <T>        The type of deserializer.
+     * @return The deserializer.
+     */
+    @NotNull
+    public static <T extends KeyedDeserializer<? extends TargetGoal<?>>> T register(@NotNull final T toRegister) {
+        BY_KEY.put(toRegister.getKey(), toRegister);
+        return toRegister;
+    }
+
+    private TargetGoals() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalAvoidEntity.java

@@ -0,0 +1,73 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.Entities;
+import com.willfp.eco.core.entities.TestableEntity;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Avoid entities.
+ *
+ * @param entity       The entity type to avoid.
+ * @param distance The distance to flee to.
+ * @param slowSpeed    The slow movement speed.
+ * @param fastSpeed    The fast movement speed.
+ */
+public record EntityGoalAvoidEntity(
+        @NotNull TestableEntity entity,
+        double distance,
+        double slowSpeed,
+        double fastSpeed
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalAvoidEntity> DESERIALIZER = new Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalAvoidEntity> {
+        @Override
+        @Nullable
+        public EntityGoalAvoidEntity deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("entity")
+                            && config.has("distance")
+                            && config.has("slowSpeed")
+                            && config.has("fastSpeed")
+            )) {
+                return null;
+            }
+
+            try {
+                TestableEntity entity = Entities.lookup(config.getString("entity"));
+
+                return new EntityGoalAvoidEntity(
+                        entity,
+                        config.getDouble("distance"),
+                        config.getDouble("slowSpeed"),
+                        config.getDouble("fastSpeed")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("avoid_entity");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalBreakDoors.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to break down doors.
+ *
+ * @param ticks The time taken to break the door. Minimum value is 240, as set by the game.
+ */
+public record EntityGoalBreakDoors(
+        int ticks
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalBreakDoors> DESERIALIZER = new EntityGoalBreakDoors.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalBreakDoors> {
+        @Override
+        @Nullable
+        public EntityGoalBreakDoors deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("ticks")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalBreakDoors(
+                        config.getInt("ticks")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("break_doors");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalBreatheAir.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Breathe air.
+ */
+public record EntityGoalBreatheAir(
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalBreatheAir> DESERIALIZER = new EntityGoalBreatheAir.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalBreatheAir> {
+        @Override
+        public EntityGoalBreatheAir deserialize(@NotNull final Config config) {
+            return new EntityGoalBreatheAir();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("breathe_air");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalBreed.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Animals;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows animals to breed.
+ *
+ * @param speed The speed at which to move to a partner.
+ */
+public record EntityGoalBreed(
+        double speed
+) implements EntityGoal<Animals> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalBreed> DESERIALIZER = new EntityGoalBreed.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalBreed> {
+        @Override
+        @Nullable
+        public EntityGoalBreed deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalBreed(
+                        config.getDouble("speed")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("breed");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalCatLieOnBed.java

@@ -0,0 +1,61 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Cat;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows a cat to lie on a bed.
+ *
+ * @param speed The speed at which to move to the bed.
+ * @param range The range at which to search for beds.
+ */
+public record EntityGoalCatLieOnBed(
+        double speed,
+        int range
+) implements EntityGoal<Cat> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalCatLieOnBed> DESERIALIZER = new EntityGoalCatLieOnBed.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalCatLieOnBed> {
+        @Override
+        @Nullable
+        public EntityGoalCatLieOnBed deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("range")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalCatLieOnBed(
+                        config.getDouble("speed"),
+                        config.getInt("range")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("cat_lie_on_bed");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalCatSitOnBed.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Cat;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows a cat to sit on a bed.
+ *
+ * @param speed The speed at which to move to the bed.
+ */
+public record EntityGoalCatSitOnBed(
+        double speed
+) implements EntityGoal<Cat> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalCatSitOnBed> DESERIALIZER = new EntityGoalCatSitOnBed.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalCatSitOnBed> {
+        @Override
+        @Nullable
+        public EntityGoalCatSitOnBed deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalCatSitOnBed(
+                        config.getDouble("speed")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("cat_sit_on_bed");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalEatGrass.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows an entity to eat the ground.
+ */
+public record EntityGoalEatGrass(
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalEatGrass> DESERIALIZER = new EntityGoalEatGrass.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalEatGrass> {
+        @Override
+        public EntityGoalEatGrass deserialize(@NotNull final Config config) {
+            return new EntityGoalEatGrass();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("eat_grass");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalFleeSun.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Will make the entity actively avoid the sunlight.
+ *
+ * @param speed The speed at which to flee.
+ */
+public record EntityGoalFleeSun(
+        double speed
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalFleeSun> DESERIALIZER = new EntityGoalFleeSun.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalFleeSun> {
+        @Override
+        @Nullable
+        public EntityGoalFleeSun deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalFleeSun(
+                        config.getDouble("speed")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("flee_sun");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalFloat.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows an entity to float on water.
+ */
+public record EntityGoalFloat(
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalFloat> DESERIALIZER = new EntityGoalFloat.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalFloat> {
+        @Override
+        public EntityGoalFloat deserialize(@NotNull final Config config) {
+            return new EntityGoalFloat();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("float");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalFollowBoats.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Follow boats.
+ */
+public record EntityGoalFollowBoats(
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalFollowBoats> DESERIALIZER = new EntityGoalFollowBoats.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalFollowBoats> {
+        @Override
+        public EntityGoalFollowBoats deserialize(@NotNull final Config config) {
+            return new EntityGoalFollowBoats();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("follow_boats");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalFollowMobs.java

@@ -0,0 +1,65 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to follow and gather around all types of mobs, both hostile and neutral mobs.
+ *
+ * @param speed       The speed at which to follow.
+ * @param minDistance The minimum follow distance.
+ * @param maxDistance The maximum follow distance.
+ */
+public record EntityGoalFollowMobs(
+        double speed,
+        double minDistance,
+        double maxDistance
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalFollowMobs> DESERIALIZER = new EntityGoalFollowMobs.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalFollowMobs> {
+        @Override
+        @Nullable
+        public EntityGoalFollowMobs deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("minDistance")
+                            && config.has("maxDistance")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalFollowMobs(
+                        config.getDouble("speed"),
+                        config.getDouble("minDistance"),
+                        config.getDouble("maxDistance")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("follow_mobs");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalIllusionerBlindnessSpell.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Illusioner;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows an illusioner to perform the blindness spell.
+ */
+public record EntityGoalIllusionerBlindnessSpell(
+) implements EntityGoal<Illusioner> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalIllusionerBlindnessSpell> DESERIALIZER = new EntityGoalIllusionerBlindnessSpell.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalIllusionerBlindnessSpell> {
+        @Override
+        public EntityGoalIllusionerBlindnessSpell deserialize(@NotNull final Config config) {
+            return new EntityGoalIllusionerBlindnessSpell();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("illusioner_blindness_spell");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalIllusionerMirrorSpell.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Illusioner;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows an illusioner to perform the mirror spell.
+ */
+public record EntityGoalIllusionerMirrorSpell(
+) implements EntityGoal<Illusioner> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalIllusionerMirrorSpell> DESERIALIZER = new EntityGoalIllusionerMirrorSpell.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalIllusionerMirrorSpell> {
+        @Override
+        public EntityGoalIllusionerMirrorSpell deserialize(@NotNull final Config config) {
+            return new EntityGoalIllusionerMirrorSpell();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("illusioner_mirror_spell");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalInteract.java

@@ -0,0 +1,67 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.Entities;
+import com.willfp.eco.core.entities.TestableEntity;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interact with other mobs.
+ *
+ * @param target The type of entity to interact with.
+ * @param range  The range at which to interact.
+ * @param chance The chance for interaction, between 0 and 1.
+ */
+public record EntityGoalInteract(
+        @NotNull TestableEntity target,
+        double range,
+        double chance
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalInteract> DESERIALIZER = new EntityGoalInteract.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalInteract> {
+        @Override
+        @Nullable
+        public EntityGoalInteract deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("target")
+                            && config.has("range")
+                            && config.has("chance")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalInteract(
+                        Entities.lookup(config.getString("target")),
+                        config.getDouble("range"),
+                        config.getDouble("chance")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("interact");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalLeapAtTarget.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to jump towards a target.
+ *
+ * @param velocity The leap velocity.
+ */
+public record EntityGoalLeapAtTarget(
+        double velocity
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalLeapAtTarget> DESERIALIZER = new EntityGoalLeapAtTarget.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalLeapAtTarget> {
+        @Override
+        @Nullable
+        public EntityGoalLeapAtTarget deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("velocity")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalLeapAtTarget(
+                        config.getDouble("velocity")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("leap_at_target");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalLookAtPlayer.java

@@ -0,0 +1,61 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to look at the player by rotating the head bone pose within a set limit.
+ *
+ * @param range  The range at which to look at the player.
+ * @param chance The chance to look at the player, between 0 and 1.
+ */
+public record EntityGoalLookAtPlayer(
+        double range,
+        double chance
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalLookAtPlayer> DESERIALIZER = new EntityGoalLookAtPlayer.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalLookAtPlayer> {
+        @Override
+        @Nullable
+        public EntityGoalLookAtPlayer deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("range")
+                            && config.has("chance")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalLookAtPlayer(
+                        config.getDouble("range"),
+                        config.getDouble("chance")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("look_at_player");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalMeleeAttack.java

@@ -0,0 +1,61 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows entities to make close combat melee attacks.
+ *
+ * @param speed            The speed at which to attack the target.
+ * @param pauseWhenMobIdle If the entity should pause attacking when the target is idle.
+ */
+public record EntityGoalMeleeAttack(
+        double speed,
+        boolean pauseWhenMobIdle
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalMeleeAttack> DESERIALIZER = new EntityGoalMeleeAttack.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalMeleeAttack> {
+        @Override
+        @Nullable
+        public EntityGoalMeleeAttack deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("pauseWhenMobIdle")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalMeleeAttack(
+                        config.getDouble("speed"),
+                        config.getBool("pauseWhenMobIdle")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("melee_attack");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalMoveBackToVillage.java

@@ -0,0 +1,61 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to navigate and search for a nearby village.
+ *
+ * @param speed      The speed at which to move back to the village.
+ * @param canDespawn If the entity can despawn.
+ */
+public record EntityGoalMoveBackToVillage(
+        double speed,
+        boolean canDespawn
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalMoveBackToVillage> DESERIALIZER = new EntityGoalMoveBackToVillage.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalMoveBackToVillage> {
+        @Override
+        @Nullable
+        public EntityGoalMoveBackToVillage deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("canDespawn")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalMoveBackToVillage(
+                        config.getDouble("speed"),
+                        config.getBool("canDespawn")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("move_back_to_village");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalMoveThroughVillage.java

@@ -0,0 +1,69 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows the entity to create paths around the village.
+ *
+ * @param speed               The speed at which to move through the village.
+ * @param onlyAtNight         If the entity can only move through village at night.
+ * @param distance            The distance to move through the village.
+ * @param canPassThroughDoors If the entity can pass through doors.
+ */
+public record EntityGoalMoveThroughVillage(
+        double speed,
+        boolean onlyAtNight,
+        int distance,
+        boolean canPassThroughDoors
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalMoveThroughVillage> DESERIALIZER = new EntityGoalMoveThroughVillage.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalMoveThroughVillage> {
+        @Override
+        @Nullable
+        public EntityGoalMoveThroughVillage deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("onlyAtNight")
+                            && config.has("distance")
+                            && config.has("canPassThroughDoors")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalMoveThroughVillage(
+                        config.getDouble("speed"),
+                        config.getBool("onlyAtNight"),
+                        config.getInt("distance"),
+                        config.getBool("canPassThroughDoors")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("move_through_village");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalMoveTowardsRestriction.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Move towards restriction.
+ *
+ * @param speed The speed at which to move towards the restriction.
+ */
+public record EntityGoalMoveTowardsRestriction(
+        double speed
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalMoveTowardsRestriction> DESERIALIZER = new EntityGoalMoveTowardsRestriction.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalMoveTowardsRestriction> {
+        @Override
+        @Nullable
+        public EntityGoalMoveTowardsRestriction deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalMoveTowardsRestriction(
+                        config.getDouble("speed")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("move_towards_restriction");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalMoveTowardsTarget.java

@@ -0,0 +1,61 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to move towards a target.
+ *
+ * @param speed       The speed at which to move towards the target.
+ * @param maxDistance The maximum distance the target can be where the entity will still move towards it.
+ */
+public record EntityGoalMoveTowardsTarget(
+        double speed,
+        double maxDistance
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalMoveTowardsTarget> DESERIALIZER = new EntityGoalMoveTowardsTarget.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalMoveTowardsTarget> {
+        @Override
+        @Nullable
+        public EntityGoalMoveTowardsTarget deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("maxDistance")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalMoveTowardsTarget(
+                        config.getDouble("speed"),
+                        config.getDouble("maxDistance")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("move_towards_target");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalOcelotAttack.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Attack like an ocelot.
+ */
+public record EntityGoalOcelotAttack(
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalOcelotAttack> DESERIALIZER = new EntityGoalOcelotAttack.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalOcelotAttack> {
+        @Override
+        public EntityGoalOcelotAttack deserialize(@NotNull final Config config) {
+            return new EntityGoalOcelotAttack();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("ocelot_attack");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalOpenDoors.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to interact and open a door.
+ *
+ * @param delayClosing If closing the door should be delayed.
+ */
+public record EntityGoalOpenDoors(
+        boolean delayClosing
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalOpenDoors> DESERIALIZER = new EntityGoalOpenDoors.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalOpenDoors> {
+        @Override
+        @Nullable
+        public EntityGoalOpenDoors deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("delayClosing")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalOpenDoors(
+                        config.getBool("delayClosing")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("open_doors");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalPanic.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to react when it receives damage.
+ *
+ * @param speed The speed at which to panic.
+ */
+public record EntityGoalPanic(
+        double speed
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalPanic> DESERIALIZER = new EntityGoalPanic.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalPanic> {
+        @Override
+        @Nullable
+        public EntityGoalPanic deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalPanic(
+                        config.getDouble("speed")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("panic");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalRandomLookAround.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows an entity to choose a random direction to look in for a random duration within a range.
+ */
+public record EntityGoalRandomLookAround(
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalRandomLookAround> DESERIALIZER = new EntityGoalRandomLookAround.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalRandomLookAround> {
+        @Override
+        public EntityGoalRandomLookAround deserialize(@NotNull final Config config) {
+            return new EntityGoalRandomLookAround();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("random_look_around");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalRandomStroll.java

@@ -0,0 +1,65 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to choose a random direction to walk towards.
+ *
+ * @param speed      The speed at which to move around.
+ * @param interval   The amount of ticks to wait (on average) between strolling around.
+ * @param canDespawn If the entity can despawn.
+ */
+public record EntityGoalRandomStroll(
+        double speed,
+        int interval,
+        boolean canDespawn
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalRandomStroll> DESERIALIZER = new EntityGoalRandomStroll.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalRandomStroll> {
+        @Override
+        @Nullable
+        public EntityGoalRandomStroll deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("interval")
+                            && config.has("canDespawn")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalRandomStroll(
+                        config.getDouble("speed"),
+                        config.getInt("interval"),
+                        config.getBool("canDespawn")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("random_stroll");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalRandomSwimming.java

@@ -0,0 +1,61 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to swim in a random point in water.
+ *
+ * @param speed    The speed at which to move around.
+ * @param interval The amount of ticks to wait (on average) between strolling around.
+ */
+public record EntityGoalRandomSwimming(
+        double speed,
+        int interval
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalRandomSwimming> DESERIALIZER = new EntityGoalRandomSwimming.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalRandomSwimming> {
+        @Override
+        @Nullable
+        public EntityGoalRandomSwimming deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("interval")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalRandomSwimming(
+                        config.getDouble("speed"),
+                        config.getInt("interval")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("random_swimming");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalRangedAttack.java

@@ -0,0 +1,71 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Ranged attack.
+ * <p>
+ * Only supports mobs that have ranged attacks.
+ *
+ * @param speed       The speed.
+ * @param minInterval The minimum interval between attacks (in ticks).
+ * @param maxInterval The maximum interval between attacks (in ticks).
+ * @param maxRange    The max range at which to attack.
+ */
+public record EntityGoalRangedAttack(
+        double speed,
+        int minInterval,
+        int maxInterval,
+        double maxRange
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalRangedAttack> DESERIALIZER = new EntityGoalRangedAttack.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalRangedAttack> {
+        @Override
+        @Nullable
+        public EntityGoalRangedAttack deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("minInterval")
+                            && config.has("maxInterval")
+                            && config.has("range")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalRangedAttack(
+                        config.getDouble("speed"),
+                        config.getInt("minInterval"),
+                        config.getInt("maxInterval"),
+                        config.getDouble("range")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("ranged_attack");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalRangedBowAttack.java

@@ -0,0 +1,67 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Monster;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Ranged attack.
+ * <p>
+ * Only supports monsters that have bow attacks.
+ *
+ * @param speed          The speed.
+ * @param interval The interval between attacks (in ticks).
+ * @param range          The max range at which to attack.
+ */
+public record EntityGoalRangedBowAttack(
+        double speed,
+        int interval,
+        double range
+) implements EntityGoal<Monster> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalRangedBowAttack> DESERIALIZER = new EntityGoalRangedBowAttack.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalRangedBowAttack> {
+        @Override
+        @Nullable
+        public EntityGoalRangedBowAttack deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("interval")
+                            && config.has("range")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalRangedBowAttack(
+                        config.getDouble("speed"),
+                        config.getInt("interval"),
+                        config.getDouble("range")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("ranged_bow_attack");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalRangedCrossbowAttack.java

@@ -0,0 +1,63 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Monster;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Ranged attack.
+ * <p>
+ * Only supports monsters that have crossbow attacks.
+ *
+ * @param speed The speed.
+ * @param range The max range at which to attack.
+ */
+public record EntityGoalRangedCrossbowAttack(
+        double speed,
+        double range
+) implements EntityGoal<Monster> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalRangedCrossbowAttack> DESERIALIZER = new EntityGoalRangedCrossbowAttack.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalRangedCrossbowAttack> {
+        @Override
+        @Nullable
+        public EntityGoalRangedCrossbowAttack deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("range")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalRangedCrossbowAttack(
+                        config.getDouble("speed"),
+                        config.getDouble("range")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("ranged_crossbow_attack");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalRestrictSun.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows an entity to actively avoid direct sunlight.
+ */
+public record EntityGoalRestrictSun(
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalRestrictSun> DESERIALIZER = new EntityGoalRestrictSun.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalRestrictSun> {
+        @Override
+        public EntityGoalRestrictSun deserialize(@NotNull final Config config) {
+            return new EntityGoalRestrictSun();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("restrict_sun");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalStrollThroughVillage.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows the entity to create paths around the village.
+ *
+ * @param searchRange The search range.
+ */
+public record EntityGoalStrollThroughVillage(
+        int searchRange
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalStrollThroughVillage> DESERIALIZER = new EntityGoalStrollThroughVillage.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalStrollThroughVillage> {
+        @Override
+        @Nullable
+        public EntityGoalStrollThroughVillage deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("searchRange")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalStrollThroughVillage(
+                        config.getInt("searchRange")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("stroll_through_village");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalTempt.java

@@ -0,0 +1,88 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.items.Items;
+import com.willfp.eco.core.items.TestableItem;
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Allows an entity to be tempted by a set item.
+ *
+ * @param speed       The speed at which the entity follows the item.
+ * @param items       The items that the entity will be attracted by.
+ * @param canBeScared If the entity can be scared and lose track of the item.
+ */
+public record EntityGoalTempt(
+        double speed,
+        @NotNull Collection<TestableItem> items,
+        boolean canBeScared
+) implements EntityGoal<Mob> {
+    /**
+     * @param speed       The speed at which the entity follows the item.
+     * @param item        The item that the entity will be attracted by.
+     * @param canBeScared If the entity can be scared and lose track of the item.
+     */
+    public EntityGoalTempt(final double speed,
+                           @NotNull final TestableItem item,
+                           final boolean canBeScared) {
+        this(speed, List.of(item), canBeScared);
+    }
+
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalTempt> DESERIALIZER = new EntityGoalTempt.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalTempt> {
+        @Override
+        @Nullable
+        public EntityGoalTempt deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("items")
+                            && config.has("canBeScared")
+            )) {
+                return null;
+            }
+
+            try {
+                Collection<TestableItem> items = config.getStrings("items").stream()
+                        .map(Items::lookup)
+                        .filter(it -> !(it instanceof EmptyTestableItem))
+                        .collect(Collectors.toList());
+
+                return new EntityGoalTempt(
+                        config.getDouble("speed"),
+                        items,
+                        config.getBool("canBeScared")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("tempt");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalTryFindWater.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows an entity to move to water when on land.
+ */
+public record EntityGoalTryFindWater(
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalTryFindWater> DESERIALIZER = new EntityGoalTryFindWater.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalTryFindWater> {
+        @Override
+        public EntityGoalTryFindWater deserialize(@NotNull final Config config) {
+            return new EntityGoalTryFindWater();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("try_find_water");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalUseItem.java

@@ -0,0 +1,75 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.Entities;
+import com.willfp.eco.core.entities.TestableEntity;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.items.Items;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Sound;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Mob;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
+
+/**
+ * Use item.
+ *
+ * @param item      The item.
+ * @param sound     The sound to play on use.
+ * @param condition The condition when to use the item.
+ */
+public record EntityGoalUseItem(
+        @NotNull ItemStack item,
+        @NotNull Sound sound,
+        @NotNull Predicate<LivingEntity> condition
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalUseItem> DESERIALIZER = new EntityGoalUseItem.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalUseItem> {
+        @Override
+        @Nullable
+        public EntityGoalUseItem deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("item")
+                            && config.has("sound")
+                            && config.has("condition")
+            )) {
+                return null;
+            }
+
+            try {
+                TestableEntity filter = Entities.lookup(config.getString("condition"));
+
+                return new EntityGoalUseItem(
+                        Items.lookup(config.getString("item")).getItem(),
+                        Sound.valueOf(config.getString("sound").toUpperCase()),
+                        filter::matches
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("use_item");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalWaterAvoidingRandomFlying.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Fly randomly while avoiding water.
+ *
+ * @param speed The speed.
+ */
+public record EntityGoalWaterAvoidingRandomFlying(
+        double speed
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalWaterAvoidingRandomFlying> DESERIALIZER = new EntityGoalWaterAvoidingRandomFlying.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalWaterAvoidingRandomFlying> {
+        @Override
+        @Nullable
+        public EntityGoalWaterAvoidingRandomFlying deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalWaterAvoidingRandomFlying(
+                        config.getDouble("speed")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("water_avoiding_random_flying");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalWaterAvoidingRandomStroll.java

@@ -0,0 +1,61 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Stroll randomly while avoiding water.
+ *
+ * @param speed  The speed.
+ * @param chance The chance to stroll every tick, between 0 and 1.
+ */
+public record EntityGoalWaterAvoidingRandomStroll(
+        double speed,
+        double chance
+) implements EntityGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalWaterAvoidingRandomStroll> DESERIALIZER = new EntityGoalWaterAvoidingRandomStroll.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalWaterAvoidingRandomStroll> {
+        @Override
+        @Nullable
+        public EntityGoalWaterAvoidingRandomStroll deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("speed")
+                            && config.has("chance")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalWaterAvoidingRandomStroll(
+                        config.getDouble("speed"),
+                        config.getDouble("chance")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("water_avoiding_random_stroll");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/entity/EntityGoalWolfBeg.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.core.entities.ai.entity;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.EntityGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Wolf;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows a wolf to beg.
+ *
+ * @param distance The distance at which to beg from.
+ */
+public record EntityGoalWolfBeg(
+        double distance
+) implements EntityGoal<Wolf> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<EntityGoalWolfBeg> DESERIALIZER = new EntityGoalWolfBeg.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<EntityGoalWolfBeg> {
+        @Override
+        @Nullable
+        public EntityGoalWolfBeg deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("distance")
+            )) {
+                return null;
+            }
+
+            try {
+                return new EntityGoalWolfBeg(
+                        config.getDouble("distance")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("wolf_beg");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalDefendVillage.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.target;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.TargetGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.IronGolem;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Defend village.
+ */
+public record TargetGoalDefendVillage(
+) implements TargetGoal<IronGolem> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<TargetGoalDefendVillage> DESERIALIZER = new TargetGoalDefendVillage.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<TargetGoalDefendVillage> {
+        @Override
+        public TargetGoalDefendVillage deserialize(@NotNull final Config config) {
+            return new TargetGoalDefendVillage();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("defend_village");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalHurtBy.java

@@ -0,0 +1,60 @@
+package com.willfp.eco.core.entities.ai.target;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.Entities;
+import com.willfp.eco.core.entities.TestableEntity;
+import com.willfp.eco.core.entities.ai.TargetGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Allows an entity to react when hit by set target.
+ *
+ * @param blacklist The entities not to attack when hurt by.
+ */
+@SuppressWarnings({"varargs"})
+public record TargetGoalHurtBy(
+        @NotNull TestableEntity blacklist
+) implements TargetGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<TargetGoalHurtBy> DESERIALIZER = new TargetGoalHurtBy.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<TargetGoalHurtBy> {
+        @Override
+        @Nullable
+        public TargetGoalHurtBy deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("blacklist")
+            )) {
+                return null;
+            }
+
+            try {
+                return new TargetGoalHurtBy(
+                        Entities.lookup(config.getString("blacklist"))
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("hurt_by");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalNearestAttackable.java

@@ -0,0 +1,101 @@
+package com.willfp.eco.core.entities.ai.target;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.Entities;
+import com.willfp.eco.core.entities.TestableEntity;
+import com.willfp.eco.core.entities.ai.TargetGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Raider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
+
+/**
+ * Allows an entity to attack the closest target within a given subset of specific target types.
+ *
+ * @param target           The type of entities to attack.
+ * @param checkVisibility  If visibility should be checked.
+ * @param checkCanNavigate If navigation should be checked.
+ * @param reciprocalChance 1 in reciprocalChance chance of not activating on any tick.
+ * @param targetFilter     The filter for targets to match.
+ */
+public record TargetGoalNearestAttackable(
+        @NotNull TestableEntity target,
+        boolean checkVisibility,
+        boolean checkCanNavigate,
+        int reciprocalChance,
+        @NotNull Predicate<LivingEntity> targetFilter
+) implements TargetGoal<Raider> {
+    /**
+     * @param target           The type of entities to attack.
+     * @param checkVisibility  If visibility should be checked.
+     * @param checkCanNavigate If navigation should be checked.
+     * @param reciprocalChance 1 in reciprocalChance chance of not activating on any tick.
+     */
+    public TargetGoalNearestAttackable(@NotNull final TestableEntity target,
+                                       final boolean checkVisibility,
+                                       final boolean checkCanNavigate,
+                                       final int reciprocalChance) {
+        this(target, checkVisibility, checkCanNavigate, reciprocalChance, it -> true);
+    }
+
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<TargetGoalNearestAttackable> DESERIALIZER = new TargetGoalNearestAttackable.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<TargetGoalNearestAttackable> {
+        @Override
+        @Nullable
+        public TargetGoalNearestAttackable deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("target")
+                            && config.has("checkVisibility")
+                            && config.has("checkCanNavigate")
+                            && config.has("reciprocalChance")
+            )) {
+                return null;
+            }
+
+            try {
+                if (config.has("targetFilter")) {
+                    TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
+
+                    return new TargetGoalNearestAttackable(
+                            Entities.lookup(config.getString("target")),
+                            config.getBool("checkVisibility"),
+                            config.getBool("checkCanNavigate"),
+                            config.getInt("reciprocalChance"),
+                            filter::matches
+                    );
+                } else {
+                    return new TargetGoalNearestAttackable(
+                            Entities.lookup(config.getString("target")),
+                            config.getBool("checkVisibility"),
+                            config.getBool("checkCanNavigate"),
+                            config.getInt("reciprocalChance")
+                    );
+                }
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("nearest_attackable");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalNearestAttackableWitch.java

@@ -0,0 +1,101 @@
+package com.willfp.eco.core.entities.ai.target;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.Entities;
+import com.willfp.eco.core.entities.TestableEntity;
+import com.willfp.eco.core.entities.ai.TargetGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Raider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
+
+/**
+ * Allows an entity to attack the closest target within a given subset of specific target types.
+ *
+ * @param target           The type of entities to attack.
+ * @param checkVisibility  If visibility should be checked.
+ * @param checkCanNavigate If navigation should be checked.
+ * @param reciprocalChance 1 in reciprocalChance chance of not activating on any tick.
+ * @param targetFilter     The filter for targets to match.
+ */
+public record TargetGoalNearestAttackableWitch(
+        @NotNull TestableEntity target,
+        boolean checkVisibility,
+        boolean checkCanNavigate,
+        int reciprocalChance,
+        @NotNull Predicate<LivingEntity> targetFilter
+) implements TargetGoal<Raider> {
+    /**
+     * @param target           The type of entities to attack.
+     * @param checkVisibility  If visibility should be checked.
+     * @param checkCanNavigate If navigation should be checked.
+     * @param reciprocalChance 1 in reciprocalChance chance of not activating on any tick.
+     */
+    public TargetGoalNearestAttackableWitch(@NotNull final TestableEntity target,
+                                            final boolean checkVisibility,
+                                            final boolean checkCanNavigate,
+                                            final int reciprocalChance) {
+        this(target, checkVisibility, checkCanNavigate, reciprocalChance, it -> true);
+    }
+
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<TargetGoalNearestAttackableWitch> DESERIALIZER = new TargetGoalNearestAttackableWitch.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<TargetGoalNearestAttackableWitch> {
+        @Override
+        @Nullable
+        public TargetGoalNearestAttackableWitch deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("target")
+                            && config.has("checkVisibility")
+                            && config.has("checkCanNavigate")
+                            && config.has("reciprocalChance")
+            )) {
+                return null;
+            }
+
+            try {
+                if (config.has("targetFilter")) {
+                    TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
+
+                    return new TargetGoalNearestAttackableWitch(
+                            Entities.lookup(config.getString("target")),
+                            config.getBool("checkVisibility"),
+                            config.getBool("checkCanNavigate"),
+                            config.getInt("reciprocalChance"),
+                            filter::matches
+                    );
+                } else {
+                    return new TargetGoalNearestAttackableWitch(
+                            Entities.lookup(config.getString("target")),
+                            config.getBool("checkVisibility"),
+                            config.getBool("checkCanNavigate"),
+                            config.getInt("reciprocalChance")
+                    );
+                }
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("nearest_attackable_witch");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalNearestHealableRaider.java

@@ -0,0 +1,87 @@
+package com.willfp.eco.core.entities.ai.target;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.Entities;
+import com.willfp.eco.core.entities.TestableEntity;
+import com.willfp.eco.core.entities.ai.TargetGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Raider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
+
+/**
+ * Target nearest attackable raider.
+ *
+ * @param target          The types of entities to heal.
+ * @param checkVisibility If visibility should be checked.
+ * @param targetFilter    The filter for targets to match.
+ */
+public record TargetGoalNearestHealableRaider(
+        @NotNull TestableEntity target,
+        boolean checkVisibility,
+        @NotNull Predicate<LivingEntity> targetFilter
+) implements TargetGoal<Raider> {
+    /**
+     * @param target          The target.
+     * @param checkVisibility If visibility should be checked.
+     */
+    public TargetGoalNearestHealableRaider(@NotNull final TestableEntity target,
+                                           final boolean checkVisibility) {
+        this(target, checkVisibility, it -> true);
+    }
+
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<TargetGoalNearestHealableRaider> DESERIALIZER = new TargetGoalNearestHealableRaider.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<TargetGoalNearestHealableRaider> {
+        @Override
+        @Nullable
+        public TargetGoalNearestHealableRaider deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("target")
+                            && config.has("checkVisibility")
+            )) {
+                return null;
+            }
+
+            try {
+                if (config.has("targetFilter")) {
+                    TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
+
+                    return new TargetGoalNearestHealableRaider(
+                            Entities.lookup(config.getString("target")),
+                            config.getBool("checkVisibility"),
+                            filter::matches
+                    );
+                } else {
+                    return new TargetGoalNearestHealableRaider(
+                            Entities.lookup(config.getString("target")),
+                            config.getBool("checkVisibility")
+                    );
+                }
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("nearest_healable_raider");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalNonTameRandom.java

@@ -0,0 +1,87 @@
+package com.willfp.eco.core.entities.ai.target;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.Entities;
+import com.willfp.eco.core.entities.TestableEntity;
+import com.willfp.eco.core.entities.ai.TargetGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Tameable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
+
+/**
+ * Target random non-tame entity.
+ *
+ * @param target          The types of entities to heal.
+ * @param checkVisibility If visibility should be checked.
+ * @param targetFilter    The filter for targets to match.
+ */
+public record TargetGoalNonTameRandom(
+        @NotNull TestableEntity target,
+        boolean checkVisibility,
+        @NotNull Predicate<LivingEntity> targetFilter
+) implements TargetGoal<Tameable> {
+    /**
+     * @param target          The types of entities to heal.
+     * @param checkVisibility If visibility should be checked.
+     */
+    public TargetGoalNonTameRandom(@NotNull final TestableEntity target,
+                                   final boolean checkVisibility) {
+        this(target, checkVisibility, it -> true);
+    }
+
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<TargetGoalNonTameRandom> DESERIALIZER = new TargetGoalNonTameRandom.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<TargetGoalNonTameRandom> {
+        @Override
+        @Nullable
+        public TargetGoalNonTameRandom deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("targetClass")
+                            && config.has("checkVisibility")
+            )) {
+                return null;
+            }
+
+            try {
+                if (config.has("targetFilter")) {
+                    TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
+
+                    return new TargetGoalNonTameRandom(
+                            Entities.lookup(config.getString("target")),
+                            config.getBool("checkVisibility"),
+                            filter::matches
+                    );
+                } else {
+                    return new TargetGoalNonTameRandom(
+                            Entities.lookup(config.getString("target")),
+                            config.getBool("checkVisibility")
+                    );
+                }
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("non_tame_random");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalOwnerHurtBy.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.target;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.TargetGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Tameable;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows an entity to react when the owner is hit by a target.
+ */
+public record TargetGoalOwnerHurtBy(
+) implements TargetGoal<Tameable> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<TargetGoalOwnerHurtBy> DESERIALIZER = new TargetGoalOwnerHurtBy.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<TargetGoalOwnerHurtBy> {
+        @Override
+        public TargetGoalOwnerHurtBy deserialize(@NotNull final Config config) {
+            return new TargetGoalOwnerHurtBy();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("owner_hurt_by");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalOwnerTarget.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.entities.ai.target;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.TargetGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Tameable;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows an entity to react when the owner hits a target.
+ */
+public record TargetGoalOwnerTarget(
+) implements TargetGoal<Tameable> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<TargetGoalOwnerTarget> DESERIALIZER = new TargetGoalOwnerTarget.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<TargetGoalOwnerTarget> {
+        @Override
+        public TargetGoalOwnerTarget deserialize(@NotNull final Config config) {
+            return new TargetGoalOwnerTarget();
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("owner_target");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/ai/target/TargetGoalResetUniversalAnger.java

@@ -0,0 +1,59 @@
+package com.willfp.eco.core.entities.ai.target;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.entities.ai.TargetGoal;
+import com.willfp.eco.core.serialization.KeyedDeserializer;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Mob;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Reset universal anger.
+ * <p>
+ * Can only be applied to neutral mobs.
+ *
+ * @param triggerOthers If this should cause other nearby entities to trigger.
+ */
+public record TargetGoalResetUniversalAnger(
+        boolean triggerOthers
+) implements TargetGoal<Mob> {
+    /**
+     * The deserializer for the goal.
+     */
+    public static final KeyedDeserializer<TargetGoalResetUniversalAnger> DESERIALIZER = new TargetGoalResetUniversalAnger.Deserializer();
+
+    /**
+     * Deserialize configs into the goal.
+     */
+    private static final class Deserializer implements KeyedDeserializer<TargetGoalResetUniversalAnger> {
+        @Override
+        @Nullable
+        public TargetGoalResetUniversalAnger deserialize(@NotNull final Config config) {
+            if (!(
+                    config.has("triggerOthers")
+            )) {
+                return null;
+            }
+
+            try {
+                return new TargetGoalResetUniversalAnger(
+                        config.getBool("triggerOthers")
+                );
+            } catch (Exception e) {
+                /*
+                Exceptions could be caused by configs having values of a wrong type,
+                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
+                so we encapsulate them as null.
+                 */
+                return null;
+            }
+        }
+
+        @NotNull
+        @Override
+        public NamespacedKey getKey() {
+            return NamespacedKey.minecraft("reset_universal_anger");
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/entities/impl/GroupedTestableEntities.java

@@ -0,0 +1,68 @@
+package com.willfp.eco.core.entities.impl;
+
+import com.willfp.eco.core.entities.TestableEntity;
+import com.willfp.eco.util.NumberUtils;
+import org.apache.commons.lang.Validate;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * A group of testable entities.
+ *
+ * @see com.willfp.eco.core.entities.CustomEntity
+ */
+public class GroupedTestableEntities implements TestableEntity {
+    /**
+     * The children.
+     */
+    private final Collection<TestableEntity> children;
+
+    /**
+     * Create a new group of testable entities.
+     *
+     * @param children The children.
+     */
+    public GroupedTestableEntities(@NotNull final Collection<TestableEntity> children) {
+        Validate.isTrue(!children.isEmpty(), "Group must have at least one child!");
+
+        this.children = children;
+    }
+
+    /**
+     * If the item matches any children.
+     *
+     * @param entity The entity to test.
+     * @return If the entity matches the test of any children.
+     */
+    @Override
+    public boolean matches(@Nullable final Entity entity) {
+        for (TestableEntity child : children) {
+            if (child.matches(entity)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public Entity spawn(@NotNull final Location location) {
+        return new ArrayList<>(children)
+                .get(NumberUtils.randInt(0, children.size() - 1))
+                .spawn(location);
+    }
+
+    /**
+     * Get the children.
+     *
+     * @return The children.
+     */
+    public Collection<TestableEntity> getChildren() {
+        return new ArrayList<>(children);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java

@@ -22,8 +22,30 @@ public interface FastItemStack {
      *
      * @param checkStored If stored NBT should also be checked.
      * @return A map of all enchantments.
+     * @deprecated Poorly named method. Use getEnchants instead.
      */
-    Map<Enchantment, Integer> getEnchantmentsOnItem(boolean checkStored);
+    @Deprecated(since = "6.24.0")
+    default Map<Enchantment, Integer> getEnchantmentsOnItem(boolean checkStored) {
+        return getEnchants(checkStored);
+    }
+
+    /**
+     * Get all enchantments on an item.
+     * Does not account for stored enchants.
+     *
+     * @return A map of all enchantments.
+     */
+    default Map<Enchantment, Integer> getEnchants() {
+        return getEnchants(false);
+    }
+
+    /**
+     * Get all enchantments on an item.
+     *
+     * @param checkStored If stored enchantments should be accounted for.
+     * @return A map of all enchantments.
+     */
+    Map<Enchantment, Integer> getEnchants(boolean checkStored);
 
     /**
      * Get the level of an enchantment on an item.

eco-api/src/main/java/com/willfp/eco/core/gui/slot/FillerMask.java

@@ -1,6 +1,8 @@
 package com.willfp.eco.core.gui.slot;
 
 import com.willfp.eco.core.items.builder.ItemStackBuilder;
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
+import com.willfp.eco.core.recipe.parts.MaterialTestableItem;
 import com.willfp.eco.util.ListUtils;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -38,7 +40,7 @@ public class FillerMask {
      */
     public FillerMask(@NotNull final Material material,
                       @NotNull final String... pattern) {
-        this(new MaskMaterials(material), pattern);
+        this(new MaskItems(new MaterialTestableItem(material)), pattern);
     }
 
     /**
@@ -46,17 +48,33 @@ public class FillerMask {
      *
      * @param materials The mask materials.
      * @param pattern   The pattern.
+     * @deprecated Use {@link MaskItems} instead.
      */
+    @Deprecated(since = "6.24.0")
     public FillerMask(@NotNull final MaskMaterials materials,
                       @NotNull final String... pattern) {
-        if (Arrays.stream(materials.materials()).anyMatch(material -> material == Material.AIR)) {
-            throw new IllegalArgumentException("Materials cannot be air!");
+        this(
+                materials.toMaskItems(),
+                pattern
+        );
+    }
+
+    /**
+     * Create a new filler mask.
+     *
+     * @param items   The mask items.
+     * @param pattern The pattern.
+     */
+    public FillerMask(@NotNull final MaskItems items,
+                      @NotNull final String... pattern) {
+        if (Arrays.stream(items.items()).anyMatch(item -> item instanceof EmptyTestableItem)) {
+            throw new IllegalArgumentException("Items cannot be empty!");
         }
 
         mask = ListUtils.create2DList(6, 9);
 
-        for (int i = 0; i < materials.materials().length; i++) {
-            ItemStack itemStack = new ItemStackBuilder(materials.materials()[i])
+        for (int i = 0; i < items.items().length; i++) {
+            ItemStack itemStack = new ItemStackBuilder(items.items()[i])
                     .setDisplayName("&r")
                     .build();
 

eco-api/src/main/java/com/willfp/eco/core/gui/slot/MaskItems.java

@@ -0,0 +1,45 @@
+package com.willfp.eco.core.gui.slot;
+
+import com.willfp.eco.core.items.Items;
+import com.willfp.eco.core.items.TestableItem;
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
+import com.willfp.eco.core.recipe.parts.MaterialTestableItem;
+import org.bukkit.Material;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Mask materials store a set of items which can be accessed by
+ * a filler mask.
+ *
+ * @param items The items.
+ */
+public record MaskItems(@NotNull TestableItem... items) {
+    /**
+     * Create MaskItems from a list of item names.
+     *
+     * @param names The names.
+     * @return The mask items.
+     */
+    public static MaskItems fromItemNames(@NotNull final Iterable<String> names) {
+        List<TestableItem> items = new ArrayList<>();
+
+        for (String name : names) {
+            TestableItem item = Items.lookup(name);
+
+            if (item instanceof EmptyTestableItem) {
+                continue;
+            }
+
+            items.add(item);
+        }
+
+        if (items.isEmpty()) {
+            return new MaskItems(new MaterialTestableItem(Material.BLACK_STAINED_GLASS_PANE));
+        }
+
+        return new MaskItems(items.toArray(new TestableItem[0]));
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/gui/slot/MaskMaterials.java

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.gui.slot;
 
+import com.willfp.eco.core.items.Items;
 import org.bukkit.Material;
 import org.jetbrains.annotations.NotNull;
 
@@ -8,7 +9,16 @@ import org.jetbrains.annotations.NotNull;
  * a filler mask.
  *
  * @param materials The materials.
+ * @deprecated Use {@link MaskItems} instead.
  */
+@Deprecated(since = "6.24.0")
 public record MaskMaterials(@NotNull Material... materials) {
-
+    /**
+     * Convert MaskMaterials to MaskItems.
+     *
+     * @return The MaskItems.
+     */
+    public MaskItems toMaskItems() {
+        return new MaskItems(Items.fromMaterials(this.materials()));
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/gui/slot/SlotBuilder.java

@@ -2,6 +2,7 @@ package com.willfp.eco.core.gui.slot;
 
 import com.willfp.eco.core.gui.slot.functional.SlotHandler;
 import com.willfp.eco.core.gui.slot.functional.SlotModifier;
+import com.willfp.eco.core.gui.slot.functional.SlotUpdater;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.jetbrains.annotations.NotNull;
 
@@ -106,8 +107,23 @@ public interface SlotBuilder {
      *
      * @param modifier The modifier.
      * @return The builder.
+     * @deprecated Use {@link SlotBuilder#setUpdater(SlotUpdater)} instead.
      */
-    SlotBuilder setModifier(@NotNull SlotModifier modifier);
+    @Deprecated
+    default SlotBuilder setModifier(@NotNull SlotModifier modifier) {
+        return setUpdater((player, menu, previous) -> {
+            modifier.modify(player, menu, previous);
+            return previous;
+        });
+    }
+
+    /**
+     * Set the ItemStack updater.
+     *
+     * @param updater The updater.
+     * @return The builder.
+     */
+    SlotBuilder setUpdater(@NotNull SlotUpdater updater);
 
     /**
      * Set slot to be a captive slot.

eco-api/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotModifier.java

@@ -7,8 +7,11 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * Interface to run on slot modify.
+ *
+ * @deprecated Use {@link SlotUpdater} instead.
  */
 @FunctionalInterface
+@Deprecated
 public interface SlotModifier {
     /**
      * Performs this operation on the given arguments.

eco-api/src/main/java/com/willfp/eco/core/gui/slot/functional/SlotUpdater.java

@@ -0,0 +1,24 @@
+package com.willfp.eco.core.gui.slot.functional;
+
+import com.willfp.eco.core.gui.menu.Menu;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface to run on slot update.
+ */
+@FunctionalInterface
+public interface SlotUpdater {
+    /**
+     * Performs this operation on the given arguments.
+     *
+     * @param player   The player.
+     * @param menu     The menu.
+     * @param previous The previous ItemStack.
+     * @return The new ItemStack.
+     */
+    ItemStack update(@NotNull Player player,
+                     @NotNull Menu menu,
+                     @NotNull ItemStack previous);
+}

eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java

@@ -44,7 +44,8 @@ public final class AntigriefManager {
      * @param location The location.
      * @return If player can pick up item.
      */
-    public static boolean canPickupItem(@NotNull final Player player, @NotNull final Location location) {
+    public static boolean canPickupItem(@NotNull final Player player,
+                                        @NotNull final Location location) {
         return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canPickupItem(player, location));
     }
 

eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderEntry.java

@@ -1,6 +1,10 @@
 package com.willfp.eco.core.integrations.placeholder;
 
+import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.placeholder.Placeholder;
+import com.willfp.eco.core.placeholder.PlayerPlaceholder;
+import com.willfp.eco.core.placeholder.PlayerlessPlaceholder;
 import org.apache.commons.lang.Validate;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -10,10 +14,13 @@ import java.util.Objects;
 import java.util.function.Function;
 
 /**
- * A {@link PlaceholderEntry} is a placeholder in and of itself.
+ * A placeholder entry is a placeholder in and of itself.
  * <p>
  * It should be fairly straightforward.
+ *
+ * @deprecated Confusing functionality with inconsistent nullability and poor naming.
  */
+@Deprecated(since = "6.28.0", forRemoval = true)
 public class PlaceholderEntry {
     /**
      * The name of the placeholder, used in lookups.
@@ -140,7 +147,28 @@ public class PlaceholderEntry {
      * Register the placeholder.
      */
     public void register() {
-        PlaceholderManager.registerPlaceholder(this);
+        PlaceholderManager.registerPlaceholder(this.toModernPlaceholder());
+    }
+
+    /**
+     * Convert the placeholder to a modern placeholder.
+     *
+     * @return The placeholder.
+     */
+    Placeholder toModernPlaceholder() {
+        if (this.requiresPlayer) {
+            return new PlayerPlaceholder(
+                    Objects.requireNonNullElse(plugin, Eco.getHandler().getEcoPlugin()),
+                    identifier,
+                    function
+            );
+        } else {
+            return new PlayerlessPlaceholder(
+                    Objects.requireNonNullElse(plugin, Eco.getHandler().getEcoPlugin()),
+                    identifier,
+                    () -> function.apply(null)
+            );
+        }
     }
 
     @Override

eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java

@@ -4,11 +4,16 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.placeholder.Placeholder;
+import com.willfp.eco.core.placeholder.PlayerPlaceholder;
+import com.willfp.eco.core.placeholder.PlayerlessPlaceholder;
+import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -19,11 +24,12 @@ import java.util.concurrent.TimeUnit;
 /**
  * Class to handle placeholder integrations.
  */
+@SuppressWarnings("removal")
 public final class PlaceholderManager {
     /**
      * All registered placeholders.
      */
-    private static final Map<EcoPlugin, Map<String, PlaceholderEntry>> REGISTERED_PLACEHOLDERS = new HashMap<>();
+    private static final Map<EcoPlugin, Map<String, Placeholder>> REGISTERED_PLACEHOLDERS = new HashMap<>();
 
     /**
      * All registered placeholder integrations.
@@ -35,7 +41,7 @@ public final class PlaceholderManager {
      */
     private static final LoadingCache<EntryWithPlayer, String> PLACEHOLDER_CACHE = Caffeine.newBuilder()
             .expireAfterWrite(50, TimeUnit.MILLISECONDS)
-            .build(key -> key.entry.getResult(key.player));
+            .build(key -> key.entry.getValue(key.player));
 
     /**
      * Register a new placeholder integration.
@@ -50,16 +56,31 @@ public final class PlaceholderManager {
     /**
      * Register a placeholder.
      *
-     * @param expansion The {@link com.willfp.eco.core.integrations.placeholder.PlaceholderEntry} to register.
+     * @param placeholder The placeholder to register.
      */
-    public static void registerPlaceholder(@NotNull final PlaceholderEntry expansion) {
-        EcoPlugin plugin = expansion.getPlugin() == null ? Eco.getHandler().getEcoPlugin() : expansion.getPlugin();
-        Map<String, PlaceholderEntry> pluginPlaceholders = REGISTERED_PLACEHOLDERS
+    public static void registerPlaceholder(@NotNull final Placeholder placeholder) {
+        if (placeholder instanceof StaticPlaceholder) {
+            throw new IllegalArgumentException("Static placeholders cannot be registered!");
+        }
+
+        EcoPlugin plugin = placeholder.getPlugin() == null ? Eco.getHandler().getEcoPlugin() : placeholder.getPlugin();
+        Map<String, Placeholder> pluginPlaceholders = REGISTERED_PLACEHOLDERS
                 .getOrDefault(plugin, new HashMap<>());
-        pluginPlaceholders.put(expansion.getIdentifier(), expansion);
+        pluginPlaceholders.put(placeholder.getIdentifier(), placeholder);
         REGISTERED_PLACEHOLDERS.put(plugin, pluginPlaceholders);
     }
 
+    /**
+     * Register a placeholder.
+     *
+     * @param placeholder The placeholder to register.
+     * @deprecated Uses old placeholder system.
+     */
+    @Deprecated(since = "6.28.0", forRemoval = true)
+    public static void registerPlaceholder(@NotNull final PlaceholderEntry placeholder) {
+        registerPlaceholder(placeholder.toModernPlaceholder());
+    }
+
     /**
      * Get the result of a placeholder with respect to a player.
      *
@@ -82,29 +103,36 @@ public final class PlaceholderManager {
      * @param plugin     The plugin for the placeholder.
      * @return The value of the placeholder.
      */
+    @NotNull
     public static String getResult(@Nullable final Player player,
                                    @NotNull final String identifier,
                                    @Nullable final EcoPlugin plugin) {
         EcoPlugin owner = plugin == null ? Eco.getHandler().getEcoPlugin() : plugin;
-        PlaceholderEntry entry = REGISTERED_PLACEHOLDERS.getOrDefault(owner, new HashMap<>()).get(identifier.toLowerCase());
+        Placeholder placeholder = REGISTERED_PLACEHOLDERS.getOrDefault(owner, new HashMap<>()).get(identifier.toLowerCase());
 
-        if (entry == null && plugin != null) {
-            PlaceholderEntry alternate = REGISTERED_PLACEHOLDERS.getOrDefault(Eco.getHandler().getEcoPlugin(), new HashMap<>())
+        if (placeholder == null && plugin != null) {
+            Placeholder alternate = REGISTERED_PLACEHOLDERS.getOrDefault(Eco.getHandler().getEcoPlugin(), new HashMap<>())
                     .get(identifier.toLowerCase());
             if (alternate != null) {
-                entry = alternate;
+                placeholder = alternate;
             }
         }
 
-        if (entry == null) {
+        if (placeholder == null) {
             return "";
         }
 
-        if (player == null && entry.requiresPlayer()) {
+        if (placeholder instanceof PlayerPlaceholder playerPlaceholder) {
+            if (player == null) {
+                return "";
+            } else {
+                return PLACEHOLDER_CACHE.get(new EntryWithPlayer(playerPlaceholder, player));
+            }
+        } else if (placeholder instanceof PlayerlessPlaceholder playerlessPlaceholder) {
+            return playerlessPlaceholder.getValue();
+        } else {
             return "";
         }
-
-        return PLACEHOLDER_CACHE.get(new EntryWithPlayer(entry, player));
     }
 
     /**
@@ -116,10 +144,28 @@ public final class PlaceholderManager {
      */
     public static String translatePlaceholders(@NotNull final String text,
                                                @Nullable final Player player) {
+        return translatePlaceholders(text, player, Collections.emptyList());
+    }
+
+    /**
+     * Translate all placeholders with respect to a player.
+     *
+     * @param text    The text that may contain placeholders to translate.
+     * @param player  The player to translate the placeholders with respect to.
+     * @param statics Extra static placeholders.
+     * @return The text, translated.
+     */
+    public static String translatePlaceholders(@NotNull final String text,
+                                               @Nullable final Player player,
+                                               @NotNull final List<StaticPlaceholder> statics) {
         String processed = text;
         for (PlaceholderIntegration integration : REGISTERED_INTEGRATIONS) {
             processed = integration.translate(processed, player);
         }
+        for (StaticPlaceholder placeholder : statics) {
+            // Do I know this is a bad way of doing this? Yes.
+            processed = processed.replace("%" + placeholder.getIdentifier() + "%", placeholder.getValue());
+        }
         return processed;
     }
 
@@ -138,8 +184,8 @@ public final class PlaceholderManager {
         return found;
     }
 
-    private static record EntryWithPlayer(@NotNull PlaceholderEntry entry,
-                                          @Nullable Player player) {
+    private record EntryWithPlayer(@NotNull PlayerPlaceholder entry,
+                                   @NotNull Player player) {
 
     }
 

eco-api/src/main/java/com/willfp/eco/core/items/Items.java

@@ -10,7 +10,6 @@ import com.willfp.eco.core.recipe.parts.ModifiedTestableItem;
 import com.willfp.eco.core.recipe.parts.TestableStack;
 import com.willfp.eco.util.NamespacedKeyUtils;
 import com.willfp.eco.util.NumberUtils;
-import com.willfp.eco.util.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
@@ -20,6 +19,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -42,9 +42,13 @@ public final class Items {
      * Cached custom item lookups, using {@link HashedItem}.
      */
     private static final LoadingCache<HashedItem, Optional<TestableItem>> CACHE = Caffeine.newBuilder()
-            .expireAfterAccess(5, TimeUnit.MINUTES)
+            .expireAfterAccess(10, TimeUnit.MINUTES)
             .build(
                     key -> {
+                        if (!key.getItem().hasItemMeta()) {
+                            return Optional.empty();
+                        }
+
                         TestableItem match = null;
                         for (TestableItem item : REGISTRY.values()) {
                             if (item.matches(key.getItem())) {
@@ -67,6 +71,11 @@ public final class Items {
      */
     private static final List<LookupArgParser> ARG_PARSERS = new ArrayList<>();
 
+    /**
+     * The handler.
+     */
+    private static final ItemsLookupHandler ITEMS_LOOKUP_HANDLER = new ItemsLookupHandler(Items::doParse);
+
     /**
      * Register a new custom item.
      *
@@ -130,20 +139,11 @@ public final class Items {
      */
     @NotNull
     public static TestableItem lookup(@NotNull final String key) {
-        if (key.contains("?")) {
-            String[] options = key.split("\\?");
-            for (String option : options) {
-                TestableItem lookup = lookup(option);
-                if (!(lookup instanceof EmptyTestableItem)) {
-                    return lookup;
-                }
-            }
-
-            return new EmptyTestableItem();
-        }
-
-        String[] args = StringUtils.parseTokens(key);
+        return ITEMS_LOOKUP_HANDLER.parseKey(key);
+    }
 
+    @NotNull
+    private static TestableItem doParse(@NotNull final String[] args) {
         if (args.length == 0) {
             return new EmptyTestableItem();
         }
@@ -298,7 +298,7 @@ public final class Items {
      * @param itemStack The itemStack to check.
      * @return If is recipe.
      */
-    public static boolean isCustomItem(@NotNull final ItemStack itemStack) {
+    public static boolean isCustomItem(@Nullable final ItemStack itemStack) {
         return getCustomItem(itemStack) != null;
     }
 
@@ -309,7 +309,11 @@ public final class Items {
      * @return The custom item, or null if not exists.
      */
     @Nullable
-    public static CustomItem getCustomItem(@NotNull final ItemStack itemStack) {
+    public static CustomItem getCustomItem(@Nullable final ItemStack itemStack) {
+        if (itemStack == null) {
+            return null;
+        }
+
         return CACHE.get(HashedItem.of(itemStack)).map(Items::getOrWrap).orElse(null);
     }
 
@@ -344,6 +348,35 @@ public final class Items {
         }
     }
 
+    /**
+     * Convert an array of materials to an array of testable items.
+     *
+     * @param materials The materials.
+     * @return An array of functionally identical testable items.
+     */
+    @NotNull
+    public static TestableItem[] fromMaterials(@NotNull final Material... materials) {
+        return Arrays.stream(materials)
+                .map(MaterialTestableItem::new)
+                .toArray(MaterialTestableItem[]::new);
+    }
+
+    /**
+     * Convert a collection of materials into a collection of testable items.
+     *
+     * @param materials The materials.
+     * @return A collection of functionally identical testable items.
+     */
+    @NotNull
+    public static Collection<TestableItem> fromMaterials(@NotNull final Iterable<Material> materials) {
+        List<TestableItem> items = new ArrayList<>();
+        for (Material material : materials) {
+            items.add(new MaterialTestableItem(material));
+        }
+
+        return items;
+    }
+
     private Items() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

eco-api/src/main/java/com/willfp/eco/core/items/ItemsLookupHandler.java

@@ -0,0 +1,48 @@
+package com.willfp.eco.core.items;
+
+import com.willfp.eco.core.lookup.LookupHandler;
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
+import com.willfp.eco.core.recipe.parts.GroupedTestableItems;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.function.Function;
+
+/**
+ * Handle item lookup strings.
+ */
+public class ItemsLookupHandler implements LookupHandler<TestableItem> {
+    /**
+     * The parser.
+     */
+    private final Function<String[], @NotNull TestableItem> parser;
+
+    /**
+     * Create new lookup handler.
+     *
+     * @param parser The parser.
+     */
+    public ItemsLookupHandler(@NotNull final Function<String[], @NotNull TestableItem> parser) {
+        this.parser = parser;
+    }
+
+    @Override
+    public @NotNull TestableItem parse(@NotNull final String[] args) {
+        return parser.apply(args);
+    }
+
+    @Override
+    public boolean validate(@NotNull final TestableItem object) {
+        return !(object instanceof EmptyTestableItem);
+    }
+
+    @Override
+    public @NotNull TestableItem getFailsafe() {
+        return new EmptyTestableItem();
+    }
+
+    @Override
+    public @NotNull TestableItem join(@NotNull final Collection<TestableItem> options) {
+        return new GroupedTestableItems(options);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/items/TestableItem.java

@@ -1,18 +1,20 @@
 package com.willfp.eco.core.items;
 
+import com.willfp.eco.core.lookup.Testable;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * An item with a test to see if any item is that item.
  */
-public interface TestableItem {
+public interface TestableItem extends Testable<ItemStack> {
     /**
      * If an ItemStack matches the recipe part.
      *
      * @param itemStack The item to test.
      * @return If the item matches.
      */
+    @Override
     boolean matches(@Nullable ItemStack itemStack);
 
     /**

eco-api/src/main/java/com/willfp/eco/core/lookup/LookupHandler.java

@@ -0,0 +1,76 @@
+package com.willfp.eco.core.lookup;
+
+import com.willfp.eco.util.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+/**
+ * Handle lookups, used in {@link com.willfp.eco.core.entities.Entities} and {@link com.willfp.eco.core.items.Items}.
+ *
+ * @param <T> The type of testable object, eg {@link com.willfp.eco.core.items.TestableItem}.
+ */
+public interface LookupHandler<T extends Testable<?>> {
+    /**
+     * Parse lookup string completely.
+     * <p>
+     * You shouldn't override this method unless you're doing something
+     * technically interesting or weird. This is the entry point for all
+     * lookup parsers, parse() is to specify implementation-specific
+     * parsing.
+     *
+     * @param key The key.
+     * @return The object.
+     */
+    default T parseKey(@NotNull String key) {
+        for (SegmentParser parser : SegmentParser.values()) {
+            T generated = parser.parse(key, this);
+
+            if (generated != null) {
+                return generated;
+            }
+        }
+
+        String[] args = StringUtils.parseTokens(key);
+
+        return this.parse(args);
+    }
+
+    /**
+     * Parse arguments to an object.
+     *
+     * @param args The arguments.
+     * @return The object.
+     */
+    @NotNull
+    T parse(@NotNull String[] args);
+
+    /**
+     * Validate an object.
+     *
+     * @param object The object.
+     * @return If validated.
+     */
+    boolean validate(@NotNull T object);
+
+    /**
+     * Get the failsafe object.
+     * <p>
+     * A failsafe object should never pass validate(), as this will
+     * cause issues with segment parsers. See {@link com.willfp.eco.core.items.ItemsLookupHandler} and
+     * {@link com.willfp.eco.core.recipe.parts.EmptyTestableItem} for examples.
+     *
+     * @return The failsafe.
+     */
+    @NotNull
+    T getFailsafe();
+
+    /**
+     * Join several options together.
+     *
+     * @param options The options.
+     * @return The joined object.
+     */
+    @NotNull
+    T join(@NotNull Collection<T> options);
+}

eco-api/src/main/java/com/willfp/eco/core/lookup/SegmentParser.java

@@ -0,0 +1,83 @@
+package com.willfp.eco.core.lookup;
+
+import com.willfp.eco.util.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Parse a key into segments.
+ */
+public abstract class SegmentParser {
+    /**
+     * All segment parsers.
+     */
+    private static final List<SegmentParser> REGISTERED = new ArrayList<>();
+
+    /**
+     * The pattern to split keys on.
+     */
+    private final String pattern;
+
+    /**
+     * Create new lookup segment parser.
+     *
+     * @param pattern The pattern.
+     */
+    protected SegmentParser(@NotNull final String pattern) {
+        this.pattern = pattern;
+    }
+
+    /**
+     * Register the parser.
+     *
+     * @return The parser.
+     */
+    public SegmentParser register() {
+        REGISTERED.add(this);
+        return this;
+    }
+
+    /**
+     * Try parse segments from key.
+     *
+     * @param key     The key.
+     * @param handler The handler.
+     * @param <T>     The object type.
+     * @return Null if no segments were found, or the object generated from the segments.
+     */
+    @Nullable
+    public <T extends Testable<?>> T parse(@NotNull final String key,
+                                           @NotNull final LookupHandler<T> handler) {
+        if (!key.contains(" " + pattern + " ")) {
+            return null;
+        }
+
+        String[] segments = StringUtils.splitAround(key, pattern);
+
+        return handleSegments(segments, handler);
+    }
+
+    /**
+     * Handle segments from key.
+     *
+     * @param segments The key segments.
+     * @param handler  The handler.
+     * @param <T>      The object type.
+     * @return The returned object.
+     */
+    protected abstract <T extends Testable<?>> T handleSegments(@NotNull String[] segments,
+                                                                @NotNull LookupHandler<T> handler);
+
+    /**
+     * Get all segment parsers.
+     *
+     * @return All parsers.
+     */
+    public static Collection<SegmentParser> values() {
+        return new ArrayList<>(REGISTERED);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/lookup/Testable.java

@@ -0,0 +1,25 @@
+package com.willfp.eco.core.lookup;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
+
+/**
+ * Interface for testing if any object matches another object.
+ *
+ * @param <T> The type of object.
+ */
+public interface Testable<T> extends Predicate<T> {
+    /**
+     * If object matches the test.
+     *
+     * @param other The other object.
+     * @return If matches.
+     */
+    boolean matches(@Nullable T other);
+
+    @Override
+    default boolean test(@Nullable T other) {
+        return this.matches(other);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/placeholder/Placeholder.java

@@ -0,0 +1,22 @@
+package com.willfp.eco.core.placeholder;
+
+import com.willfp.eco.core.EcoPlugin;
+
+/**
+ * A placeholder represents a string that can hold a value.
+ */
+public sealed interface Placeholder permits PlayerPlaceholder, PlayerlessPlaceholder, StaticPlaceholder {
+    /**
+     * Get the plugin that holds the placeholder.
+     *
+     * @return The plugin.
+     */
+    EcoPlugin getPlugin();
+
+    /**
+     * Get the identifier for the placeholder.
+     *
+     * @return The identifier.
+     */
+    String getIdentifier();
+}

eco-api/src/main/java/com/willfp/eco/core/placeholder/PlaceholderInjectable.java

@@ -0,0 +1,38 @@
+package com.willfp.eco.core.placeholder;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Represents a class that can have placeholders injected into it.
+ */
+public interface PlaceholderInjectable {
+    /**
+     * Inject placeholder.
+     *
+     * @param placeholders The placeholders.
+     */
+    default void injectPlaceholders(@NotNull StaticPlaceholder... placeholders) {
+        this.injectPlaceholders(List.of(placeholders));
+    }
+
+    /**
+     * Inject placeholder.
+     *
+     * @param placeholders The placeholders.
+     */
+    void injectPlaceholders(@NotNull Iterable<StaticPlaceholder> placeholders);
+
+    /**
+     * Clear injected placeholders.
+     */
+    void clearInjectedPlaceholders();
+
+    /**
+     * Get injected placeholders.
+     *
+     * @return Injected placeholders.
+     */
+    List<StaticPlaceholder> getInjectedPlaceholders();
+}

eco-api/src/main/java/com/willfp/eco/core/placeholder/PlayerPlaceholder.java

@@ -0,0 +1,92 @@
+package com.willfp.eco.core.placeholder;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.function.Function;
+
+/**
+ * A placeholder that requires a player.
+ */
+public final class PlayerPlaceholder implements Placeholder {
+    /**
+     * The name of the placeholder.
+     */
+    private final String identifier;
+
+    /**
+     * The function to retrieve the output of the placeholder given a player.
+     */
+    private final Function<Player, String> function;
+
+    /**
+     * The plugin for the placeholder.
+     */
+    private final EcoPlugin plugin;
+
+    /**
+     * Create a new player placeholder.
+     *
+     * @param plugin     The plugin.
+     * @param identifier The identifier.
+     * @param function   The function to retrieve the value.
+     */
+    public PlayerPlaceholder(@NotNull final EcoPlugin plugin,
+                             @NotNull final String identifier,
+                             @NotNull final Function<Player, String> function) {
+        this.plugin = plugin;
+        this.identifier = identifier;
+        this.function = function;
+    }
+
+    /**
+     * Get the value of the placeholder for a given player.
+     *
+     * @param player The player.
+     * @return The value.
+     */
+    public String getValue(@NotNull final Player player) {
+        return function.apply(player);
+    }
+
+    /**
+     * Register the placeholder.
+     *
+     * @return The placeholder.
+     */
+    public PlayerPlaceholder register() {
+        PlaceholderManager.registerPlaceholder(this);
+        return this;
+    }
+
+    @Override
+    public EcoPlugin getPlugin() {
+        return this.plugin;
+    }
+
+    @Override
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof StaticPlaceholder that)) {
+            return false;
+        }
+        return Objects.equals(this.getIdentifier(), that.getIdentifier())
+                && Objects.equals(this.getPlugin(), that.getPlugin());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getIdentifier(), this.getPlugin());
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/placeholder/PlayerlessPlaceholder.java

@@ -0,0 +1,90 @@
+package com.willfp.eco.core.placeholder;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+/**
+ * A placeholder that does not require a player.
+ */
+public final class PlayerlessPlaceholder implements Placeholder {
+    /**
+     * The name of the placeholder.
+     */
+    private final String identifier;
+
+    /**
+     * The function to retrieve the output of the placeholder.
+     */
+    private final Supplier<String> function;
+
+    /**
+     * The plugin for the placeholder.
+     */
+    private final EcoPlugin plugin;
+
+    /**
+     * Create a new player placeholder.
+     *
+     * @param plugin     The plugin.
+     * @param identifier The identifier.
+     * @param function   The function to retrieve the value.
+     */
+    public PlayerlessPlaceholder(@NotNull final EcoPlugin plugin,
+                                 @NotNull final String identifier,
+                                 @NotNull final Supplier<String> function) {
+        this.plugin = plugin;
+        this.identifier = identifier;
+        this.function = function;
+    }
+
+    /**
+     * Get the value of the placeholder.
+     *
+     * @return The value.
+     */
+    public String getValue() {
+        return function.get();
+    }
+
+    /**
+     * Register the placeholder.
+     *
+     * @return The placeholder.
+     */
+    public PlayerlessPlaceholder register() {
+        PlaceholderManager.registerPlaceholder(this);
+        return this;
+    }
+
+    @Override
+    public EcoPlugin getPlugin() {
+        return this.plugin;
+    }
+
+    @Override
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof StaticPlaceholder that)) {
+            return false;
+        }
+        return Objects.equals(this.getIdentifier(), that.getIdentifier())
+                && Objects.equals(this.getPlugin(), that.getPlugin());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getIdentifier(), this.getPlugin());
+    }
+}