Fixed javadoc

Change to not quit after first iteration of loop

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Auxilor Community Discord
+    url: https://discord.gg/ZcwpSsE/
+    about: Join the Auxilor discord to get help from support staff and the general community!
+  - name: The most common issues people have
+    url: https://github.com/Auxilor/eco/issues/78
+    about: Check the list of known common issues to see if your issue has already been solved

.github/ISSUE_TEMPLATE/report-a-bug.md

@@ -0,0 +1,31 @@
+---
+name: Report a Bug
+about: Report an issue with the plugin
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior: 
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Server Information (please complete the following information):**
+- Version: (output of `/ver` command)
+- Version of plugin and eco (`/ver eco`, `/ver <plugin>`)
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/request-a-feature.md

@@ -0,0 +1,20 @@
+---
+name: Request a Feature
+about: Suggest an idea for this plugin
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.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,7 @@
 # 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.
+Please open any Pull Requests into the `develop` branch or ideally into a new branch for your changes. PRs that go into `master` won't be ignored, but I have to checkout and merge manually, which makes your PR show as being closed.
 
-2. Use JetBrains annotations
-- Every parameter should be annotated with @NotNull or @Nullable
-- Use @NotNull over lombok @NonNull
+Do not write any Kotlin-only APIs; all API components should be written in Java, Kotlin extensions should not have functionality that isn't available in java. The same applies the other way round, do not write any backend code in Java, it should be Kotlin-exclusive.
 
-3. Imports
-- No group (*) imports.
-- No static imports.
-
-## 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.
-
-## Other
-- All drops **must** be sent through a DropQueue - calls to World#dropItem will get your PR rejected.
-- eco is built with java 17.
+If you have any questions about contributing, feel free to ask in the [Discord](https://discord.gg/ZcwpSsE)!

README.md

@@ -1,5 +1,5 @@
 # eco
-eco is a powerful Spigot development library that simplifies the process of plugin creation and supercharges
+eco is a powerful Spigot plugin framework that simplifies the process of plugin creation and supercharges
 your plugins.
 It's the engine behind [EcoEnchants](https://polymart.org/resource/490), [Reforges](https://polymart.org/resource/1330),
 [EcoItems](https://polymart.org/resource/1247), [EcoSkills](https://polymart.org/resource/1351),
@@ -16,30 +16,54 @@ and many more.
     <a href="https://bstats.org/plugin/bukkit/EcoEnchants" alt="bstats players">
         <img src="https://img.shields.io/bstats/players/7666?color=informational"/>
     </a>
-    <a href="https://plugins.auxilor.io/" alt="Docs (gitbook)">
-        <img src="https://img.shields.io/badge/docs-gitbook-informational"/>
-    </a>
     <a href="https://discord.gg/ZcwpSsE/" alt="Discord">
         <img src="https://img.shields.io/discord/452518336627081236?label=discord&color=informational"/>
     </a>
     <a href="https://github.com/Auxilor/eco/actions/workflows/java-ci.yml" alt="Latest Dev Build">
-        <img src="https://img.shields.io/github/workflow/status/Auxilor/eco/Java%20CI/develop?color=informational"/>
+        <img src="https://img.shields.io/github/actions/workflow/status/Auxilor/eco/java-ci.yml?branch=develop&color=informational"/>
     </a>
 </p>
 
+eco comes packed with all the tools you need in your plugins:
+
+- Modern command API
+- Native color parsing with full hex/RGB/MiniMessage support
+- Yaml/JSON/TOML config system
+- Persistent data storage API with Yaml/MySQL/MongoDB support
+- Packet item display system
+- Entity AI API with near-1:1 NMS mappings
+- More events
+- Extension API, essentially plugins for plugins
+- Fluent dependency injection for NamespacedKey, Metadata values, etc.
+- Ultra-fast ItemStack reimplementation bypassing ItemMeta
+- Complete GUI API with pre-made components available from [ecomponent](https://github.com/Auxilor/ecomponent)
+- Over 30 native integrations for other plugins
+- First-class custom item support with lookup strings
+- Math expression parsing via [Crunch](https://github.com/Redempt/Crunch)
+- Particle lookups
+- Complete Placeholder API
+- Price system, supporting economy plugins, XP, Items, etc.
+- NMS/Version-specific tooling
+- Custom crafting recipe API with support for stacks and custom items
+- Native plugin update checking
+- Native bStats support
+- Full Kotlin support and native extensions
+- Tooling to make meta-frameworks, like [libreforge](https://github.com/Auxilor/libreforge)
+- And much 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
 
-- Stable (Recommended): [GitHub](https://github.com/Auxilor/eco/releases), [Polymart](https://polymart.org/resource/eco.773)
-- Dev (Not Recommended): [GitHub](https://github.com/Auxilor/eco/actions/workflows/java-ci.yml) (Open latest run and download)
+- Stable: [GitHub](https://github.com/Auxilor/eco/releases), [Polymart](https://polymart.org/resource/eco.773)
+- Dev: [GitHub](https://github.com/Auxilor/eco/actions/workflows/java-ci.yml) (Open latest run and download)
 
 # 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.49.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.49.0/javadoc/)
 
 ## Plugin Information
 
@@ -68,7 +92,7 @@ dependencies {
 }
 ```
 
-Replace `Tag` with a release tag for eco, eg `6.13.0`.
+Replace `Tag` with a release tag for eco, eg `6.49.0`.
 
 Maven:
 
@@ -88,7 +112,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.49.0`.
 
 ## Build locally:
 
@@ -103,7 +127,7 @@ cd eco
 
 ## License
 
-*Click here to read [the entire license](https://github.com/Auxilor/eco/blob/master/LICENSE.md).*
+eco is licensed under GNU GPL3. *Click here to read [the entire license](https://github.com/Auxilor/eco/blob/master/LICENSE.md).*
 
 <h1 align="center">
   Check out our partners!

build.gradle.kts

@@ -1,18 +1,31 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.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.7.10"
 }
 
 dependencies {
     implementation(project(":eco-api"))
-    implementation(project(":eco-core:core-plugin"))
+    implementation(project(path = ":eco-core:core-plugin", configuration = "shadow"))
     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"))
+    implementation(project(path = ":eco-core:core-nms:v1_19_R1", configuration = "reobf"))
+    implementation(project(path = ":eco-core:core-nms:v1_19_R2", configuration = "reobf"))
 }
 
 allprojects {
@@ -20,6 +33,7 @@ allprojects {
     apply(plugin = "java-library")
     apply(plugin = "maven-publish")
     apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "kotlin")
 
     repositories {
         mavenCentral()
@@ -32,11 +46,8 @@ allprojects {
         // SuperiorSkyblock2
         maven("https://repo.bg-software.com/repository/api/")
 
-        // NMS (for jitpack compilation)
-        maven("https://repo.codemc.org/repository/nms/")
-
         // mcMMO, BentoBox
-        maven("https://repo.codemc.org/repository/maven-public/")
+        maven("https://repo.codemc.io/repository/maven-public/")
 
         // Spigot API, Bungee API
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
@@ -51,7 +62,7 @@ allprojects {
         maven("https://maven.enginehub.org/repo/")
 
         // FactionsUUID
-        maven("https://ci.ender.zone/plugin/repository/everything/")
+        //maven("https://ci.ender.zone/plugin/repository/everything/")
 
         // NoCheatPlus
         maven("https://repo.md-5.net/content/repositories/snapshots/")
@@ -59,27 +70,41 @@ allprojects {
         // CombatLogX
         maven("https://nexus.sirblobman.xyz/repository/public/")
 
-        // IridiumSkyblock
-        maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
-
         // MythicMobs
         maven("https://mvn.lumine.io/repository/maven-public/")
 
         // Crunch
         maven("https://redempt.dev")
+
+        // LibsDisguises
+        maven("https://repo.md-5.net/content/groups/public/")
+
+        maven("https://repo.techscode.com/repository/maven-releases/")
     }
 
     dependencies {
+        // Kotlin
+        implementation(kotlin("stdlib", version = "1.7.10"))
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
+
+        // Included in spigot jar, no need to move to implementation
         compileOnly("org.jetbrains:annotations:23.0.0")
+        compileOnly("com.google.guava:guava:31.1-jre")
 
         // 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")
+        implementation("net.kyori:adventure-api:4.10.1")
+        implementation("net.kyori:adventure-text-serializer-gson:4.10.1") {
+            exclude("com.google.code.gson", "gson") // Prevent shading into the jar
+        }
+        implementation("net.kyori:adventure-text-serializer-legacy:4.10.1")
+
+        // Other
+        implementation("com.github.ben-manes.caffeine:caffeine:3.1.0")
+        implementation("org.apache.maven:maven-artifact:3.8.5")
     }
 
     tasks.withType<JavaCompile> {
@@ -94,14 +119,54 @@ allprojects {
         exclude(group = "org.spongepowered", module = "configurate-hocon")
         exclude(group = "com.darkblade12", module = "particleeffect")
         exclude(group = "com.github.cryptomorin", module = "XSeries")
-        exclude(group = "org.apache.commons", module = "commons-lang3")
+        exclude(group = "net.wesjd", module = "anvilgui")
+        exclude(group = "org.slf4j", module = "slf4j-api")
+    }
+
+    configurations.testImplementation {
+        setExtendsFrom(listOf(configurations.compileOnly.get(), configurations.implementation.get()))
     }
 
     tasks {
+        compileKotlin {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+
         shadowJar {
-            relocate("org.bstats", "com.willfp.eco.shaded.bstats")
-            relocate("net.kyori.adventure.text.minimessage", "com.willfp.eco.shaded.minimessage")
-            relocate("redempt.crunch", "com.willfp.eco.shaded.crunch")
+            relocate("org.bstats", "com.willfp.eco.libs.bstats")
+            relocate("redempt.crunch", "com.willfp.eco.libs.crunch")
+            relocate("org.apache.commons.lang3", "com.willfp.eco.libs.lang3")
+            relocate("org.apache.maven", "com.willfp.eco.libs.maven")
+            relocate("org.checkerframework", "com.willfp.eco.libs.checkerframework")
+            relocate("org.intellij", "com.willfp.eco.libs.intellij")
+            relocate("org.jetbrains.annotations", "com.willfp.eco.libs.jetbrains.annotations")
+            //relocate("org.jetbrains.exposed", "com.willfp.eco.libs.exposed")
+            relocate("org.objenesis", "com.willfp.eco.libs.objenesis")
+            relocate("org.reflections", "com.willfp.eco.libs.reflections")
+            relocate("javassist", "com.willfp.eco.libs.javassist")
+            relocate("javax.annotation", "com.willfp.eco.libs.annotation")
+            relocate("com.google.errorprone", "com.willfp.eco.libs.errorprone")
+            relocate("com.google.j2objc", "com.willfp.eco.libs.j2objc")
+            relocate("com.google.thirdparty", "com.willfp.eco.libs.google.thirdparty")
+            relocate("com.google.protobuf", "com.willfp.eco.libs.google.protobuf") // No I don't know either
+            relocate("google.protobuf", "com.willfp.eco.libs.protobuf") // Still don't know
+            relocate("com.zaxxer.hikari", "com.willfp.eco.libs.hikari")
+            //relocate("com.mysql", "com.willfp.eco.libs.mysql")
+            relocate("de.undercouch.bson4jackson", "com.willfp.eco.libs.bson4jackson")
+            relocate("com.fasterxml.jackson", "com.willfp.eco.libs.jackson")
+            relocate("com.mongodb", "com.willfp.eco.libs.mongodb")
+            relocate("org.bson", "com.willfp.eco.libs.bson")
+            relocate("org.litote", "com.willfp.eco.libs.litote")
+            relocate("org.reactivestreams", "com.willfp.eco.libs.reactivestreams")
+            relocate("reactor.", "com.willfp.eco.libs.reactor.") // Dot in name to be safe
+            relocate("com.moandjiezana.toml", "com.willfp.eco.libs.toml")
+
+            /*
+            Kotlin and caffeine are not shaded so that they can be accessed directly by eco plugins.
+            Also, not relocating adventure, because it's a pain in the ass, and it doesn't *seem* to be causing loader constraint violations.
+             */
         }
 
         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,28 +1,20 @@
-plugins {
-    id 'com.github.johnrengelman.shadow'
+dependencies {
+    // Adventure
+    compileOnly 'net.kyori:adventure-platform-bukkit:4.1.0'
+
+    // Other
+    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
+    compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
+    compileOnly 'com.google.code.gson:gson:2.8.8'
 }
 
 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'
-
-    // Other
-    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
-    compileOnly 'org.apache.maven:maven-artifact:3.8.1'
-    compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
-    compileOnly 'com.google.code.gson:gson:2.8.8'
-    compileOnly 'org.apache.commons:commons-lang3:3.0'
-}
-
 java {
     withJavadocJar()
 }
 
-
 build.dependsOn publishToMavenLocal
 
 publishing {
@@ -43,4 +35,4 @@ publishing {
             }
         }
     }
-}
+}

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

@@ -1,58 +1,611 @@
 package com.willfp.eco.core;
 
+import com.willfp.eco.core.command.CommandBase;
+import com.willfp.eco.core.command.PluginCommandBase;
+import com.willfp.eco.core.command.impl.PluginCommand;
+import com.willfp.eco.core.config.ConfigType;
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.config.interfaces.LoadableConfig;
+import com.willfp.eco.core.config.updating.ConfigHandler;
+import com.willfp.eco.core.data.ExtendedPersistentDataContainer;
+import com.willfp.eco.core.data.PlayerProfile;
+import com.willfp.eco.core.data.ServerProfile;
+import com.willfp.eco.core.data.keys.PersistentDataKey;
+import com.willfp.eco.core.drops.DropQueue;
+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;
+import com.willfp.eco.core.factory.NamespacedKeyFactory;
+import com.willfp.eco.core.factory.RunnableFactory;
+import com.willfp.eco.core.fast.FastItemStack;
+import com.willfp.eco.core.gui.menu.Menu;
+import com.willfp.eco.core.gui.menu.MenuBuilder;
+import com.willfp.eco.core.gui.menu.MenuType;
+import com.willfp.eco.core.gui.slot.SlotBuilder;
+import com.willfp.eco.core.gui.slot.functional.SlotProvider;
+import com.willfp.eco.core.items.TestableItem;
+import com.willfp.eco.core.math.MathContext;
+import com.willfp.eco.core.proxy.ProxyFactory;
+import com.willfp.eco.core.scheduling.Scheduler;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.apache.commons.lang.Validate;
+import org.bukkit.Location;
+import org.bukkit.NamespacedKey;
+import org.bukkit.command.CommandMap;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Mob;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.SkullMeta;
+import org.bukkit.persistence.PersistentDataContainer;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.logging.Logger;
 
 /**
- * Holds the instance of the eco handler for bridging between the frontend
- * and backend.
+ * Holds the instance of eco for bridging between the frontend and backend.
+ * <p>
+ * <strong>Do not use this in your plugins!</strong> It can and will contain
+ * breaking changes between minor versions and even patches, and you will create compatibility
+ * issues by. All parts of this have been abstracted into logically named API components that you
+ * can use.
  *
- * @see Eco#getHandler()
- * @see Handler
+ * @see Eco#get()
  */
 @ApiStatus.Internal
-public final class Eco {
-    /**
-     * Instance of eco handler.
-     */
-    @ApiStatus.Internal
-    private static Handler handler;
+public interface Eco {
 
     /**
-     * Set the handler.
+     * Create a scheduler.
      *
-     * @param handler The handler.
+     * @param plugin The plugin.
+     * @return The scheduler.
      */
-    @ApiStatus.Internal
-    public static void setHandler(@NotNull final Handler handler) {
-        Validate.isTrue(Eco.handler == null, "Already initialized!");
-
-        Eco.handler = handler;
-    }
+    @NotNull
+    Scheduler createScheduler(@NotNull EcoPlugin plugin);
 
     /**
-     * Get the instance of the eco handler; the bridge between the api frontend
-     * and the implementation backend.
-     * <p>
-     * <strong>Do not use the handler in your plugins!</strong> It can and will contain
-     * breaking changes between minor versions and even patches, and you will create
-     * compatibility issues by using the handler. All parts of the handler have been abstracted
-     * into logically named API components that you can use.
-     * <p>
-     * Prior to version 6.12.0, the handler was considered as an API component, but it has
-     * since been moved into an internal component, and in 6.17.0, the first breaking change
-     * was introduced to {@link com.willfp.eco.core.config.wrapper.ConfigFactory}. This means
-     * that any usages of the handler can now cause problems in your plugins.
+     * Create an event manager.
      *
+     * @param plugin The plugin.F
+     * @return The event manager.
+     */
+    @NotNull
+    EventManager createEventManager(@NotNull EcoPlugin plugin);
+
+    /**
+     * Create a NamespacedKey factory.
+     *
+     * @param plugin The plugin.
+     * @return The factory.
+     */
+    @NotNull
+    NamespacedKeyFactory createNamespacedKeyFactory(@NotNull EcoPlugin plugin);
+
+    /**
+     * Create a MetadataValue factory.
+     *
+     * @param plugin The plugin.
+     * @return The factory.
+     */
+    @NotNull
+    MetadataValueFactory createMetadataValueFactory(@NotNull EcoPlugin plugin);
+
+    /**
+     * Create a Runnable factory.
+     *
+     * @param plugin The plugin.
+     * @return The factory.
+     */
+    @NotNull
+    RunnableFactory createRunnableFactory(@NotNull EcoPlugin plugin);
+
+    /**
+     * Create an ExtensionLoader.
+     *
+     * @param plugin The plugin.
+     * @return The factory.
+     */
+    @NotNull
+    ExtensionLoader createExtensionLoader(@NotNull EcoPlugin plugin);
+
+    /**
+     * Create a config handler.
+     *
+     * @param plugin The plugin.
      * @return The handler.
      */
+    @NotNull
+    ConfigHandler createConfigHandler(@NotNull EcoPlugin plugin);
+
+    /**
+     * Create a logger.
+     *
+     * @param plugin The plugin.
+     * @return The logger.
+     */
+    @NotNull
+    Logger createLogger(@NotNull EcoPlugin plugin);
+
+    /**
+     * Create a PAPI integration.
+     *
+     * @param plugin The plugin.
+     */
+    void createPAPIIntegration(@NotNull EcoPlugin plugin);
+
+    /**
+     * Create a proxy factory.
+     *
+     * @param plugin The plugin.
+     * @return The factory.
+     */
+    @NotNull
+    ProxyFactory createProxyFactory(@NotNull EcoPlugin plugin);
+
+    /**
+     * Get eco Spigot plugin.
+     *
+     * @return The plugin.
+     */
+    @NotNull
+    EcoPlugin getEcoPlugin();
+
+    /**
+     * Create PluginCommandBase implementation of {@link PluginCommand}.
+     *
+     * @param parentDelegate the enclosing class of this implementation.
+     * @param plugin         the plugin.
+     * @param name           the name of the command.
+     * @param permission     the permission of the command.
+     * @param playersOnly    if the command is players only.
+     * @return The PluginCommandBase implementation
+     */
+    @NotNull
+    PluginCommandBase createPluginCommand(@NotNull CommandBase parentDelegate,
+                                          @NotNull EcoPlugin plugin,
+                                          @NotNull String name,
+                                          @NotNull String permission,
+                                          boolean playersOnly);
+
+    /**
+     * Create CommandBase implementation of {@link com.willfp.eco.core.command.impl.Subcommand Subcommand}.
+     *
+     * @param parentDelegate the enclosing class of this implementation.
+     * @param plugin         the plugin.
+     * @param name           the name of the command.
+     * @param permission     the permission of the command.
+     * @param playersOnly    if the command is players only.
+     * @return The CommandBase implementation
+     */
+    @NotNull
+    CommandBase createSubcommand(@NotNull CommandBase parentDelegate,
+                                 @NotNull EcoPlugin plugin,
+                                 @NotNull String name,
+                                 @NotNull String permission,
+                                 boolean playersOnly);
+
+    /**
+     * Updatable config.
+     *
+     * @param configName            The name of the config
+     * @param plugin                The plugin.
+     * @param subDirectoryPath      The subdirectory path.
+     * @param source                The class that owns the resource.
+     * @param removeUnused          Whether keys not present in the default config should be removed on update.
+     * @param type                  The config type.
+     * @param updateBlacklist       Substring of keys to not add/remove keys for.
+     * @param requiresChangesToSave If the config must be changed in order to save the config.
+     * @return The config implementation.
+     */
+    @NotNull
+    LoadableConfig createUpdatableConfig(@NotNull String configName,
+                                         @NotNull PluginLike plugin,
+                                         @NotNull String subDirectoryPath,
+                                         @NotNull Class<?> source,
+                                         boolean removeUnused,
+                                         @NotNull ConfigType type,
+                                         boolean requiresChangesToSave,
+                                         @NotNull String... updateBlacklist);
+
+    /**
+     * Loadable config.
+     *
+     * @param configName            The name of the config
+     * @param plugin                The plugin.
+     * @param subDirectoryPath      The subdirectory path.
+     * @param source                The class that owns the resource.
+     * @param type                  The config type.
+     * @param requiresChangesToSave If the config must be changed in order to save the config.
+     * @return The config implementation.
+     */
+    @NotNull
+    LoadableConfig createLoadableConfig(@NotNull String configName,
+                                        @NotNull PluginLike plugin,
+                                        @NotNull String subDirectoryPath,
+                                        @NotNull Class<?> source,
+                                        @NotNull ConfigType type,
+                                        boolean requiresChangesToSave);
+
+    /**
+     * Create config.
+     *
+     * @param config The handle.
+     * @return The config implementation.
+     */
+    @NotNull
+    Config wrapConfigurationSection(@NotNull ConfigurationSection config);
+
+    /**
+     * Create config.
+     *
+     * @param values The values.
+     * @param type   The config type.
+     * @return The config implementation.
+     */
+    @NotNull
+    Config createConfig(@NotNull Map<String, Object> values,
+                        @NotNull ConfigType type);
+
+    /**
+     * Create config.
+     *
+     * @param contents The file contents.
+     * @param type     The type.
+     * @return The config implementation.
+     */
+    @NotNull
+    Config createConfig(@NotNull String contents,
+                        @NotNull ConfigType type);
+
+    /**
+     * Create a Drop Queue.
+     *
+     * @param player The player.
+     * @return The drop queue.
+     */
+    @NotNull
+    DropQueue createDropQueue(@NotNull Player player);
+
+    /**
+     * Create slot builder.
+     *
+     * @param provider The provider.
+     * @return The builder.
+     */
+    @NotNull
+    SlotBuilder createSlotBuilder(@NotNull SlotProvider provider);
+
+    /**
+     * Create menu builder.
+     *
+     * @param rows The amount of rows.
+     * @param type The type.
+     * @return The builder.
+     */
+    @NotNull
+    MenuBuilder createMenuBuilder(int rows,
+                                  @NotNull MenuType type);
+
+    /**
+     * Combine the state of two menus together.
+     *
+     * @param base       The base menu.
+     * @param additional The additional state.
+     * @return The menu.
+     */
+    @NotNull
+    Menu blendMenuState(@NotNull Menu base,
+                        @NotNull Menu additional);
+
+    /**
+     * Clean up ClassLoader (etc.) to allow PlugMan support.
+     *
+     * @param plugin The plugin to clean up.
+     */
+    void clean(@NotNull EcoPlugin plugin);
+
+    /**
+     * Add new plugin.
+     *
+     * @param plugin The plugin.
+     */
+    void addNewPlugin(@NotNull EcoPlugin plugin);
+
+    /**
+     * Get plugin by name.
+     *
+     * @param name The name.
+     * @return The plugin.
+     */
+    @Nullable
+    EcoPlugin getPluginByName(@NotNull String name);
+
+    /**
+     * Get all loaded eco plugins.
+     *
+     * @return A list of plugin names in lowercase.
+     */
+    @NotNull
+    List<String> getLoadedPlugins();
+
+    /**
+     * Create a FastItemStack.
+     *
+     * @param itemStack The base ItemStack.
+     * @return The FastItemStack.
+     */
+    @NotNull
+    FastItemStack createFastItemStack(@NotNull ItemStack itemStack);
+
+    /**
+     * Register bStats metrics.
+     *
+     * @param plugin The plugin.
+     */
+    void registerBStats(@NotNull EcoPlugin plugin);
+
+    /**
+     * Get Adventure audiences.
+     *
+     * @return The audiences.
+     */
+    @Nullable
+    BukkitAudiences getAdventure();
+
+    /**
+     * Register a persistent data key to be stored.
+     *
+     * @param key The key.
+     */
+    void registerPersistentKey(@NotNull PersistentDataKey<?> key);
+
+    /**
+     * Get all registered keys.
+     *
+     * @return The keys.
+     */
+    @NotNull
+    Set<PersistentDataKey<?>> getRegisteredPersistentDataKeys();
+
+    /**
+     * Load a player profile.
+     *
+     * @param uuid The UUID.
+     * @return The profile.
+     */
+    @NotNull
+    PlayerProfile loadPlayerProfile(@NotNull UUID uuid);
+
+    /**
+     * Load the server profile.
+     *
+     * @return The profile.
+     */
+    @NotNull
+    ServerProfile getServerProfile();
+
+    /**
+     * Unload a player profile from memory.
+     * <p>
+     * This will not save the profile first.
+     *
+     * @param uuid The uuid.
+     */
+    void unloadPlayerProfile(@NotNull UUID uuid);
+
+    /**
+     * Create dummy entity - never spawned, exists purely in code.
+     *
+     * @param location The location.
+     * @return The entity.
+     */
+    @NotNull
+    Entity createDummyEntity(@NotNull Location location);
+
+    /**
+     * Create a {@link NamespacedKey} quickly
+     * <p>
+     * Bypasses the constructor, allowing for the creation of invalid keys, therefore this is
+     * considered unsafe and should only be called after the key has been confirmed to be valid.
+     *
+     * @param namespace The namespace.
+     * @param key       The key.
+     * @return The key.
+     */
+    @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);
+
+    /**
+     * Adapt base PDC to extended PDC.
+     *
+     * @param container The container.
+     * @return The extended container.
+     */
+    @NotNull
+    ExtendedPersistentDataContainer adaptPdc(@NotNull PersistentDataContainer container);
+
+    /**
+     * Create new PDC.
+     *
+     * @return The container.
+     */
+    @NotNull
+    PersistentDataContainer newPdc();
+
+    /**
+     * Get item from SNBT.
+     *
+     * @param snbt The NBT string.
+     * @return The ItemStack, or null if invalid.
+     */
+    @Nullable
+    ItemStack fromSNBT(@NotNull String snbt);
+
+    /**
+     * Convert item to SNBT.
+     *
+     * @param itemStack The item.
+     * @return The NBT string.
+     */
+    @NotNull
+    String toSNBT(@NotNull ItemStack itemStack);
+
+    /**
+     * Make TestableItem from SNBT.
+     *
+     * @param snbt The NBT string.
+     * @return The TestableItem.
+     */
+    @NotNull
+    TestableItem testableItemFromSNBT(@NotNull String snbt);
+
+    /**
+     * Get the texture of a skull.
+     *
+     * @param meta The skull meta.
+     * @return The texture, or null if not found.
+     */
+    @Nullable
+    String getSkullTexture(@NotNull SkullMeta meta);
+
+    /**
+     * Set the texture of a skull.
+     *
+     * @param meta   The skull meta.
+     * @param base64 The texture.
+     */
+    void setSkullTexture(@NotNull SkullMeta meta,
+                         @NotNull String base64);
+
+    /**
+     * Get the current server TPS.
+     *
+     * @return The TPS.
+     */
+    double getTPS();
+
+    /**
+     * Evaluate an expression.
+     *
+     * @param expression The expression.
+     * @param context    The context.
+     * @return The value of the expression, or zero if invalid.
+     */
+    double evaluate(@NotNull String expression,
+                    @NotNull MathContext context);
+
+    /**
+     * Get the menu a player currently has open.
+     *
+     * @param player The player.
+     * @return The menu, or null if no menu open.
+     */
+    @Nullable
+    Menu getOpenMenu(@NotNull Player player);
+
+    /**
+     * Sync commands.
+     */
+    void syncCommands();
+
+    /**
+     * Get the command map.
+     *
+     * @return The command map.
+     */
+    @NotNull CommandMap getCommandMap();
+
+    /**
+     * Unregister a command.
+     *
+     * @param command The command.
+     */
+    void unregisterCommand(@NotNull final PluginCommand command);
+
+    /**
+     * Get the instance of eco; the bridge between the api frontend and the implementation backend.
+     *
+     * @return The instance of eco.
+     */
     @ApiStatus.Internal
-    public static Handler getHandler() {
-        return handler;
+    static Eco get() {
+        return Instance.get();
     }
 
-    private Eco() {
-        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    /**
+     * Manages the internal frontend -> backend communication.
+     */
+    @ApiStatus.Internal
+    final class Instance {
+
+        /**
+         * Instance of eco.
+         */
+        @ApiStatus.Internal
+        private static Eco eco;
+
+        /**
+         * Initialize eco.
+         *
+         * @param eco The instance of eco.
+         */
+        @ApiStatus.Internal
+        static void set(@NotNull final Eco eco) {
+            Validate.isTrue(Instance.eco == null, "Already initialized!");
+
+            Instance.eco = eco;
+        }
+
+        /**
+         * Get eco.
+         *
+         * @return eco.
+         */
+        static Eco get() {
+            return eco;
+        }
+
+        private Instance() {
+            throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+        }
     }
 }

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

@@ -13,15 +13,16 @@ import com.willfp.eco.core.factory.MetadataValueFactory;
 import com.willfp.eco.core.factory.NamespacedKeyFactory;
 import com.willfp.eco.core.factory.RunnableFactory;
 import com.willfp.eco.core.integrations.IntegrationLoader;
-import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
 import com.willfp.eco.core.proxy.ProxyFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
 import com.willfp.eco.core.web.UpdateChecker;
 import org.apache.commons.lang.Validate;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.bukkit.Bukkit;
+import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.Listener;
+import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
@@ -79,12 +80,12 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     private final Set<String> loadedIntegrations = new HashSet<>();
 
     /**
-     * The internal plugin scheduler.
+     * The plugin scheduler.
      */
     private final Scheduler scheduler;
 
     /**
-     * The internal plugin Event Manager.
+     * The plugin Event Manager.
      */
     private final EventManager eventManager;
 
@@ -99,17 +100,17 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     private final LangYml langYml;
 
     /**
-     * The internal factory to produce {@link org.bukkit.NamespacedKey}s.
+     * The factory to produce {@link org.bukkit.NamespacedKey}s.
      */
     private final NamespacedKeyFactory namespacedKeyFactory;
 
     /**
-     * The internal factory to produce {@link org.bukkit.metadata.FixedMetadataValue}s.
+     * The factory to produce {@link org.bukkit.metadata.FixedMetadataValue}s.
      */
     private final MetadataValueFactory metadataValueFactory;
 
     /**
-     * The internal factory to produce {@link com.willfp.eco.core.scheduling.RunnableTask}s.
+     * The factory to produce {@link com.willfp.eco.core.scheduling.RunnableTask}s.
      */
     private final RunnableFactory runnableFactory;
 
@@ -152,10 +153,39 @@ 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.
+     * The tasks to run on enable.
+     */
+    private final List<Runnable> onEnable = new ArrayList<>();
+
+    /**
+     * The tasks to run on disable.
+     */
+    private final List<Runnable> onDisable = new ArrayList<>();
+
+    /**
+     * The tasks to run on reload.
+     */
+    private final List<Runnable> onReload = new ArrayList<>();
+
+    /**
+     * The tasks to run on load.
+     */
+    private final List<Runnable> onLoad = new ArrayList<>();
+
+    /**
+     * The tasks to run after load.
+     */
+    private final List<Runnable> afterLoad = new ArrayList<>();
+
+    /**
+     * 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,71 +266,103 @@ 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().
+        Eco must be initialized before any plugin's constructors
+        are called, as the constructors call Eco#get().
 
         To fix this, EcoSpigotPlugin an abstract class and the 'actual'
-        plugin class is EcoHandler - that way I can create the handler
+        plugin class is EcoImpl - that way I can initialize eco
         before any plugins are loaded while still having a separation between
-        the plugin class and the handler class (for code clarity).
+        the plugin class and the implementation class (for code clarity).
 
-        I don't really like the fact that the handler class *is* the
+        I don't really like the fact that the implementation class *is* the
         spigot plugin, but it is what it is.
 
         There is probably a better way of doing it - maybe with
-        some sort of HandlerCreator interface in order to still have
-        a standalone handler class, but then there would be an interface
+        some sort of EcoCrater interface in order to still have
+        a standalone eco 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 'createEco'
+        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) {
+        if (Eco.get() == null && this instanceof Eco) {
             /*
-            This code is only ever called by EcoSpigotPlugin (EcoHandler)
-            as it's the first plugin to load and it is a handler.
+            This code is only ever called by EcoSpigotPlugin (EcoImpl)
+            as it's the first plugin to load, and it's an instance of eco.
 
-            Any other plugins will never call this code as the handler
-            will have already been initialized.
+            Any other plugins will never call this code as eco will have already
+            been initialized.
              */
 
-            Eco.setHandler((Handler) this);
+            Eco.Instance.set((Eco) this);
         }
 
-        assert Eco.getHandler() != null;
+        assert Eco.get() != null;
 
-        this.resourceId = resourceId;
-        this.bStatsId = bStatsId;
-        this.proxyPackage = proxyPackage;
-        this.color = color;
-        this.supportingExtensions = supportingExtensions;
+        PluginProps generatedProps = Eco.get().getProps(pluginProps, this.getClass());
+        generatedProps.validate();
+        PluginProps props = this.mutateProps(generatedProps);
+        props.validate();
 
-        this.scheduler = Eco.getHandler().createScheduler(this);
-        this.eventManager = Eco.getHandler().createEventManager(this);
-        this.namespacedKeyFactory = Eco.getHandler().createNamespacedKeyFactory(this);
-        this.metadataValueFactory = Eco.getHandler().createMetadataValueFactory(this);
-        this.runnableFactory = Eco.getHandler().createRunnableFactory(this);
-        this.extensionLoader = Eco.getHandler().createExtensionLoader(this);
-        this.configHandler = Eco.getHandler().createConfigHandler(this);
-        this.logger = Eco.getHandler().createLogger(this);
-        this.proxyFactory = this.proxyPackage.equalsIgnoreCase("") ? null : Eco.getHandler().createProxyFactory(this);
+        this.resourceId = props.getResourceId();
+        this.bStatsId = props.getBStatsId();
+        this.proxyPackage = props.getProxyPackage();
+        this.color = props.getColor();
+        this.supportingExtensions = props.isSupportingExtensions();
+
+        this.proxyFactory = this.proxyPackage.equalsIgnoreCase("") ? null : Eco.get().createProxyFactory(this);
+        this.logger = Eco.get().createLogger(this);
+
+        this.getLogger().info("Initializing " + this.getColor() + this.getName());
+
+        this.scheduler = Eco.get().createScheduler(this);
+        this.eventManager = Eco.get().createEventManager(this);
+        this.namespacedKeyFactory = Eco.get().createNamespacedKeyFactory(this);
+        this.metadataValueFactory = Eco.get().createMetadataValueFactory(this);
+        this.runnableFactory = Eco.get().createRunnableFactory(this);
+        this.extensionLoader = Eco.get().createExtensionLoader(this);
+        this.configHandler = Eco.get().createConfigHandler(this);
 
         this.langYml = this.createLangYml();
+
+        if (!this.langYml.isValid()) {
+            this.getLogger().warning("Notify plugin authors " + String.join(", ", this.getDescription().getAuthors()) + " that");
+            this.getLogger().warning("they are missing crucial lang.yml keys! They can be found");
+            this.getLogger().warning("in the LangYml class.");
+        }
+
         this.configYml = this.createConfigYml();
 
-        Eco.getHandler().addNewPlugin(this);
+        Eco.get().addNewPlugin(this);
 
         /*
         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());
+        DefaultArtifactVersion runningVersion = new DefaultArtifactVersion(Eco.get().getEcoPlugin().getDescription().getVersion());
         DefaultArtifactVersion requiredVersion = new DefaultArtifactVersion(this.getMinimumEcoVersion());
         if (!(runningVersion.compareTo(requiredVersion) > 0 || runningVersion.equals(requiredVersion))) {
             this.getLogger().severe("You are running an outdated version of eco!");
@@ -321,21 +383,21 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.getLogger().info("");
         this.getLogger().info("Loading " + this.getColor() + this.getName());
 
-        if (this.getResourceId() != 0) {
+        if (this.getResourceId() != 0 && !Eco.get().getEcoPlugin().getConfigYml().getBool("no-update-checker")) {
             new UpdateChecker(this).getVersion(version -> {
                 DefaultArtifactVersion currentVersion = new DefaultArtifactVersion(this.getDescription().getVersion());
                 DefaultArtifactVersion mostRecentVersion = new DefaultArtifactVersion(version);
                 if (!(currentVersion.compareTo(mostRecentVersion) > 0 || currentVersion.equals(mostRecentVersion))) {
                     this.outdated = true;
-                    this.getLogger().warning("&c" + this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
-                    this.getLogger().warning("&cThe newest version is &f" + version);
-                    this.getLogger().warning("&cDownload the new version!");
+                    this.getLogger().warning(this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
+                    this.getLogger().warning("The newest version is " + version);
+                    this.getLogger().warning("Download the new version!");
                 }
             });
         }
 
         if (this.getBStatsId() != 0) {
-            Eco.getHandler().registerBStats(this);
+            Eco.get().registerBStats(this);
         }
 
         Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins())
@@ -344,16 +406,17 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
                 .collect(Collectors.toSet());
 
         if (enabledPlugins.contains("PlaceholderAPI".toLowerCase())) {
-            this.loadedIntegrations.add("PlaceholderAPI");
-            PlaceholderManager.addIntegration(Eco.getHandler().createPAPIIntegration(this));
+            Eco.get().createPAPIIntegration(this);
         }
 
-        this.loadIntegrationLoaders().forEach((integrationLoader -> {
+        this.loadIntegrationLoaders().forEach(integrationLoader -> {
             if (enabledPlugins.contains(integrationLoader.getPluginName().toLowerCase())) {
                 this.loadedIntegrations.add(integrationLoader.getPluginName());
                 integrationLoader.load();
             }
-        }));
+        });
+
+        this.loadedIntegrations.removeIf(pl -> pl.equalsIgnoreCase(this.getName()));
 
         this.getLogger().info("Loaded integrations: " + String.join(", ", this.getLoadedIntegrations()));
 
@@ -383,10 +446,20 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         }
 
         this.handleEnable();
+        this.onEnable.forEach(Runnable::run);
 
         this.getLogger().info("");
     }
 
+    /**
+     * Add new task to run on enable.
+     *
+     * @param task The task.
+     */
+    public final void onEnable(@NotNull final Runnable task) {
+        this.onEnable.add(task);
+    }
+
     /**
      * Default code to be executed on plugin disable.
      */
@@ -398,13 +471,23 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.getScheduler().cancelAll();
 
         this.handleDisable();
+        this.onDisable.forEach(Runnable::run);
 
         if (this.isSupportingExtensions()) {
             this.getExtensionLoader().unloadExtensions();
         }
 
         this.getLogger().info("Cleaning up...");
-        Eco.getHandler().getCleaner().clean(this);
+        Eco.get().clean(this);
+    }
+
+    /**
+     * Add new task to run on disable.
+     *
+     * @param task The task.
+     */
+    public final void onDisable(@NotNull final Runnable task) {
+        this.onDisable.add(task);
     }
 
     /**
@@ -415,6 +498,16 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         super.onLoad();
 
         this.handleLoad();
+        this.onLoad.forEach(Runnable::run);
+    }
+
+    /**
+     * Add new task to run on load.
+     *
+     * @param task The task.
+     */
+    public final void onLoad(@NotNull final Runnable task) {
+        this.onLoad.add(task);
     }
 
     /**
@@ -447,6 +540,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         }
 
         this.handleAfterLoad();
+        this.afterLoad.forEach(Runnable::run);
 
         this.reload();
 
@@ -457,23 +551,42 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.getLogger().info("Loaded " + this.color + this.getName());
     }
 
+    /**
+     * Add new task to run after load.
+     *
+     * @param task The task.
+     */
+    public final void afterLoad(@NotNull final Runnable task) {
+        this.afterLoad.add(task);
+    }
+
     /**
      * Reload the plugin.
      */
     public final void reload() {
         this.getConfigHandler().updateConfigs();
 
+        this.getScheduler().cancelAll();
         this.getConfigHandler().callUpdate();
         this.getConfigHandler().callUpdate(); // Call twice to fix issues
-        this.getScheduler().cancelAll();
 
         this.handleReload();
+        this.onReload.forEach(Runnable::run);
 
         for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
             extension.handleReload();
         }
     }
 
+    /**
+     * Add new task to run on enable.
+     *
+     * @param task The task.
+     */
+    public final void onReload(@NotNull final Runnable task) {
+        this.onReload.add(task);
+    }
+
     /**
      * Reload the plugin and return the time taken to reload.
      *
@@ -534,6 +647,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.
      *
@@ -578,7 +706,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @return lang.yml.
      */
     protected LangYml createLangYml() {
-        return new LangYml(this);
+        try {
+            return new LangYml(this);
+        } catch (NullPointerException e) {
+            this.getLogger().severe("Failed to load lang.yml!");
+            this.getLogger().severe("For the developer of this plugin: make sure you have a lang.yml");
+            e.printStackTrace();
+            Bukkit.getPluginManager().disablePlugin(this);
+            return null;
+        }
     }
 
     /**
@@ -589,7 +725,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @return config.yml.
      */
     protected ConfigYml createConfigYml() {
-        return new ConfigYml(this);
+        try {
+            return new ConfigYml(this);
+        } catch (NullPointerException e) {
+            this.getLogger().severe("Failed to load config.yml!");
+            this.getLogger().severe("For the developer of this plugin: make sure you have a config.yml");
+            e.printStackTrace();
+            Bukkit.getPluginManager().disablePlugin(this);
+            return null;
+        }
     }
 
     /**
@@ -635,7 +779,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);
     }
@@ -653,7 +797,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     public final FileConfiguration getConfig() {
         this.getLogger().warning("Call to default config method in eco plugin!");
 
-        return Objects.requireNonNull(this.getConfigYml().getBukkitHandle());
+        return Objects.requireNonNull(this.getConfigYml().toBukkit());
     }
 
     /**
@@ -702,7 +846,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @return The plugin.
      */
     public static EcoPlugin getPlugin(@NotNull final String pluginName) {
-        return Eco.getHandler().getPluginByName(pluginName);
+        return Eco.get().getPluginByName(pluginName);
     }
 
     /**
@@ -711,7 +855,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @return The set of names.
      */
     public static Set<String> getPluginNames() {
-        return new HashSet<>(Eco.getHandler().getLoadedPlugins());
+        return new HashSet<>(Eco.get().getLoadedPlugins());
     }
 
     /**
@@ -877,4 +1021,26 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     public ProxyFactory getProxyFactory() {
         return this.proxyFactory;
     }
+
+    /**
+     * Create a NamespacedKey.
+     *
+     * @param key The key.
+     * @return The namespaced key.
+     */
+    @NotNull
+    public NamespacedKey createNamespacedKey(@NotNull final String key) {
+        return this.getNamespacedKeyFactory().create(key);
+    }
+
+    /**
+     * Create a metadata value.
+     *
+     * @param value The value.
+     * @return The metadata value.
+     */
+    @NotNull
+    public FixedMetadataValue createMetadataValue(@NotNull final Object value) {
+        return this.getMetadataValueFactory().create(value);
+    }
 }

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

@@ -1,246 +0,0 @@
-package com.willfp.eco.core;
-
-import com.willfp.eco.core.config.updating.ConfigHandler;
-import com.willfp.eco.core.config.wrapper.ConfigFactory;
-import com.willfp.eco.core.data.PlayerProfileHandler;
-import com.willfp.eco.core.data.keys.KeyRegistry;
-import com.willfp.eco.core.drops.DropQueueFactory;
-import com.willfp.eco.core.events.EventManager;
-import com.willfp.eco.core.extensions.ExtensionLoader;
-import com.willfp.eco.core.factory.MetadataValueFactory;
-import com.willfp.eco.core.factory.NamespacedKeyFactory;
-import com.willfp.eco.core.factory.RunnableFactory;
-import com.willfp.eco.core.fast.FastItemStack;
-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.entity.Entity;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- * @see Eco#getHandler()
- */
-@ApiStatus.Internal
-public interface Handler {
-    /**
-     * Create a scheduler.
-     *
-     * @param plugin The plugin.
-     * @return The scheduler.
-     */
-    @NotNull
-    Scheduler createScheduler(@NotNull EcoPlugin plugin);
-
-    /**
-     * Create an event manager.
-     *
-     * @param plugin The plugin.
-     * @return The event manager.
-     */
-    @NotNull
-    EventManager createEventManager(@NotNull EcoPlugin plugin);
-
-    /**
-     * Create a NamespacedKey factory.
-     *
-     * @param plugin The plugin.
-     * @return The factory.
-     */
-    @NotNull
-    NamespacedKeyFactory createNamespacedKeyFactory(@NotNull EcoPlugin plugin);
-
-    /**
-     * Create a MetadataValue factory.
-     *
-     * @param plugin The plugin.
-     * @return The factory.
-     */
-    @NotNull
-    MetadataValueFactory createMetadataValueFactory(@NotNull EcoPlugin plugin);
-
-    /**
-     * Create a Runnable factory.
-     *
-     * @param plugin The plugin.
-     * @return The factory.
-     */
-    @NotNull
-    RunnableFactory createRunnableFactory(@NotNull EcoPlugin plugin);
-
-    /**
-     * Create an ExtensionLoader.
-     *
-     * @param plugin The plugin.
-     * @return The factory.
-     */
-    @NotNull
-    ExtensionLoader createExtensionLoader(@NotNull EcoPlugin plugin);
-
-    /**
-     * Create a config handler.
-     *
-     * @param plugin The plugin.
-     * @return The handler.
-     */
-    @NotNull
-    ConfigHandler createConfigHandler(@NotNull EcoPlugin plugin);
-
-    /**
-     * Create a logger.
-     *
-     * @param plugin The plugin.
-     * @return The logger.
-     */
-    @NotNull
-    Logger createLogger(@NotNull EcoPlugin plugin);
-
-    /**
-     * Create a PAPI integration.
-     *
-     * @param plugin The plugin.
-     * @return The integration.
-     */
-    @NotNull
-    PlaceholderIntegration createPAPIIntegration(@NotNull EcoPlugin plugin);
-
-    /**
-     * Create a proxy factory.
-     *
-     * @param plugin The plugin.
-     * @return The factory.
-     */
-    @NotNull
-    ProxyFactory createProxyFactory(@NotNull EcoPlugin plugin);
-
-    /**
-     * Get eco Spigot plugin.
-     *
-     * @return The plugin.
-     */
-    @NotNull
-    EcoPlugin getEcoPlugin();
-
-    /**
-     * Get config factory.
-     *
-     * @return The factory.
-     */
-    @NotNull
-    ConfigFactory getConfigFactory();
-
-    /**
-     * Get drop queue factory.
-     *
-     * @return The factory.
-     */
-    @NotNull
-    DropQueueFactory getDropQueueFactory();
-
-    /**
-     * Get GUI factory.
-     *
-     * @return The factory.
-     */
-    @NotNull
-    GUIFactory getGUIFactory();
-
-    /**
-     * Get cleaner.
-     *
-     * @return The cleaner.
-     */
-    @NotNull
-    Cleaner getCleaner();
-
-    /**
-     * Add new plugin.
-     *
-     * @param plugin The plugin.
-     */
-    void addNewPlugin(@NotNull EcoPlugin plugin);
-
-    /**
-     * Get plugin by name.
-     *
-     * @param name The name.
-     * @return The plugin.
-     */
-    @Nullable
-    EcoPlugin getPluginByName(@NotNull String name);
-
-    /**
-     * Get all loaded eco plugins.
-     *
-     * @return A list of plugin names in lowercase.
-     */
-    @NotNull
-    List<String> getLoadedPlugins();
-
-    /**
-     * Create a FastItemStack.
-     *
-     * @param itemStack The base ItemStack.
-     * @return The FastItemStack.
-     */
-    @NotNull
-    FastItemStack createFastItemStack(@NotNull ItemStack itemStack);
-
-    /**
-     * Register bStats metrics.
-     *
-     * @param plugin The plugin.
-     */
-    void registerBStats(@NotNull EcoPlugin plugin);
-
-    /**
-     * Get the requirement factory.
-     *
-     * @return The factory.
-     */
-    @NotNull
-    RequirementFactory getRequirementFactory();
-
-    /**
-     * Get Adventure audiences.
-     *
-     * @return The audiences.
-     */
-    @Nullable
-    BukkitAudiences getAdventure();
-
-    /**
-     * Get the key registry.
-     *
-     * @return The registry.
-     */
-    @NotNull
-    KeyRegistry getKeyRegistry();
-
-    /**
-     * Get the PlayerProfile handler.
-     *
-     * @return The handler.
-     */
-    @NotNull
-    PlayerProfileHandler getPlayerProfileHandler();
-
-    /**
-     * Create dummy entity - never spawned, exists purely in code.
-     *
-     * @param location The location.
-     * @return The entity.
-     */
-    @NotNull
-    Entity createDummyEntity(@NotNull Location location);
-}

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

@@ -13,7 +13,9 @@ import org.jetbrains.annotations.NotNull;
  * in the constructor.
  *
  * @param <T> The eco plugin type.
+ * @deprecated Leaky inheritance, shouldn't exist.
  */
+@Deprecated(since = "6.43.0", forRemoval = true)
 public abstract class PluginDependent<T extends EcoPlugin> {
     /**
      * The {@link EcoPlugin} that is stored.

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

@@ -0,0 +1,273 @@
+package com.willfp.eco.core;
+
+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.
+     * <p>
+     * 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.
+     */
+    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

@@ -26,7 +26,7 @@ public class Prerequisite {
      * Requires the server to be running an implementation of paper.
      */
     public static final Prerequisite HAS_PAPER = new Prerequisite(
-            () -> ClassUtils.exists("com.destroystokyo.paper.event.player.PlayerElytraBoostEvent"),
+            () -> ClassUtils.exists("com.destroystokyo.paper.event.block.BeaconEffectEvent"),
             "Requires server to be running paper (or a fork)"
     );
 
@@ -35,23 +35,34 @@ public class Prerequisite {
      *
      * @deprecated Use {@link EconomyManager#hasRegistrations()} instead.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public static final Prerequisite HAS_VAULT = new Prerequisite(
             () -> ClassUtils.exists("net.milkbowl.vault.economy.Economy"),
             "Requires server to have vault"
     );
 
+    /**
+     * Requires the server to be running 1.19.
+     */
+    public static final Prerequisite HAS_1_19 = new Prerequisite(
+            () -> ProxyConstants.NMS_VERSION.contains("19"),
+            "Requires server to be running 1.19+"
+    );
+
     /**
      * Requires the server to be running 1.18.
      */
     public static final Prerequisite HAS_1_18 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("18"),
+            () -> ProxyConstants.NMS_VERSION.contains("18") || HAS_1_19.isMet(),
             "Requires server to be running 1.18+"
     );
 
     /**
      * Requires the server to be running 1.17.
+     *
+     * @deprecated eco no longer supports versions before 1.17.
      */
+    @Deprecated(since = "6.25.2", forRemoval = true)
     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+"
@@ -59,7 +70,10 @@ public class Prerequisite {
 
     /**
      * Requires the server to be running an implementation of BungeeCord.
+     *
+     * @deprecated This will never return true.
      */
+    @Deprecated(since = "6.49.0", forRemoval = true)
     public static final Prerequisite HAS_BUNGEECORD = new Prerequisite(
             () -> ClassUtils.exists("net.md_5.bungee.api.event.ServerConnectedEvent"),
             "Requires server to be running BungeeCord (or a fork)"
@@ -67,7 +81,10 @@ public class Prerequisite {
 
     /**
      * Requires the server to be running an implementation of Velocity.
+     *
+     * @deprecated This will never return true.
      */
+    @Deprecated(since = "6.49.0", forRemoval = true)
     public static final Prerequisite HAS_VELOCITY = new Prerequisite(
             () -> ClassUtils.exists("com.velocitypowered.api.event.player.ServerConnectedEvent"),
             "Requires server to be running Velocity (or a fork)"

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

@@ -1,28 +1,37 @@
 package com.willfp.eco.core.command;
 
+import com.willfp.eco.core.EcoPlugin;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
 
 /**
- * Interface for all command implementations.
+ * Generic interface for commands.
  */
+@SuppressWarnings("null")
 public interface CommandBase {
+
     /**
      * Get command name.
      *
      * @return The name.
      */
-    String getName();
+    @NotNull String getName();
 
     /**
      * Get command permission.
      *
      * @return The permission.
      */
-    String getPermission();
+    @NotNull String getPermission();
 
     /**
      * If only players can execute the command.
@@ -37,72 +46,237 @@ public interface CommandBase {
      * @param command The subcommand.
      * @return The parent command.
      */
-    CommandBase addSubcommand(@NotNull CommandBase command);
+    @NotNull CommandBase addSubcommand(@NotNull CommandBase command);
+
+    /**
+     * Get the subcommands of the command.
+     *
+     * @return The subcommands.
+     */
+    @NotNull List<CommandBase> getSubcommands();
+
+    /**
+     * Intended for returning the enclosing CommandBase,
+     * when this instance is serving as the delegate command base.
+     *
+     * @return the wrapping object of this delegate.
+     */
+    default @NotNull CommandBase getWrapped() {
+        return this;
+    }
 
     /**
      * Handle command execution.
      * <p>
-     * Marked as default void with no implementation for backwards compatibility.
+     * This will always be called on command execution.
      *
      * @param sender The sender.
      * @param args   The args.
+     * @throws NotificationException naturally, this is handled as a part of the command system.
      */
-    default void onExecute(@NotNull CommandSender sender,
-                           @NotNull List<String> args) {
+    default void onExecute(@NotNull final CommandSender sender, @NotNull final List<String> args) throws NotificationException {
+        // Do nothing.
+    }
+
+    /**
+     * Handle command execution from players.
+     * <p>
+     * This will only be called if the sender is a player.
+     *
+     * @param sender The sender.
+     * @param args   The args.
+     * @throws NotificationException naturally, this is handled as a part of the command system.
+     */
+    default void onExecute(@NotNull final Player sender, @NotNull final List<String> args) throws NotificationException {
         // Do nothing.
     }
 
     /**
      * Handle tab completion.
      * <p>
-     * Marked as default void with no implementation for backwards compatibility.
+     * This will always be called on tab completion.
      *
      * @param sender The sender.
      * @param args   The args.
      * @return The results.
      */
-    default List<String> tabComplete(@NotNull CommandSender sender,
-                                     @NotNull List<String> args) {
+    @NotNull
+    default List<String> tabComplete(@NotNull final CommandSender sender, @NotNull final List<String> args) {
         return new ArrayList<>();
     }
 
     /**
-     * Get the handler.
+     * Handle tab completion.
+     * <p>
+     * This will only be called if the sender is a player.
      *
-     * @return The handler.
-     * @see CommandHandler
-     * @deprecated Use {@link CommandBase#onExecute(CommandSender, List)} instead.
+     * @param sender The sender.
+     * @param args   The args.
+     * @return The results.
      */
-    @Deprecated
-    CommandHandler getHandler();
+    @NotNull
+    default List<String> tabComplete(@NotNull final Player sender, @NotNull final List<String> args) {
+        return new ArrayList<>();
+    }
 
     /**
-     * Set the handler.
+     * Throws an {@link NotificationException} relating to a specific lang.yml key.
+     * <p>
+     * This is automatically handled with eco, and should not be surrounded by a
+     * try/catch block.
      *
-     * @param handler The handler.
-     * @see CommandHandler
-     * @deprecated Handlers have been deprecated.
+     * @param key The lang.yml key for the message to be sent.
+     * @throws NotificationException always.
      */
-    @Deprecated
-    void setHandler(@NotNull CommandHandler handler);
+    default void notify(@NotNull final String key) throws NotificationException {
+        throw new NotificationException(key);
+    }
 
     /**
-     * Get the tab completer.
+     * Throws an {@link NotificationException} relating to a specific lang.yml key
+     * if the passed object is null.
+     * <p>
+     * This is automatically handled with eco, and should not be surrounded by a
+     * try/catch block.
      *
-     * @return The tab completer.
-     * @see TabCompleteHandler
-     * @deprecated Use {@link CommandBase#tabComplete(CommandSender, List)} instead.
+     * @param obj The object to test.
+     * @param key The lang.yml key for the message to be sent.
+     * @param <T> The object type.
+     * @return Returns the object, definitely not-null.
+     * @throws NotificationException If the object is null.
      */
-    @Deprecated
-    TabCompleteHandler getTabCompleter();
+    @NotNull
+    default <T> T notifyNull(@Nullable final T obj,
+                             @NotNull final String key) throws NotificationException {
+        if (Objects.isNull(obj)) {
+            notify(key);
+        }
+
+        return Objects.requireNonNull(obj);
+    }
 
     /**
-     * Set the tab completer.
+     * Throws an {@link NotificationException} relating to a specific lang.yml key
+     * if the passed object doesn't match the predicate.
+     * <p>
+     * This is automatically handled with eco, and should not be surrounded by a
+     * try/catch block.
      *
-     * @param handler The handler.
-     * @see TabCompleteHandler
-     * @deprecated Handlers have been deprecated.
+     * @param obj       The object to test.
+     * @param key       The lang.yml key for the message to be sent.
+     * @param predicate The predicate to test the object against.
+     * @param <T>       The type of the object.
+     * @return Returns the object, definitely not-null.
+     * @throws NotificationException If the object doesn't satisfy the predicate.
      */
-    @Deprecated
-    void setTabCompleter(@NotNull TabCompleteHandler handler);
+    @NotNull
+    default <T> T notifyFalse(@NotNull final T obj,
+                              @NotNull final String key,
+                              @NotNull final Predicate<T> predicate) throws NotificationException {
+        notifyFalse(predicate.test(obj), key);
+
+        return obj;
+    }
+
+
+    /**
+     * Throws an {@link NotificationException} relating to a specific lang.yml key
+     * if a condition is false.
+     * <p>
+     * This is automatically handled with eco, and should not be surrounded by a
+     * try/catch block.
+     *
+     * @param condition The condition to test.
+     * @param key       The lang.yml key for the message to be sent.
+     * @return True.
+     * @throws NotificationException If the condition is false.
+     */
+    default boolean notifyFalse(final boolean condition,
+                                @NotNull final String key) throws NotificationException {
+        if (!condition) {
+            notify(key);
+        }
+
+        return true;
+    }
+
+    /**
+     * Throws an {@link NotificationException} relating to a specific lang.yml key
+     * if the passed string doesn't relate to a currently online player.
+     * <p>
+     * This is automatically handled with eco, and should not be surrounded by a
+     * try/catch block.
+     *
+     * @param playerName The player name.
+     * @param key        The lang.yml key for the message to be sent.
+     * @return Returns the player, definitely not-null.
+     * @throws NotificationException If the player name is invalid.
+     */
+    @NotNull
+    default Player notifyPlayerRequired(@Nullable final String playerName, @NotNull final String key) throws NotificationException {
+        if (playerName == null) {
+            notify(key);
+        }
+
+        assert playerName != null;
+
+        final Player player = Bukkit.getPlayer(playerName);
+
+        notifyNull(player, key);
+
+        return Objects.requireNonNull(player);
+    }
+
+    /**
+     * Throws an {@link NotificationException} relating to a specific lang.yml key
+     * if the passed string doesn't relate to a player on the server.
+     * <p>
+     * This is automatically handled with eco, and should not be surrounded by a
+     * try/catch block.
+     *
+     * @param playerName The player name.
+     * @param key        The lang.yml key for the message to be sent.
+     * @return Returns the offline player, definitely not-null.
+     * @throws NotificationException If the player name is invalid.
+     */
+    @NotNull
+    default OfflinePlayer notifyOfflinePlayerRequired(@Nullable final String playerName,
+                                                      @NotNull final String key) throws NotificationException {
+        if (playerName == null) {
+            notify(key);
+        }
+
+        assert playerName != null;
+
+        @SuppressWarnings("deprecation") final OfflinePlayer player = Bukkit.getOfflinePlayer(playerName);
+
+        boolean hasPlayedBefore = player.hasPlayedBefore() || player.isOnline();
+
+        notifyFalse(!hasPlayedBefore, key);
+
+        return player;
+    }
+
+    /**
+     * Throws an exception containing a langYml key if player doesn't have permission.
+     *
+     * @param player     The player.
+     * @param permission The permission.
+     * @param key        The lang.yml key for the message to be sent.
+     * @return The player.
+     * @throws NotificationException If the player doesn't have the required permission.
+     */
+    @NotNull
+    default Player notifyPermissionRequired(@NotNull final Player player,
+                                            @NotNull final String permission,
+                                            @NotNull final String key) throws NotificationException {
+        return notifyFalse(player, key, p -> p.hasPermission(permission));
+    }
+
+    /**
+     * Get the plugin.
+     *
+     * @return The plugin.
+     */
+    EcoPlugin getPlugin();
 }

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

@@ -1,29 +0,0 @@
-package com.willfp.eco.core.command;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-/**
- * A command handler handles the actual code for a command.
- * <p>
- * The replacement for {@link org.bukkit.command.CommandExecutor#onCommand(CommandSender, Command, String, String[])}
- *
- * @see CommandBase
- * @deprecated Handlers have been deprecated. This legacy system will eventually be removed,
- * update to use the new system: {@link CommandBase#onExecute(CommandSender, List)}.
- */
-@FunctionalInterface
-@Deprecated(since = "6.17.0")
-public interface CommandHandler {
-    /**
-     * The code to be called on execution.
-     *
-     * @param sender The sender.
-     * @param args   The arguments.
-     */
-    void onExecute(@NotNull CommandSender sender,
-                   @NotNull List<String> args);
-}

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

@@ -0,0 +1,34 @@
+package com.willfp.eco.core.command;
+
+/**
+ * A notification exception is thrown when {@link org.bukkit.command.CommandSender}s don't
+ * specify valid arguments in commands.
+ * <p>
+ * Methods in eco that throw this will contain automatic handling and thus
+ * should not be surrounded by try / catch blocks.
+ */
+public class NotificationException extends Exception {
+    /**
+     * The key for the lang.yml message to be sent.
+     */
+    private final String key;
+
+    /**
+     * Creates a notification exception.
+     *
+     * @param key The lang key of the notification.
+     */
+    public NotificationException(String key) {
+        super(key);
+        this.key = key;
+    }
+
+    /**
+     * Get the lang key.
+     *
+     * @return The lang key.
+     */
+    public String getKey() {
+        return key;
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.willfp.eco.core.command;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Plugin command bases can be registered directly with the server,
+ * this essentially functions as the interface that is implemented generically
+ * via {@link com.willfp.eco.core.command.impl.PluginCommand}.
+ */
+public interface PluginCommandBase extends CommandBase {
+    /**
+     * Register the PluginCommandBase to the bukkit commandMap.
+     */
+    void register();
+
+    /**
+     * Unregister the PluginCommandBase from the bukkit commandMap.
+     */
+    void unregister();
+
+    /**
+     * Get aliases. Leave null if this command is from plugin.yml.
+     *
+     * @return The aliases.
+     */
+    @NotNull
+    default List<String> getAliases() {
+        return new ArrayList<>();
+    }
+
+    /**
+     * Get description.
+     *
+     * @return The description.
+     */
+    @Nullable
+    default String getDescription() {
+        return null;
+    }
+}

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

@@ -1,30 +0,0 @@
-package com.willfp.eco.core.command;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-/**
- * A Tab Complete handler handles the actual tab-completion code.
- * <p>
- * The replacement for {@link org.bukkit.command.TabCompleter#onTabComplete(CommandSender, Command, String, String[])}
- *
- * @see CommandBase
- * @deprecated Handlers have been deprecated. This legacy system will eventually be removed,
- * update to use the new system: {@link CommandBase#tabComplete(CommandSender, List)}
- */
-@FunctionalInterface
-@Deprecated(since = "6.17.0")
-public interface TabCompleteHandler {
-    /**
-     * Handle Tab Completion.
-     *
-     * @param sender The sender.
-     * @param args   The arguments.
-     * @return The tab completion results.
-     */
-    List<String> tabComplete(@NotNull CommandSender sender,
-                             @NotNull List<String> args);
-}

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

@@ -0,0 +1,72 @@
+package com.willfp.eco.core.command.impl;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginIdentifiableCommand;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Delegates a bukkit command to an eco command (for registrations).
+ *
+ * @deprecated Internal command implementations have been removed from the API.
+ */
+@Deprecated(forRemoval = true, since = "6.49.0")
+public final class DelegatedBukkitCommand extends Command implements TabCompleter, PluginIdentifiableCommand {
+    /**
+     * The delegate command.
+     */
+    private final PluginCommand delegate;
+
+    /**
+     * Create a new delegated command.
+     *
+     * @param delegate The delegate.
+     */
+    public DelegatedBukkitCommand(@NotNull final PluginCommand delegate) {
+        super(delegate.getName());
+
+        this.delegate = delegate;
+    }
+
+    @Override
+    public boolean execute(@NotNull final CommandSender commandSender,
+                           @NotNull final String label,
+                           @NotNull final String[] args) {
+        return false;
+    }
+
+    @Override
+    public List<String> onTabComplete(@NotNull final CommandSender commandSender,
+                                      @NotNull final Command command,
+                                      @NotNull final String label,
+                                      @NotNull final String[] args) {
+        return List.of();
+    }
+
+    @NotNull
+    @Override
+    public Plugin getPlugin() {
+        return this.delegate.getPlugin();
+    }
+
+    @Override
+    public @NotNull String getPermission() {
+        return this.delegate.getPermission();
+    }
+
+    @NotNull
+    @Override
+    public String getDescription() {
+        return this.delegate.getDescription() == null ? "" : this.delegate.getDescription();
+    }
+
+    @NotNull
+    @Override
+    public List<String> getAliases() {
+        return this.delegate.getAliases();
+    }
+}

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

@@ -1,268 +0,0 @@
-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;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Abstract class for commands that can be handled.
- * <p>
- * Handled commands have a method to pass in raw input from bukkit commands
- * in order to execute the command-specific code. It's essentially an internal
- * layer, hence why it's a package-private class.
- */
-@SuppressWarnings({"DeprecatedIsStillUsed"})
-abstract class HandledCommand extends PluginDependent<EcoPlugin> implements CommandBase {
-    /**
-     * The name of the command.
-     */
-    private final String name;
-
-    /**
-     * The permission required to execute the command.
-     * <p>
-     * Written out as a string for flexibility with subclasses.
-     */
-    private final String permission;
-
-    /**
-     * Should the command only be allowed to be executed by players?
-     * <p>
-     * In other worlds, only allowed to be executed by console.
-     */
-    private final boolean playersOnly;
-
-    /**
-     * The actual code to be executed in the command.
-     */
-    @Deprecated
-    @Nullable
-    private CommandHandler handler = null;
-
-    /**
-     * The tab completion code to be executed in the command.
-     */
-    @Deprecated
-    @Nullable
-    private TabCompleteHandler tabCompleter = null;
-
-    /**
-     * All subcommands for the command.
-     */
-    private final List<CommandBase> subcommands;
-
-    /**
-     * Create a new command.
-     * <p>
-     * The name cannot be the same as an existing command as this will conflict.
-     *
-     * @param plugin      Instance of a plugin.
-     * @param name        The name used in execution.
-     * @param permission  The permission required to execute the command.
-     * @param playersOnly If only players should be able to execute this command.
-     */
-    HandledCommand(@NotNull final EcoPlugin plugin,
-                   @NotNull final String name,
-                   @NotNull final String permission,
-                   final boolean playersOnly) {
-        super(plugin);
-        this.name = name;
-        this.permission = permission;
-        this.playersOnly = playersOnly;
-        this.subcommands = new ArrayList<>();
-    }
-
-    /**
-     * Add a subcommand to the command.
-     *
-     * @param subcommand The subcommand.
-     * @return The parent command.
-     */
-    @Override
-    public final CommandBase addSubcommand(@NotNull final CommandBase subcommand) {
-        subcommands.add(subcommand);
-
-        return this;
-    }
-
-    /**
-     * Handle the command.
-     *
-     * @param sender The sender.
-     * @param args   The arguments.
-     */
-    protected final void handle(@NotNull final CommandSender sender,
-                                @NotNull final String[] args) {
-        if (!canExecute(sender, this, this.getPlugin())) {
-            return;
-        }
-
-        if (args.length > 0) {
-            for (CommandBase subcommand : this.getSubcommands()) {
-                if (subcommand.getName().equalsIgnoreCase(args[0])) {
-                    if (!canExecute(sender, subcommand, this.getPlugin())) {
-                        return;
-                    }
-
-                    ((HandledCommand) subcommand).handle(sender, Arrays.copyOfRange(args, 1, args.length));
-
-                    return;
-                }
-            }
-        }
-
-        if (this.getHandler() != null) {
-            this.getHandler().onExecute(sender, Arrays.asList(args));
-        } else {
-            this.onExecute(sender, Arrays.asList(args));
-        }
-    }
-
-    /**
-     * Handle the tab completion.
-     *
-     * @param sender The sender.
-     * @param args   The arguments.
-     * @return The tab completion results.
-     */
-    protected final List<String> handleTabCompletion(@NotNull final CommandSender sender,
-                                                     @NotNull final String[] args) {
-
-        if (!sender.hasPermission(this.getPermission())) {
-            return null;
-        }
-
-        if (args.length == 1) {
-            List<String> completions = new ArrayList<>();
-
-            StringUtil.copyPartialMatches(
-                    args[0],
-                    this.getSubcommands().stream().map(CommandBase::getName).collect(Collectors.toList()),
-                    completions
-            );
-
-            Collections.sort(completions);
-
-            if (!completions.isEmpty()) {
-                return completions;
-            }
-        }
-
-        if (args.length >= 2) {
-            HandledCommand command = null;
-
-            for (CommandBase subcommand : this.getSubcommands()) {
-                if (args[0].equalsIgnoreCase(subcommand.getName())) {
-                    command = (HandledCommand) subcommand;
-                }
-            }
-
-            if (command != null) {
-                return command.handleTabCompletion(sender, Arrays.copyOfRange(args, 1, args.length));
-            }
-        }
-
-        if (this.getTabCompleter() != null) {
-            return this.getTabCompleter().tabComplete(sender, Arrays.asList(args));
-        } else {
-            return this.tabComplete(sender, Arrays.asList(args));
-        }
-    }
-
-    /**
-     * If a sender can execute the command.
-     *
-     * @param sender  The sender.
-     * @param command The command.
-     * @param plugin  The plugin.
-     * @return If the sender can execute.
-     */
-    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;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the command name.
-     *
-     * @return The name.
-     */
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Get the permission required to execute the command.
-     *
-     * @return The permission.
-     */
-    public String getPermission() {
-        return this.permission;
-    }
-
-    /**
-     * Get if the command can only be executed by players.
-     *
-     * @return If players only.
-     */
-    public boolean isPlayersOnly() {
-        return this.playersOnly;
-    }
-
-    /**
-     * Get the subcommands of the command.
-     *
-     * @return The subcommands.
-     */
-    public List<CommandBase> getSubcommands() {
-        return this.subcommands;
-    }
-
-    @Deprecated
-    @Override
-    public @Nullable CommandHandler getHandler() {
-        return this.handler;
-    }
-
-    @Deprecated
-    @Override
-    public @Nullable TabCompleteHandler getTabCompleter() {
-        return this.tabCompleter;
-    }
-
-    @Deprecated
-    @Override
-    public void setHandler(@Nullable final CommandHandler handler) {
-        this.handler = handler;
-    }
-
-    @Deprecated
-    @Override
-    public void setTabCompleter(@Nullable final TabCompleteHandler tabCompleter) {
-        this.tabCompleter = tabCompleter;
-    }
-}

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

@@ -1,26 +1,28 @@
 package com.willfp.eco.core.command.impl;
 
+import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
+import com.willfp.eco.core.command.CommandBase;
+import com.willfp.eco.core.command.PluginCommandBase;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
 /**
- * PluginCommands are the class to be used instead of CommandExecutor,
- * they function as the base command, e.g. {@code /ecoenchants} would be a base command, with each
- * subsequent argument functioning as subcommands.
+ * PluginCommands are the class to be used instead of CommandExecutor, they function as the base
+ * command, e.g. {@code /ecoenchants} would be a base command, with each subsequent argument
+ * functioning as subcommands.
  * <p>
  * The command will not be registered until register() is called.
  * <p>
  * The name cannot be the same as an existing command as this will conflict.
  */
-public abstract class PluginCommand extends HandledCommand implements CommandExecutor, TabCompleter {
+public abstract class PluginCommand implements PluginCommandBase {
+    /**
+     * The delegate command.
+     */
+    private final PluginCommandBase delegate;
+
     /**
      * Create a new command.
      *
@@ -33,64 +35,51 @@ public abstract class PluginCommand extends HandledCommand implements CommandExe
                             @NotNull final String name,
                             @NotNull final String permission,
                             final boolean playersOnly) {
-        super(plugin, name, permission, playersOnly);
+        this.delegate = Eco.get().createPluginCommand(this, plugin, name, permission, playersOnly);
     }
 
-    /**
-     * Registers the command with the server,
-     * <p>
-     * Requires the command name to exist, defined in plugin.yml.
-     */
-    public final void register() {
-        org.bukkit.command.PluginCommand command = Bukkit.getPluginCommand(this.getName());
-        assert command != null;
-        command.setExecutor(this);
-        command.setTabCompleter(this);
-    }
-
-    /**
-     * Internal implementation used to clean up boilerplate.
-     * Used for parity with {@link CommandExecutor#onCommand(CommandSender, Command, String, String[])}.
-     *
-     * @param sender  The executor of the command.
-     * @param command The bukkit command.
-     * @param label   The name of the executed command.
-     * @param args    The arguments of the command (anything after the physical command name)
-     * @return If the command was processed by the linked {@link EcoPlugin}
-     */
     @Override
-    public final boolean onCommand(@NotNull final CommandSender sender,
-                                   @NotNull final Command command,
-                                   @NotNull final String label,
-                                   @NotNull final String[] args) {
-        if (!command.getName().equalsIgnoreCase(this.getName())) {
-            return false;
-        }
-
-        this.handle(sender, args);
-
-        return true;
+    public @NotNull String getName() {
+        return delegate.getName();
     }
 
-    /**
-     * Internal implementation used to clean up boilerplate.
-     * Used for parity with {@link TabCompleter#onTabComplete(CommandSender, Command, String, String[])}.
-     *
-     * @param sender  The executor of the command.
-     * @param command The bukkit command.
-     * @param label   The name of the executed command.
-     * @param args    The arguments of the command (anything after the physical command name).
-     * @return The list of tab-completions.
-     */
     @Override
-    public @Nullable List<String> onTabComplete(@NotNull final CommandSender sender,
-                                                @NotNull final Command command,
-                                                @NotNull final String label,
-                                                @NotNull final String[] args) {
-        if (!command.getName().equalsIgnoreCase(this.getName())) {
-            return null;
-        }
+    public @NotNull String getPermission() {
+        return delegate.getPermission();
+    }
 
-        return this.handleTabCompletion(sender, args);
+    @Override
+    public boolean isPlayersOnly() {
+        return delegate.isPlayersOnly();
+    }
+
+    @Override
+    public @NotNull CommandBase addSubcommand(@NotNull CommandBase command) {
+        return delegate.addSubcommand(command);
+    }
+
+    @Override
+    public @NotNull List<CommandBase> getSubcommands() {
+        return delegate.getSubcommands();
+    }
+
+    @Override
+    public @NotNull CommandBase getWrapped() {
+        return this;
+    }
+
+    @Override
+    public void register() {
+        delegate.register();
+    }
+
+    @Override
+    public void unregister() {
+        delegate.unregister();
+    }
+
+    @Override
+    public EcoPlugin getPlugin() {
+        return delegate.getPlugin();
     }
 }

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

@@ -1,13 +1,21 @@
 package com.willfp.eco.core.command.impl;
 
+import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.command.CommandBase;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+
 /**
- * Subcommands can be added to PluginCommands or to other Subcommands.
+ * A command implementation that must exist as a subcommand (i.e. cannot be registered directly).
  */
-public abstract class Subcommand extends HandledCommand {
+public abstract class Subcommand implements CommandBase {
+    /**
+     * The delegate command.
+     */
+    private final CommandBase delegate;
+
     /**
      * Create subcommand.
      *
@@ -20,7 +28,7 @@ public abstract class Subcommand extends HandledCommand {
                          @NotNull final String name,
                          @NotNull final String permission,
                          final boolean playersOnly) {
-        super(plugin, name, permission, playersOnly);
+        this.delegate = Eco.get().createSubcommand(this, plugin, name, permission, playersOnly);
     }
 
     /**
@@ -33,6 +41,41 @@ public abstract class Subcommand extends HandledCommand {
     protected Subcommand(@NotNull final EcoPlugin plugin,
                          @NotNull final String name,
                          @NotNull final CommandBase parent) {
-        super(plugin, name, parent.getPermission(), parent.isPlayersOnly());
+        this(plugin, name, parent.getPermission(), parent.isPlayersOnly());
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return delegate.getName();
+    }
+
+    @Override
+    public @NotNull String getPermission() {
+        return delegate.getPermission();
+    }
+
+    @Override
+    public boolean isPlayersOnly() {
+        return delegate.isPlayersOnly();
+    }
+
+    @Override
+    public @NotNull CommandBase addSubcommand(@NotNull CommandBase command) {
+        return delegate.addSubcommand(command);
+    }
+
+    @Override
+    public @NotNull List<CommandBase> getSubcommands() {
+        return delegate.getSubcommands();
+    }
+
+    @Override
+    public @NotNull CommandBase getWrapped() {
+        return this;
+    }
+
+    @Override
+    public EcoPlugin getPlugin() {
+        return delegate.getPlugin();
     }
 }

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

@@ -23,13 +23,31 @@ public abstract class BaseConfig extends LoadableConfigWrapper {
                          @NotNull final PluginLike plugin,
                          final boolean removeUnused,
                          @NotNull final ConfigType type) {
-        super(Eco.getHandler().getConfigFactory().createUpdatableConfig(
+        this(configName, plugin, removeUnused, type, true);
+    }
+
+    /**
+     * Create new Base Config.
+     *
+     * @param plugin               The plugin or extension.
+     * @param configName           The config name (excluding extension).
+     * @param removeUnused         If unused sections should be removed.
+     * @param type                 The config type.
+     * @param requiresChangeToSave If changes must be applied to save the config.
+     */
+    protected BaseConfig(@NotNull final String configName,
+                         @NotNull final PluginLike plugin,
+                         final boolean removeUnused,
+                         @NotNull final ConfigType type,
+                         final boolean requiresChangeToSave) {
+        super(Eco.get().createUpdatableConfig(
                 configName,
                 plugin,
                 "",
                 plugin.getClass(),
                 removeUnused,
-                type
+                type,
+                requiresChangeToSave
         ));
     }
 }

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

@@ -0,0 +1,29 @@
+package com.willfp.eco.core.config;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Builder for configs to create them programmatically.
+ */
+public class BuildableConfig extends GenericConfig {
+    /**
+     * Create a new empty config builder.
+     */
+    public BuildableConfig() {
+
+    }
+
+    /**
+     * Add to the config builder.
+     *
+     * @param path   The path.
+     * @param object The object.
+     * @return The builder.
+     */
+    public BuildableConfig add(@NotNull final String path,
+                               @Nullable final Object object) {
+        set(path, object);
+        return this;
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.willfp.eco.core.config;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * Config types, classified by file extension.
  */
@@ -7,10 +9,33 @@ public enum ConfigType {
     /**
      * .json config.
      */
-    JSON,
+    JSON("json"),
 
     /**
      * .yml config.
      */
-    YAML
+    YAML("yml"),
+
+    /**
+     * .toml config.
+     */
+    TOML("toml");
+
+    /**
+     * The file extension.
+     */
+    private final String extension;
+
+    ConfigType(@NotNull final String extension) {
+        this.extension = extension;
+    }
+
+    /**
+     * Get the file extension.
+     *
+     * @return The extension.
+     */
+    public String getExtension() {
+        return extension;
+    }
 }

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

@@ -0,0 +1,157 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.config.interfaces.Config;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Utilities / API methods for configs.
+ */
+public final class Configs {
+    /**
+     * Load a Config from a bukkit {@link ConfigurationSection}.
+     *
+     * @param config The ConfigurationSection.
+     * @return The config.
+     */
+    @NotNull
+    public static Config fromBukkit(@Nullable final ConfigurationSection config) {
+        return config == null ? empty() : Eco.get().wrapConfigurationSection(config);
+    }
+
+    /**
+     * Load a config from an {@link InputStream}.
+     * <p>
+     * Only for yaml configs.
+     *
+     * @param stream The InputStream.
+     * @return The config.
+     */
+    @NotNull
+    public static Config fromStream(@Nullable final InputStream stream) {
+        return stream != null ? fromBukkit(YamlConfiguration.loadConfiguration(
+                new InputStreamReader(stream)
+        )) : empty();
+    }
+
+    /**
+     * Load a config from a file.
+     *
+     * @param file The file.
+     * @return The config.
+     */
+    @NotNull
+    public static Config fromFile(@Nullable final File file) {
+        if (file == null) {
+            return empty();
+        }
+
+        int lastIndex = file.getName().lastIndexOf(".");
+
+        if (lastIndex < 0) {
+            return empty();
+        }
+
+        for (ConfigType type : ConfigType.values()) {
+            if (file.getName().substring(lastIndex + 1).equalsIgnoreCase(type.getExtension())) {
+                return fromFile(file, type);
+            }
+        }
+
+        return empty();
+    }
+
+    /**
+     * Load a config from a file.
+     *
+     * @param file The file.
+     * @param type The type.
+     * @return The config.
+     */
+    @NotNull
+    public static Config fromFile(@Nullable final File file,
+                                  @NotNull final ConfigType type) {
+        if (file == null) {
+            return empty();
+        }
+
+        try {
+            return Eco.get().createConfig(Files.readString(file.toPath()), type);
+        } catch (IOException e) {
+            return empty();
+        }
+    }
+
+    /**
+     * Load config from map (uses {@link ConfigType#JSON}).
+     *
+     * @param values The values.
+     * @return The config.
+     */
+    @NotNull
+    public static Config fromMap(@NotNull final Map<String, Object> values) {
+        return fromMap(values, ConfigType.JSON);
+    }
+
+    /**
+     * Load config from map.
+     *
+     * @param values The values.
+     * @param type   The type.
+     * @return The config.
+     */
+    @NotNull
+    public static Config fromMap(@NotNull final Map<String, Object> values,
+                                 @NotNull final ConfigType type) {
+        return Eco.get().createConfig(values, type);
+    }
+
+    /**
+     * Create empty config (uses {@link ConfigType#JSON}).
+     *
+     * @return An empty config.
+     */
+    @NotNull
+    public static Config empty() {
+        return fromMap(new HashMap<>(), ConfigType.JSON);
+    }
+
+    /**
+     * Create empty config.
+     *
+     * @param type The type.
+     * @return An empty config.
+     */
+    @NotNull
+    public static Config empty(@NotNull final ConfigType type) {
+        return fromMap(new HashMap<>(), type);
+    }
+
+    /**
+     * Load config from string.
+     *
+     * @param contents The contents of the config.
+     * @param type     The config type.
+     * @return The config.
+     */
+    @NotNull
+    public static Config fromString(@NotNull final String contents,
+                                    @NotNull final ConfigType type) {
+        return Eco.get().createConfig(contents, type);
+    }
+
+    private Configs() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+}

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

@@ -31,13 +31,14 @@ public abstract class ExtendableConfig extends LoadableConfigWrapper {
                                @NotNull final String subDirectoryPath,
                                @NotNull final ConfigType type,
                                @NotNull final String... updateBlacklist) {
-        super(Eco.getHandler().getConfigFactory().createUpdatableConfig(
+        super(Eco.get().createUpdatableConfig(
                 configName,
                 plugin,
                 subDirectoryPath,
                 source,
                 removeUnused,
                 type,
+                true,
                 updateBlacklist
         ));
     }

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

@@ -0,0 +1,27 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.config.wrapper.ConfigWrapper;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Generic config to simplify creating custom configs without having
+ * to meddle with delegation.
+ */
+public abstract class GenericConfig extends ConfigWrapper<Config> {
+    /**
+     * Create a new generic config.
+     */
+    protected GenericConfig() {
+        super(Configs.empty());
+    }
+
+    /**
+     * Create a new generic config.
+     *
+     * @param type The config type.
+     */
+    protected GenericConfig(@NotNull final ConfigType type) {
+        super(Configs.empty(type));
+    }
+}

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

@@ -21,12 +21,13 @@ public abstract class StaticBaseConfig extends LoadableConfigWrapper {
     protected StaticBaseConfig(@NotNull final String configName,
                                @NotNull final PluginLike plugin,
                                @NotNull final ConfigType type) {
-        super(Eco.getHandler().getConfigFactory().createLoadableConfig(
+        super(Eco.get().createLoadableConfig(
                 configName,
                 plugin,
                 "",
                 plugin.getClass(),
-                type
+                type,
+                true
         ));
     }
 }

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

@@ -3,22 +3,70 @@ package com.willfp.eco.core.config;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.config.interfaces.Config;
 import com.willfp.eco.core.config.wrapper.ConfigWrapper;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Config that exists purely in the code, not linked to any file.
  * <p>
  * Use for inline configs to move data around or to add subsections to other configs.
+ *
+ * @deprecated Poorly named class, makes the config system seem needlessly complicated.
  */
+@Deprecated(since = "6.44.0", forRemoval = true)
 public class TransientConfig extends ConfigWrapper<Config> {
     /**
+     * @param config The ConfigurationSection handle.
+     */
+    public TransientConfig(@NotNull final ConfigurationSection config) {
+        super(Eco.get().wrapConfigurationSection(config));
+    }
+
+    /**
+     * Exists for backwards compatibility, YamlConfigurations are ConfigurationSections.
+     *
      * @param config The YamlConfiguration handle.
      */
     public TransientConfig(@NotNull final YamlConfiguration config) {
-        super(Eco.getHandler().getConfigFactory().createConfig(config));
+        this((ConfigurationSection) config);
+    }
+
+    /**
+     * @param stream The InputStream.
+     */
+    public TransientConfig(@Nullable final InputStream stream) {
+        super(stream != null ? Eco.get().wrapConfigurationSection(YamlConfiguration.loadConfiguration(
+                new InputStreamReader(stream)
+        )) : new TransientConfig());
+    }
+
+    /**
+     * @param file The File.
+     * @deprecated Specify the config type to prevent bugs.
+     */
+    @Deprecated(since = "6.30.0", forRemoval = true)
+    public TransientConfig(@Nullable final File file) {
+        this(file, ConfigType.YAML);
+    }
+
+    /**
+     * @param file The file.
+     * @param type The config type to try read from.
+     */
+    public TransientConfig(@Nullable final File file,
+                           @NotNull final ConfigType type) {
+        super(file != null ? Eco.get().createConfig(readFile(file), type)
+                : new TransientConfig());
     }
 
     /**
@@ -27,14 +75,25 @@ public class TransientConfig extends ConfigWrapper<Config> {
      * @param values The values.
      */
     public TransientConfig(@NotNull final Map<String, Object> values) {
-        super(Eco.getHandler().getConfigFactory().createConfig(values));
+        super(Eco.get().createConfig(values, ConfigType.YAML));
+    }
+
+    /**
+     * Create a new empty transient config.
+     *
+     * @param values The values.
+     * @param type   The type.
+     */
+    public TransientConfig(@NotNull final Map<String, Object> values,
+                           @NotNull final ConfigType type) {
+        super(Eco.get().createConfig(values, type));
     }
 
     /**
      * Create a new empty transient config.
      */
     public TransientConfig() {
-        super(Eco.getHandler().getConfigFactory().createConfig("", ConfigType.YAML));
+        this(new HashMap<>(), ConfigType.JSON);
     }
 
     /**
@@ -43,6 +102,24 @@ public class TransientConfig extends ConfigWrapper<Config> {
      */
     public TransientConfig(@NotNull final String contents,
                            @NotNull final ConfigType type) {
-        super(Eco.getHandler().getConfigFactory().createConfig(contents, type));
+        super(Eco.get().createConfig(contents, type));
+    }
+
+    /**
+     * Read a file to a string.
+     *
+     * @param file The file.
+     * @return The string.
+     */
+    private static String readFile(@Nullable final File file) {
+        if (file == null) {
+            return "";
+        }
+
+        try {
+            return Files.readString(file.toPath());
+        } catch (IOException e) {
+            return "";
+        }
     }
 }

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

@@ -6,10 +6,32 @@ import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+
 /**
  * Default plugin lang.yml.
  */
 public class LangYml extends BaseConfig {
+    /**
+     * The messages key.
+     */
+    public static final String KEY_MESSAGES = "messages";
+
+    /**
+     * The prefix key.
+     */
+    public static final String KEY_PREFIX = "messages.prefix";
+
+    /**
+     * The no permission key.
+     */
+    public static final String KEY_NO_PERMISSION = "messages.no-permission";
+
+    /**
+     * The not player key.
+     */
+    public static final String KEY_NOT_PLAYER = "messages.not-player";
+
     /**
      * Lang.yml.
      *
@@ -19,13 +41,31 @@ public class LangYml extends BaseConfig {
         super("lang", plugin, false, ConfigType.YAML);
     }
 
+    /**
+     * lang.yml requires certain keys to be present.
+     * <p>
+     * If the lang.yml does not contain these keys, it is considered to be
+     * invalid and thus will show a warning in console.
+     *
+     * @return If valid.
+     */
+    public boolean isValid() {
+        for (String key : List.of(KEY_MESSAGES, KEY_PREFIX, KEY_NO_PERMISSION, KEY_NOT_PLAYER)) {
+            if (!this.has(key)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Get the prefix for messages in chat.
      *
      * @return The prefix.
      */
     public String getPrefix() {
-        return this.getFormattedString("messages.prefix");
+        return this.getFormattedString(KEY_PREFIX);
     }
 
     /**
@@ -34,7 +74,7 @@ public class LangYml extends BaseConfig {
      * @return The message.
      */
     public String getNoPermission() {
-        return getPrefix() + this.getFormattedString("messages.no-permission");
+        return getPrefix() + this.getFormattedString(KEY_NO_PERMISSION);
     }
 
     /**
@@ -56,6 +96,6 @@ public class LangYml extends BaseConfig {
      */
     public String getMessage(@NotNull final String message,
                              @NotNull final StringUtils.FormatOption option) {
-        return getPrefix() + this.getFormattedString("messages." + message, option);
+        return getPrefix() + this.getFormattedString(KEY_MESSAGES + "." + message, option);
     }
 }

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

@@ -1,16 +1,27 @@
 package com.willfp.eco.core.config.interfaces;
 
+import com.willfp.eco.core.config.BuildableConfig;
 import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.TransientConfig;
+import com.willfp.eco.core.config.Configs;
+import com.willfp.eco.core.placeholder.AdditionalPlayer;
+import com.willfp.eco.core.placeholder.InjectablePlaceholder;
+import com.willfp.eco.core.placeholder.PlaceholderInjectable;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.StringUtils;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * All configs implement this interface.
@@ -18,11 +29,16 @@ 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.
+     * <p>
+     * Configs no longer have caches as they have in previous versions.
      */
-    void clearCache();
+    @Deprecated(since = "6.31.1", forRemoval = true)
+    default void clearCache() {
+        // Do nothing.
+    }
 
     /**
      * Convert the config into readable text.
@@ -48,9 +64,21 @@ public interface Config extends Cloneable {
     @NotNull
     List<String> getKeys(boolean deep);
 
+    /**
+     * Recurse config keys.
+     *
+     * @param found The found keys.
+     * @param root  The root.
+     * @return The keys.
+     */
+    @NotNull
+    default List<String> recurseKeys(@NotNull Set<String> found,
+                                     @NotNull String root) {
+        return new ArrayList<>();
+    }
+
     /**
      * Get an object from config.
-     * Default implementations call {@link org.bukkit.configuration.file.YamlConfiguration#get(String)}.
      *
      * @param path The path.
      * @return The object.
@@ -60,7 +88,6 @@ public interface Config extends Cloneable {
 
     /**
      * Set an object in config.
-     * Default implementations call {@link org.bukkit.configuration.file.YamlConfiguration#set(String, Object)}
      *
      * @param path   The path.
      * @param object The object.
@@ -76,7 +103,7 @@ public interface Config extends Cloneable {
      */
     @NotNull
     default Config getSubsection(@NotNull String path) {
-        return Objects.requireNonNullElse(getSubsectionOrNull(path), new TransientConfig());
+        return Objects.requireNonNullElse(getSubsectionOrNull(path), Configs.empty());
     }
 
     /**
@@ -132,6 +159,20 @@ public interface Config extends Cloneable {
         return Double.valueOf(getDoubleFromExpression(path, player)).intValue();
     }
 
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path              The key to fetch the value from.
+     * @param player            The player to evaluate placeholders with respect to.
+     * @param additionalPlayers The additional players to evaluate placeholders with respect to.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default int getIntFromExpression(@NotNull String path,
+                                     @Nullable Player player,
+                                     @NotNull Collection<AdditionalPlayer> additionalPlayers) {
+        return Double.valueOf(getDoubleFromExpression(path, player, additionalPlayers)).intValue();
+    }
+
 
     /**
      * Get an integer from config.
@@ -235,36 +276,7 @@ public interface Config extends Cloneable {
      */
     @NotNull
     default String getString(@NotNull String path) {
-        return getString(path, false);
-    }
-
-    /**
-     * Get a string from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param format If the string should be formatted.
-     * @return The found value, or an empty string if not found.
-     * @deprecated Since 6.18.0, {@link Config#getString(String)} is not formatted by default.
-     */
-    @Deprecated(since = "6.18.0")
-    default String getString(@NotNull String path,
-                             boolean format) {
-        return this.getString(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
-    }
-
-    /**
-     * Get a string from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param option The format option.
-     * @return The found value, or an empty string if not found.
-     * @deprecated Use {@link Config#getFormattedString(String, StringUtils.FormatOption)} instead.
-     */
-    @NotNull
-    @Deprecated
-    default String getString(@NotNull String path,
-                             @NotNull final StringUtils.FormatOption option) {
-        return this.getString(path, true, option);
+        return getString(path, false, StringUtils.FormatOption.WITHOUT_PLACEHOLDERS);
     }
 
     /**
@@ -319,36 +331,6 @@ public interface Config extends Cloneable {
         return getStringOrNull(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
-    /**
-     * Get a string from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param format If the string should be formatted.
-     * @return The found value, or null if not found.
-     * @deprecated Since 6.18.0, {@link Config#getString(String)} is not formatted by default.
-     */
-    @Nullable
-    @Deprecated(since = "6.18.0")
-    default String getStringOrNull(@NotNull String path,
-                                   boolean format) {
-        return this.getStringOrNull(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
-    }
-
-    /**
-     * Get a string from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param option The format option.
-     * @return The found value, or null if not found.
-     * @deprecated Use {@link Config#getFormattedString(String, StringUtils.FormatOption)} instead.
-     */
-    @Nullable
-    @Deprecated
-    default String getStringOrNull(@NotNull String path,
-                                   @NotNull StringUtils.FormatOption option) {
-        return this.getStringOrNull(path, true, option);
-    }
-
     /**
      * Get a string from config.
      *
@@ -403,36 +385,6 @@ public interface Config extends Cloneable {
         return getStrings(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
-    /**
-     * Get a list of strings from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param format If the strings should be formatted.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     * @deprecated Since 6.18.0, {@link Config#getString(String)} is not formatted by default.
-     */
-    @NotNull
-    @Deprecated(since = "6.18.0")
-    default List<String> getStrings(@NotNull String path,
-                                    boolean format) {
-        return this.getStrings(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
-    }
-
-    /**
-     * Get a list of strings from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param option The format option.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     * @deprecated Use {@link Config#getFormattedStrings(String, StringUtils.FormatOption)} instead.
-     */
-    @NotNull
-    @Deprecated
-    default List<String> getStrings(@NotNull String path,
-                                    @NotNull StringUtils.FormatOption option) {
-        return getStrings(path, false, option);
-    }
-
     /**
      * Get a list of strings from config.
      *
@@ -491,36 +443,6 @@ public interface Config extends Cloneable {
         return getStringsOrNull(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
-    /**
-     * Get a list of strings from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param format If the strings should be formatted.
-     * @return The found value, or null if not found.
-     * @deprecated Since 6.18.0, {@link Config#getString(String)} is not formatted by default.
-     */
-    @Nullable
-    @Deprecated(since = "6.18.0")
-    default List<String> getStringsOrNull(@NotNull String path,
-                                          boolean format) {
-        return getStringsOrNull(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
-    }
-
-    /**
-     * Get a list of strings from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param option The format option.
-     * @return The found value, or null if not found.
-     * @deprecated Use {@link Config#getFormattedStringsOrNull(String, StringUtils.FormatOption)} instead.
-     */
-    @Nullable
-    @Deprecated
-    default List<String> getStringsOrNull(@NotNull String path,
-                                          @NotNull StringUtils.FormatOption option) {
-        return getStringsOrNull(path, false, option);
-    }
-
     /**
      * Get a list of strings from config.
      *
@@ -563,7 +485,21 @@ 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);
+    }
+
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path   The key to fetch the value from.
+     * @param player The player to evaluate placeholders with respect to.
+     * @param additionalPlayers The additional players to evaluate placeholders with respect to.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default double getDoubleFromExpression(@NotNull String path,
+                                           @Nullable Player player,
+                                           @NotNull Collection<AdditionalPlayer> additionalPlayers) {
+        return NumberUtils.evaluateExpression(this.getString(path), player, this, additionalPlayers);
     }
 
     /**
@@ -629,4 +565,48 @@ public interface Config extends Cloneable {
      * @return The clone.
      */
     Config clone();
+
+    @Override
+    default void addInjectablePlaceholder(@NotNull Iterable<InjectablePlaceholder> placeholders) {
+        // Do nothing.
+    }
+
+    @Override
+    default @NotNull List<InjectablePlaceholder> getPlaceholderInjections() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    default void clearInjectedPlaceholders() {
+        // Do nothing.
+    }
+
+    /**
+     * Convert the config to a map of values.
+     *
+     * @return The values.
+     */
+    default Map<String, Object> toMap() {
+        return new HashMap<>();
+    }
+
+    /**
+     * Convert the config to a map of values.
+     *
+     * @return The values.
+     */
+    default ConfigurationSection toBukkit() {
+        YamlConfiguration empty = new YamlConfiguration();
+        empty.createSection("temp", this.toMap());
+        return empty.getConfigurationSection("temp");
+    }
+
+    /**
+     * Create a new config builder.
+     *
+     * @return The builder.
+     */
+    static BuildableConfig builder() {
+        return new BuildableConfig();
+    }
 }

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

@@ -1,63 +0,0 @@
-package com.willfp.eco.core.config.interfaces;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * JSON config.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-@SuppressWarnings("DeprecatedIsStillUsed")
-public interface JSONConfig extends Config {
-    /**
-     * Get a list of subsections from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     */
-    @NotNull
-    default List<JSONConfig> getSubsections(@NotNull String path) {
-        return Objects.requireNonNullElse(getSubsectionsOrNull(path), new ArrayList<>());
-    }
-
-    /**
-     * Get a list of subsections from config.
-     *
-     * @param path The key to fetch the value from.
-     * @return The found value, or null if not found.
-     */
-    @Nullable
-    List<JSONConfig> getSubsectionsOrNull(@NotNull String path);
-
-
-    /**
-     * Get subsection from config.
-     *
-     * @param path The key to check.
-     * @return The subsection. Throws NPE if not found.
-     */
-    @Override
-    @NotNull
-    JSONConfig getSubsection(@NotNull String path);
-
-    /**
-     * Get subsection from config.
-     *
-     * @param path The key to check.
-     * @return The subsection, or null if not found.
-     */
-    @Override
-    @Nullable
-    JSONConfig getSubsectionOrNull(@NotNull String path);
-
-    @Override
-    JSONConfig clone();
-}

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

@@ -1,7 +1,7 @@
 package com.willfp.eco.core.config.interfaces;
 
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -47,14 +47,21 @@ public interface LoadableConfig extends Config {
     /**
      * Get bukkit {@link YamlConfiguration}.
      * <p>
-     * This method is not recommended unless absolutely required as it
-     * only returns true if the type of config is {@link com.willfp.eco.core.config.ConfigType#YAML},
-     * and if the handle is an {@link YamlConfiguration} specifically. This depends on the internals
-     * and the implementation, and so may cause problems - it exists mostly for parity with
-     * {@link JavaPlugin#getConfig()}.
+     * This used to represent the underlying config, but since 6.30.0 configs use
+     * their own implementations internally, without relying on bukkit.
      *
      * @return The config, or null if config is not yaml-based.
+     * @deprecated Use toBukkit() instead.
      */
     @Nullable
-    YamlConfiguration getBukkitHandle();
+    @Deprecated(since = "6.30.0", forRemoval = true)
+    default YamlConfiguration getBukkitHandle() {
+        return this.toBukkit();
+    }
+
+    /**
+     * Convert the config to a bukkit {@link YamlConfiguration}.
+     */
+    @NotNull
+    YamlConfiguration toBukkit();
 }

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

@@ -1,21 +0,0 @@
-package com.willfp.eco.core.config.interfaces;
-
-import org.bukkit.configuration.file.YamlConfiguration;
-
-/**
- * Interface for configs that wrap an {@link YamlConfiguration}.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-@SuppressWarnings("DeprecatedIsStillUsed")
-public interface WrappedYamlConfiguration {
-    /**
-     * Get the ConfigurationSection handle.
-     *
-     * @return The handle.
-     */
-    YamlConfiguration getBukkitHandle();
-}

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

@@ -1,90 +0,0 @@
-package com.willfp.eco.core.config.json;
-
-import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginLike;
-import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.config.json.wrapper.LoadableJSONConfigWrapper;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Config implementation for configs present in the plugin's base directory (eg config.json).
- * <p>
- * Automatically updates.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class JSONBaseConfig extends LoadableJSONConfigWrapper {
-    /**
-     * @param configName      The name of the config
-     * @param removeUnused    Whether keys not present in the default config should be removed on update.
-     * @param plugin          The plugin.
-     * @param updateBlacklist Substring of keys to not add/remove keys for.
-     */
-    protected JSONBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final PluginLike plugin,
-                             @NotNull final String... updateBlacklist) {
-        super(
-                (JSONConfig)
-                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                                configName,
-                                plugin,
-                                "",
-                                plugin.getClass(),
-                                removeUnused,
-                                ConfigType.JSON,
-                                updateBlacklist
-                        )
-        );
-    }
-
-    /**
-     * @param configName   The name of the config
-     * @param removeUnused Whether keys not present in the default config should be removed on update.
-     * @param plugin       The plugin.
-     */
-    protected JSONBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final PluginLike plugin) {
-        super(
-                (JSONConfig)
-                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                                configName,
-                                plugin,
-                                "",
-                                plugin.getClass(),
-                                removeUnused,
-                                ConfigType.JSON
-                        )
-        );
-    }
-
-    /**
-     * @param configName      The name of the config
-     * @param removeUnused    Whether keys not present in the default config should be removed on update.
-     * @param plugin          The plugin.
-     * @param updateBlacklist Substring of keys to not add/remove keys for.
-     */
-    protected JSONBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final EcoPlugin plugin,
-                             @NotNull final String... updateBlacklist) {
-        this(configName, removeUnused, (PluginLike) plugin, updateBlacklist);
-    }
-
-    /**
-     * @param configName   The name of the config
-     * @param removeUnused Whether keys not present in the default config should be removed on update.
-     * @param plugin       The plugin.
-     */
-    protected JSONBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final EcoPlugin plugin) {
-        this(configName, removeUnused, (PluginLike) plugin);
-    }
-}

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

@@ -1,70 +0,0 @@
-package com.willfp.eco.core.config.json;
-
-import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginLike;
-import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.config.json.wrapper.LoadableJSONConfigWrapper;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Config implementation for configs present in one of two places:
- * <ul>
- *     <li>Plugin base directory (eg config.yml, lang.yml)</li>
- *     <li>Other extension's configs</li>
- * </ul>
- * <p>
- * Automatically updates.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class JSONExtendableConfig extends LoadableJSONConfigWrapper {
-    /**
-     * @param configName       The name of the config
-     * @param removeUnused     Whether keys not present in the default config should be removed on update.
-     * @param plugin           The plugin.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     */
-    protected JSONExtendableConfig(@NotNull final String configName,
-                                   final boolean removeUnused,
-                                   @NotNull final PluginLike plugin,
-                                   @NotNull final Class<?> source,
-                                   @NotNull final String subDirectoryPath,
-                                   @NotNull final String... updateBlacklist) {
-        super(
-                (JSONConfig)
-                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                                configName,
-                                plugin,
-                                subDirectoryPath,
-                                source,
-                                removeUnused,
-                                ConfigType.JSON,
-                                updateBlacklist
-                        )
-        );
-    }
-
-    /**
-     * @param configName       The name of the config
-     * @param removeUnused     Whether keys not present in the default config should be removed on update.
-     * @param plugin           The plugin.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     */
-    protected JSONExtendableConfig(@NotNull final String configName,
-                                   final boolean removeUnused,
-                                   @NotNull final EcoPlugin plugin,
-                                   @NotNull final Class<?> source,
-                                   @NotNull final String subDirectoryPath,
-                                   @NotNull final String... updateBlacklist) {
-        this(configName, removeUnused, (PluginLike) plugin, source, subDirectoryPath, updateBlacklist);
-    }
-}

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

@@ -1,45 +0,0 @@
-package com.willfp.eco.core.config.json;
-
-import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginLike;
-import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.config.json.wrapper.LoadableJSONConfigWrapper;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Non-updatable JSON config that exists within a plugin jar.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class JSONStaticBaseConfig extends LoadableJSONConfigWrapper {
-    /**
-     * Config implementation for configs present in the plugin's base directory (eg config.json, lang.json).
-     * <p>
-     * Does not automatically update.
-     *
-     * @param configName The name of the config
-     * @param plugin     The plugin.
-     */
-    protected JSONStaticBaseConfig(@NotNull final String configName,
-                                   @NotNull final PluginLike plugin) {
-        super((JSONConfig) Eco.getHandler().getConfigFactory().createLoadableConfig(configName, plugin, "", plugin.getClass(), ConfigType.JSON));
-    }
-
-    /**
-     * Config implementation for configs present in the plugin's base directory (eg config.json, lang.json).
-     * <p>
-     * Does not automatically update.
-     *
-     * @param configName The name of the config
-     * @param plugin     The plugin.
-     */
-    protected JSONStaticBaseConfig(@NotNull final String configName,
-                                   @NotNull final EcoPlugin plugin) {
-        this(configName, (PluginLike) plugin);
-    }
-}

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

@@ -1,37 +0,0 @@
-package com.willfp.eco.core.config.json;
-
-import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.config.json.wrapper.JSONConfigWrapper;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Raw JSON config with a map of values at its core.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public class JSONTransientConfig extends JSONConfigWrapper {
-    /**
-     * Config implementation for passing maps.
-     * <p>
-     * Does not automatically update.
-     *
-     * @param values The map of values.
-     */
-    public JSONTransientConfig(@NotNull final Map<String, Object> values) {
-        super((JSONConfig) Eco.getHandler().getConfigFactory().createConfig(values));
-    }
-
-    /**
-     * Empty JSON config.
-     */
-    public JSONTransientConfig() {
-        super((JSONConfig) Eco.getHandler().getConfigFactory().createConfig(new HashMap<>()));
-    }
-}

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

@@ -1,53 +0,0 @@
-package com.willfp.eco.core.config.json.wrapper;
-
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.config.wrapper.ConfigWrapper;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-/**
- * Wrapper to handle the backend JSON config implementations.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class JSONConfigWrapper extends ConfigWrapper<JSONConfig> implements JSONConfig {
-    /**
-     * Create a config wrapper.
-     *
-     * @param handle The handle.
-     */
-    protected JSONConfigWrapper(@NotNull final JSONConfig handle) {
-        super(handle);
-    }
-
-
-    @Override
-    public @NotNull List<JSONConfig> getSubsections(@NotNull final String path) {
-        return this.getHandle().getSubsections(path);
-    }
-
-    @Override
-    public @Nullable List<JSONConfig> getSubsectionsOrNull(@NotNull final String path) {
-        return this.getHandle().getSubsectionsOrNull(path);
-    }
-
-    @Override
-    public @NotNull JSONConfig getSubsection(@NotNull final String path) {
-        return this.getHandle().getSubsection(path);
-    }
-
-    @Override
-    public @Nullable JSONConfig getSubsectionOrNull(@NotNull final String path) {
-        return this.getHandle().getSubsectionOrNull(path);
-    }
-
-    @Override
-    public JSONConfig clone() {
-        return this.getHandle().clone();
-    }
-}

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

@@ -1,63 +0,0 @@
-package com.willfp.eco.core.config.json.wrapper;
-
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.config.interfaces.LoadableConfig;
-import org.apache.commons.lang.Validate;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Wrapper to handle the backend loadable JSON config implementations.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class LoadableJSONConfigWrapper extends JSONConfigWrapper implements LoadableConfig {
-    /**
-     * Create a config wrapper.
-     *
-     * @param handle The handle.
-     */
-    protected LoadableJSONConfigWrapper(@NotNull final JSONConfig handle) {
-        super(handle);
-
-        Validate.isTrue(handle instanceof LoadableConfig, "Wrapped config must be loadable!");
-    }
-
-
-    @Override
-    public void createFile() {
-        ((LoadableConfig) this.getHandle()).createFile();
-    }
-
-    @Override
-    public String getResourcePath() {
-        return ((LoadableConfig) this.getHandle()).getResourcePath();
-    }
-
-    @Override
-    public void save() throws IOException {
-        ((LoadableConfig) this.getHandle()).save();
-    }
-
-    @Override
-    public File getConfigFile() {
-        return ((LoadableConfig) this.getHandle()).getConfigFile();
-    }
-
-    @Override
-    public String getName() {
-        return ((LoadableConfig) this.getHandle()).getName();
-    }
-
-    @Override
-    public @Nullable YamlConfiguration getBukkitHandle() {
-        return null;
-    }
-}

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.config.updating;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -29,7 +30,8 @@ import java.lang.annotation.Target;
  * }</pre>
  * <p>
  * If using kotlin, you have to annotate the method with {@code @JvmStatic}
- * in order to prevent null pointer exceptions.
+ * in order to prevent null pointer exceptions - this also means that you cannot
+ * have config updater methods in companion objects.
  * <p>
  * Config update methods in all classes in a plugin jar will be called
  * on reload.
@@ -39,5 +41,6 @@ import java.lang.annotation.Target;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Documented
 public @interface ConfigUpdater {
 }

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

@@ -1,79 +0,0 @@
-package com.willfp.eco.core.config.wrapper;
-
-import com.willfp.eco.core.PluginLike;
-import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.interfaces.Config;
-import com.willfp.eco.core.config.interfaces.LoadableConfig;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-
-/**
- * Internal component to create backend config implementations.
- */
-@ApiStatus.Internal
-public interface ConfigFactory {
-    /**
-     * Updatable config.
-     *
-     * @param configName       The name of the config
-     * @param plugin           The plugin.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     * @param removeUnused     Whether keys not present in the default config should be removed on update.
-     * @param type             The config type.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
-     * @return The config implementation.
-     */
-    LoadableConfig createUpdatableConfig(@NotNull String configName,
-                                         @NotNull PluginLike plugin,
-                                         @NotNull String subDirectoryPath,
-                                         @NotNull Class<?> source,
-                                         boolean removeUnused,
-                                         @NotNull ConfigType type,
-                                         @NotNull String... updateBlacklist);
-
-    /**
-     * Loadable config.
-     *
-     * @param configName       The name of the config
-     * @param plugin           The plugin.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     * @param type             The config type.
-     * @return The config implementation.
-     */
-    LoadableConfig createLoadableConfig(@NotNull String configName,
-                                        @NotNull PluginLike plugin,
-                                        @NotNull String subDirectoryPath,
-                                        @NotNull Class<?> source,
-                                        @NotNull ConfigType type);
-
-    /**
-     * Create config.
-     *
-     * @param config The handle.
-     * @return The config implementation.
-     */
-    Config createConfig(@NotNull YamlConfiguration config);
-
-    /**
-     * Create config.
-     *
-     * @param values The values.
-     * @return The config implementation.
-     */
-    Config createConfig(@NotNull Map<String, Object> values);
-
-    /**
-     * Create config.
-     *
-     * @param contents The file contents.
-     * @param type     The type.
-     * @return The config implementation.
-     */
-    Config createConfig(@NotNull String contents,
-                        @NotNull ConfigType type);
-}

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

@@ -2,11 +2,14 @@ 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.InjectablePlaceholder;
 import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Configs from eco have an internal implementation,
@@ -16,7 +19,7 @@ import java.util.List;
  *
  * @param <T> The type of the handle.
  */
-@SuppressWarnings("MethodDoesntCallSuperMethod")
+@SuppressWarnings({"MethodDoesntCallSuperMethod", "removal"})
 public abstract class ConfigWrapper<T extends Config> implements Config {
     /**
      * Configs from eco have an internal implementation,
@@ -40,6 +43,7 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
     }
 
     @Override
+    @Deprecated(since = "6.31.1", forRemoval = true)
     public void clearCache() {
         handle.clearCache();
     }
@@ -59,6 +63,12 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getKeys(deep);
     }
 
+    @Override
+    public @NotNull List<String> recurseKeys(@NotNull final Set<String> found,
+                                             @NotNull final String root) {
+        return handle.recurseKeys(found, root);
+    }
+
     @Override
     public @Nullable Object get(@NotNull final String path) {
         return handle.get(path);
@@ -134,6 +144,26 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getType();
     }
 
+    @Override
+    public void addInjectablePlaceholder(@NotNull final Iterable<InjectablePlaceholder> placeholders) {
+        handle.addInjectablePlaceholder(placeholders);
+    }
+
+    @Override
+    public @NotNull List<InjectablePlaceholder> getPlaceholderInjections() {
+        return handle.getPlaceholderInjections();
+    }
+
+    @Override
+    public void clearInjectedPlaceholders() {
+        handle.clearInjectedPlaceholders();
+    }
+
+    @Override
+    public Map<String, Object> toMap() {
+        return this.handle.toMap();
+    }
+
     /**
      * Get the handle.
      *

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

@@ -3,7 +3,6 @@ package com.willfp.eco.core.config.wrapper;
 import com.willfp.eco.core.config.interfaces.LoadableConfig;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.IOException;
@@ -47,7 +46,7 @@ public abstract class LoadableConfigWrapper extends ConfigWrapper<LoadableConfig
     }
 
     @Override
-    public @Nullable YamlConfiguration getBukkitHandle() {
-        return this.getHandle().getBukkitHandle();
+    public @NotNull YamlConfiguration toBukkit() {
+        return this.getHandle().toBukkit();
     }
 }

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

@@ -1,87 +0,0 @@
-package com.willfp.eco.core.config.yaml;
-
-import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginLike;
-import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml).
- * <p>
- * Automatically updates.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class YamlBaseConfig extends LoadableYamlConfigWrapper {
-    /**
-     * @param configName      The name of the config
-     * @param removeUnused    Whether keys not present in the default config should be removed on update.
-     * @param plugin          The plugin.
-     * @param updateBlacklist Substring of keys to not add/remove keys for.
-     */
-    protected YamlBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final PluginLike plugin,
-                             @NotNull final String... updateBlacklist) {
-        super(
-                Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                        configName,
-                        plugin,
-                        "",
-                        plugin.getClass(),
-                        removeUnused,
-                        ConfigType.YAML,
-                        updateBlacklist
-                )
-        );
-    }
-
-    /**
-     * @param configName   The name of the config
-     * @param removeUnused Whether keys not present in the default config should be removed on update.
-     * @param plugin       The plugin.
-     */
-    protected YamlBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final PluginLike plugin) {
-        super(
-                Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                        configName,
-                        plugin,
-                        "",
-                        plugin.getClass(),
-                        removeUnused,
-                        ConfigType.YAML
-                )
-        );
-    }
-
-    /**
-     * @param configName      The name of the config
-     * @param removeUnused    Whether keys not present in the default config should be removed on update.
-     * @param plugin          The plugin.
-     * @param updateBlacklist Substring of keys to not add/remove keys for.
-     */
-    protected YamlBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final EcoPlugin plugin,
-                             @NotNull final String... updateBlacklist) {
-        this(configName, removeUnused, (PluginLike) plugin, updateBlacklist);
-    }
-
-    /**
-     * @param configName   The name of the config
-     * @param removeUnused Whether keys not present in the default config should be removed on update.
-     * @param plugin       The plugin.
-     */
-    protected YamlBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final EcoPlugin plugin) {
-        this(configName, removeUnused, (PluginLike) plugin);
-    }
-}

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

@@ -1,68 +0,0 @@
-package com.willfp.eco.core.config.yaml;
-
-import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginLike;
-import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Config implementation for configs present in one of two places:
- * <ul>
- *     <li>Plugin base directory (eg config.yml, lang.yml)</li>
- *     <li>Other extension's configs</li>
- * </ul>
- * <p>
- * Automatically updates.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class YamlExtendableConfig extends LoadableYamlConfigWrapper {
-    /**
-     * @param configName       The name of the config
-     * @param removeUnused     Whether keys not present in the default config should be removed on update.
-     * @param plugin           The plugin.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     */
-    protected YamlExtendableConfig(@NotNull final String configName,
-                                   final boolean removeUnused,
-                                   @NotNull final PluginLike plugin,
-                                   @NotNull final Class<?> source,
-                                   @NotNull final String subDirectoryPath,
-                                   @NotNull final String... updateBlacklist) {
-        super(
-                Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                        configName,
-                        plugin,
-                        subDirectoryPath,
-                        source,
-                        removeUnused,
-                        ConfigType.YAML,
-                        updateBlacklist
-                )
-        );
-    }
-
-    /**
-     * @param configName       The name of the config
-     * @param removeUnused     Whether keys not present in the default config should be removed on update.
-     * @param plugin           The plugin.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     */
-    protected YamlExtendableConfig(@NotNull final String configName,
-                                   final boolean removeUnused,
-                                   @NotNull final EcoPlugin plugin,
-                                   @NotNull final Class<?> source,
-                                   @NotNull final String subDirectoryPath,
-                                   @NotNull final String... updateBlacklist) {
-        this(configName, removeUnused, (PluginLike) plugin, source, subDirectoryPath, updateBlacklist);
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.willfp.eco.core.config.yaml;
-
-import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginLike;
-import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Non-updatable yaml config that exists within a plugin jar.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class YamlStaticBaseConfig extends LoadableYamlConfigWrapper {
-    /**
-     * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml).
-     * <p>
-     * Does not automatically update.
-     *
-     * @param configName The name of the config
-     * @param plugin     The plugin.
-     */
-    protected YamlStaticBaseConfig(@NotNull final String configName,
-                                   @NotNull final PluginLike plugin) {
-        super(Eco.getHandler().getConfigFactory().createLoadableConfig(configName, plugin, "", plugin.getClass(), ConfigType.YAML));
-    }
-
-    /**
-     * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml).
-     * <p>
-     * Does not automatically update.
-     *
-     * @param configName The name of the config
-     * @param plugin     The plugin.
-     */
-    protected YamlStaticBaseConfig(@NotNull final String configName,
-                                   @NotNull final EcoPlugin plugin) {
-        this(configName, (PluginLike) plugin);
-    }
-}

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

@@ -1,42 +0,0 @@
-package com.willfp.eco.core.config.yaml;
-
-import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.yaml.wrapper.YamlConfigWrapper;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.StringReader;
-
-/**
- * Config implementation for passing YamlConfigurations.
- * <p>
- * Does not automatically update.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public class YamlTransientConfig extends YamlConfigWrapper {
-    /**
-     * @param config The YamlConfiguration handle.
-     */
-    public YamlTransientConfig(@NotNull final YamlConfiguration config) {
-        super(Eco.getHandler().getConfigFactory().createConfig(config));
-    }
-
-    /**
-     * @param contents The contents of the config.
-     */
-    public YamlTransientConfig(@NotNull final String contents) {
-        super(Eco.getHandler().getConfigFactory().createConfig(contents, ConfigType.YAML));
-    }
-
-    /**
-     * Create a new empty transient config.
-     */
-    public YamlTransientConfig() {
-        super(Eco.getHandler().getConfigFactory().createConfig(YamlConfiguration.loadConfiguration(new StringReader(""))));
-    }
-}

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

@@ -1,63 +0,0 @@
-package com.willfp.eco.core.config.yaml.wrapper;
-
-import com.willfp.eco.core.config.interfaces.Config;
-import com.willfp.eco.core.config.interfaces.LoadableConfig;
-import org.apache.commons.lang.Validate;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Wrapper to handle the backend loadable yaml config implementations.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class LoadableYamlConfigWrapper extends YamlConfigWrapper implements LoadableConfig {
-    /**
-     * Create a config wrapper.
-     *
-     * @param handle The handle.
-     */
-    protected LoadableYamlConfigWrapper(@NotNull final Config handle) {
-        super(handle);
-
-        Validate.isTrue(handle instanceof LoadableConfig, "Wrapped config must be loadable!");
-    }
-
-
-    @Override
-    public void createFile() {
-        ((LoadableConfig) this.getHandle()).createFile();
-    }
-
-    @Override
-    public String getResourcePath() {
-        return ((LoadableConfig) this.getHandle()).getResourcePath();
-    }
-
-    @Override
-    public void save() throws IOException {
-        ((LoadableConfig) this.getHandle()).save();
-    }
-
-    @Override
-    public File getConfigFile() {
-        return ((LoadableConfig) this.getHandle()).getConfigFile();
-    }
-
-    @Override
-    public String getName() {
-        return ((LoadableConfig) this.getHandle()).getName();
-    }
-
-    @Override
-    public @Nullable YamlConfiguration getBukkitHandle() {
-        return ((LoadableConfig) this.getHandle()).getBukkitHandle();
-    }
-}

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

@@ -1,31 +0,0 @@
-package com.willfp.eco.core.config.yaml.wrapper;
-
-import com.willfp.eco.core.config.interfaces.Config;
-import com.willfp.eco.core.config.interfaces.WrappedYamlConfiguration;
-import com.willfp.eco.core.config.wrapper.ConfigWrapper;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Wrapper to handle the backend yaml config implementations.
- *
- * @deprecated JSON and yml have full parity, use configs without a prefix instead,
- * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
- * These configs will be removed eventually.
- */
-@Deprecated(since = "6.17.0")
-public abstract class YamlConfigWrapper extends ConfigWrapper<Config> implements WrappedYamlConfiguration {
-    /**
-     * Create a config wrapper.
-     *
-     * @param handle The handle.
-     */
-    protected YamlConfigWrapper(@NotNull final Config handle) {
-        super(handle);
-    }
-
-    @Override
-    public YamlConfiguration getBukkitHandle() {
-        return ((WrappedYamlConfiguration) this.getHandle()).getBukkitHandle();
-    }
-}

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

@@ -0,0 +1,101 @@
+package com.willfp.eco.core.data;
+
+import com.willfp.eco.core.Eco;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+
+/**
+ * Persistent data container wrapper that allows for full string (non-namespaced) keys.
+ */
+public interface ExtendedPersistentDataContainer {
+    /**
+     * Set a key.
+     *
+     * @param key      The key.
+     * @param dataType The data type.
+     * @param value    The value.
+     * @param <T>      The type.
+     * @param <Z>      The type.
+     */
+    <T, Z> void set(@NotNull String key, @NotNull PersistentDataType<T, Z> dataType, @NotNull Z value);
+
+    /**
+     * Get if there is a key.
+     *
+     * @param key      The key.
+     * @param dataType The data type.
+     * @param <T>      The type.
+     * @param <Z>      The type.
+     * @return If the key is present.
+     */
+    <T, Z> boolean has(@NotNull String key, @NotNull PersistentDataType<T, Z> dataType);
+
+    /**
+     * Get a value.
+     *
+     * @param key      The key.
+     * @param dataType The data type.
+     * @param <T>      The type.
+     * @param <Z>      The type.
+     * @return The value, or null if not found.
+     */
+    @Nullable <T, Z> Z get(@NotNull String key, @NotNull PersistentDataType<T, Z> dataType);
+
+    /**
+     * Get a value or default if not present.
+     *
+     * @param key          The key.
+     * @param dataType     The data type.
+     * @param defaultValue The default value.
+     * @param <T>          The type.
+     * @param <Z>          The type.
+     * @return The value, or the default if not found.
+     */
+    @NotNull <T, Z> Z getOrDefault(@NotNull String key, @NotNull PersistentDataType<T, Z> dataType, @NotNull Z defaultValue);
+
+    /**
+     * Get all keys, including namespaced keys.
+     *
+     * @return The keys.
+     */
+    @NotNull
+    Set<String> getAllKeys();
+
+    /**
+     * Remove a key.
+     *
+     * @param key The key.
+     */
+    void remove(@NotNull String key);
+
+    /**
+     * Get the base PDC.
+     *
+     * @return The base.
+     */
+    @NotNull
+    PersistentDataContainer getBase();
+
+    /**
+     * Get extension for PersistentDataContainers to add non-namespaced keys.
+     *
+     * @param base The base container.
+     * @return The extended container.
+     */
+    static ExtendedPersistentDataContainer extend(@NotNull PersistentDataContainer base) {
+        return Eco.get().adaptPdc(base);
+    }
+
+    /**
+     * Create a new extended container.
+     *
+     * @return The extended container.
+     */
+    static ExtendedPersistentDataContainer create() {
+        return extend(Eco.get().newPdc());
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.willfp.eco.core.data;
 
 import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.data.keys.PersistentDataKey;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
 
@@ -12,26 +11,7 @@ import java.util.UUID;
  * <p>
  * Profiles save automatically, so there is no need to save after changes.
  */
-public interface PlayerProfile {
-    /**
-     * Write a key to a player's persistent data.
-     *
-     * @param key   The key.
-     * @param value The value.
-     * @param <T>   The type of the key.
-     */
-    <T> void write(@NotNull PersistentDataKey<T> key,
-                   @NotNull T value);
-
-    /**
-     * Read a key from a player's persistent data.
-     *
-     * @param key The key.
-     * @param <T> The type of the key.
-     * @return The value, or the default value if not found.
-     */
-    <T> @NotNull T read(@NotNull PersistentDataKey<T> key);
-
+public interface PlayerProfile extends Profile {
     /**
      * Load a player profile.
      *
@@ -51,6 +31,6 @@ public interface PlayerProfile {
      */
     @NotNull
     static PlayerProfile load(@NotNull final UUID uuid) {
-        return Eco.getHandler().getPlayerProfileHandler().load(uuid);
+        return Eco.get().loadPlayerProfile(uuid);
     }
 }

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

@@ -1,78 +0,0 @@
-package com.willfp.eco.core.data;
-
-import com.willfp.eco.core.data.keys.PersistentDataKey;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * API to handle player profiles.
- */
-public interface PlayerProfileHandler {
-    /**
-     * Load a player profile.
-     *
-     * @param uuid The UUID.
-     * @return The profile.
-     */
-    PlayerProfile load(@NotNull UUID uuid);
-
-    /**
-     * Unload a player profile from memory.
-     * <p>
-     * This will not save the profile first.
-     *
-     * @param uuid The uuid.
-     */
-    void unloadPlayer(@NotNull UUID uuid);
-
-    /**
-     * Save a player profile.
-     * <p>
-     * Can run async if using MySQL.
-     *
-     * @param uuid The uuid.
-     * @deprecated Saving changes is faster and should be used. Saving a player manually is not recommended.
-     */
-    @Deprecated
-    default void savePlayer(@NotNull UUID uuid) {
-        this.saveKeysForPlayer(uuid, PersistentDataKey.values());
-    }
-
-    /**
-     * Save keys for a player.
-     * <p>
-     * Can run async if using MySQL.
-     *
-     * @param uuid The uuid.
-     * @param keys The keys.
-     */
-    void saveKeysForPlayer(@NotNull UUID uuid,
-                           @NotNull Set<PersistentDataKey<?>> keys);
-
-    /**
-     * Save all player data.
-     *
-     * @param async If the saving should be done asynchronously.
-     * @deprecated async is now handled automatically depending on implementation.
-     */
-    @Deprecated
-    default void saveAll(boolean async) {
-        saveAll();
-    }
-
-    /**
-     * Save all player data.
-     * <p>
-     * Can run async if using MySQL.
-     */
-    void saveAll();
-
-    /**
-     * Commit all changes to the file.
-     * <p>
-     * Does nothing if using MySQL.
-     */
-    void save();
-}

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

@@ -0,0 +1,30 @@
+package com.willfp.eco.core.data;
+
+import com.willfp.eco.core.data.keys.PersistentDataKey;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Persistent data storage interface.
+ * <p>
+ * Profiles save automatically, so there is no need to save after changes.
+ */
+public interface Profile {
+    /**
+     * Write a key to persistent data.
+     *
+     * @param key   The key.
+     * @param value The value.
+     * @param <T>   The type of the key.
+     */
+    <T> void write(@NotNull PersistentDataKey<T> key,
+                   @NotNull T value);
+
+    /**
+     * Read a key from persistent data.
+     *
+     * @param key The key.
+     * @param <T> The type of the key.
+     * @return The value, or the default value if not found.
+     */
+    <T> @NotNull T read(@NotNull PersistentDataKey<T> key);
+}

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

@@ -0,0 +1,21 @@
+package com.willfp.eco.core.data;
+
+import com.willfp.eco.core.Eco;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Persistent data storage interface for servers.
+ * <p>
+ * Profiles save automatically, so there is no need to save after changes.
+ */
+public interface ServerProfile extends Profile {
+    /**
+     * Load the server profile.
+     *
+     * @return The profile.
+     */
+    @NotNull
+    static ServerProfile load() {
+        return Eco.get().getServerProfile();
+    }
+}

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

@@ -1,24 +0,0 @@
-package com.willfp.eco.core.data.keys;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Set;
-
-/**
- * API to register persistent data keys.
- */
-public interface KeyRegistry {
-    /**
-     * Register a persistent data key to be stored.
-     *
-     * @param key The key.
-     */
-    void registerKey(@NotNull PersistentDataKey<?> key);
-
-    /**
-     * Get all registered keys.
-     *
-     * @return The keys.
-     */
-    Set<PersistentDataKey<?>> getRegisteredKeys();
-}

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.
      */
@@ -25,7 +27,7 @@ public class PersistentDataKey<T> {
     /**
      * The persistent data key type.
      */
-    private final PersistentDataKeyType type;
+    private final PersistentDataKeyType<T> type;
 
     /**
      * Create a new Persistent Data Key.
@@ -35,13 +37,13 @@ public class PersistentDataKey<T> {
      * @param defaultValue The default value.
      */
     public PersistentDataKey(@NotNull final NamespacedKey key,
-                             @NotNull final PersistentDataKeyType type,
+                             @NotNull final PersistentDataKeyType<T> type,
                              @NotNull final T defaultValue) {
         this.key = key;
         this.defaultValue = defaultValue;
         this.type = type;
 
-        Eco.getHandler().getKeyRegistry().registerKey(this);
+        Eco.get().registerPersistentKey(this);
     }
 
     @Override
@@ -76,16 +78,70 @@ public class PersistentDataKey<T> {
      *
      * @return The key type.
      */
-    public PersistentDataKeyType getType() {
+    public PersistentDataKeyType<T> getType() {
         return this.type;
     }
 
+    /**
+     * In older eco versions, keys would have to be categorized in order
+     * to register the columns in the MySQL database. This is no longer needed.
+     * <p>
+     * Old description is below:
+     * <p>
+     * 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.
+     * @deprecated Not required since the new MySQL data handler was introduced.
+     */
+    @Deprecated(since = "6.40.0", forRemoval = true)
+    public PersistentDataKey<T> server() {
+        return this;
+    }
+
+    /**
+     * In older eco versions, keys would have to be categorized in order
+     * to register the columns in the MySQL database. This is no longer needed.
+     * <p>
+     * Old description is below:
+     * <p>
+     * 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.
+     * @deprecated Not required since the new MySQL data handler was introduced.
+     */
+    @Deprecated(since = "6.40.0", forRemoval = true)
+    public PersistentDataKey<T> player() {
+        return this;
+    }
+
     /**
      * Get all persistent data keys.
      *
      * @return The keys.
      */
     public static Set<PersistentDataKey<?>> values() {
-        return Eco.getHandler().getKeyRegistry().getRegisteredKeys();
+        return Eco.get().getRegisteredPersistentDataKeys();
+    }
+
+    @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/data/keys/PersistentDataKeyType.java

@@ -1,26 +1,139 @@
 package com.willfp.eco.core.data.keys;
 
+import com.willfp.eco.core.config.interfaces.Config;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * All storable data key types.
+ *
+ * @param <T> The type.
  */
-public enum PersistentDataKeyType {
+public final class PersistentDataKeyType<T> {
+    /**
+     * The registered key types.
+     */
+    private static final List<PersistentDataKeyType<?>> VALUES = new ArrayList<>();
+
     /**
      * String.
      */
-    STRING,
+    public static final PersistentDataKeyType<String> STRING = new PersistentDataKeyType<>(String.class, "STRING");
 
     /**
      * Boolean.
      */
-    BOOLEAN,
+    public static final PersistentDataKeyType<Boolean> BOOLEAN = new PersistentDataKeyType<>(Boolean.class, "BOOLEAN");
 
     /**
-     * Integer.
+     * Int.
      */
-    INT,
+    public static final PersistentDataKeyType<Integer> INT = new PersistentDataKeyType<>(Integer.class, "INT");
 
     /**
      * Double.
      */
-    DOUBLE
+    public static final PersistentDataKeyType<Double> DOUBLE = new PersistentDataKeyType<>(Double.class, "DOUBLE");
+
+    /**
+     * String List.
+     */
+    public static final PersistentDataKeyType<List<String>> STRING_LIST = new PersistentDataKeyType<>(null, "STRING_LIST");
+
+    /**
+     * Config.
+     */
+    public static final PersistentDataKeyType<Config> CONFIG = new PersistentDataKeyType<>(Config.class, "CONFIG");
+
+    /**
+     * The class of the type.
+     */
+    private final Class<T> typeClass;
+
+    /**
+     * The name of the key type.
+     */
+    private final String name;
+
+    /**
+     * Get the class of the type.
+     *
+     * @return The class.
+     * @deprecated String list type will return null.
+     */
+    @Deprecated(since = "6.36.0", forRemoval = true)
+    @Nullable
+    public Class<T> getTypeClass() {
+        return typeClass;
+    }
+
+    /**
+     * Get the name of the key type.
+     *
+     * @return The name.
+     */
+    public String name() {
+        return name;
+    }
+
+    /**
+     * Create new PersistentDataKeyType.
+     *
+     * @param typeClass The type class.
+     * @param name      The name.
+     */
+    private PersistentDataKeyType(@Nullable final Class<T> typeClass,
+                                  @NotNull final String name) {
+        VALUES.add(this);
+
+        this.typeClass = typeClass;
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (!(that instanceof PersistentDataKeyType<?> type)) {
+            return false;
+        }
+        return Objects.equals(this.name, type.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.name);
+    }
+
+    /**
+     * Get all registered {@link PersistentDataKeyType}s.
+     *
+     * @return The registered types.
+     */
+    @NotNull
+    public static PersistentDataKeyType<?>[] values() {
+        return VALUES.toArray(new PersistentDataKeyType[0]);
+    }
+
+    /**
+     * Get a key type from a name.
+     *
+     * @param name The name.
+     * @return The type, or null if not found.
+     */
+    @Nullable
+    public static PersistentDataKeyType<?> valueOf(@NotNull final String name) {
+        for (PersistentDataKeyType<?> type : VALUES) {
+            if (type.name.equalsIgnoreCase(name)) {
+                return type;
+            }
+        }
+
+        return null;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/display/Display.java

@@ -1,11 +1,21 @@
 package com.willfp.eco.core.display;
 
+import com.willfp.eco.core.fast.FastItemStack;
+import com.willfp.eco.util.NamespacedKeyUtils;
+import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.ApiStatus;
+import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 /**
  * Utility class to manage client-side item display.
  */
@@ -16,9 +26,14 @@ public final class Display {
     public static final String PREFIX = "§z";
 
     /**
-     * The display handler.
+     * All registered modules.
      */
-    private static DisplayHandler handler = null;
+    private static final Map<Integer, List<DisplayModule>> REGISTERED_MODULES = new TreeMap<>();
+
+    /**
+     * The finalize key.
+     */
+    private static final NamespacedKey FINALIZE_KEY = NamespacedKeyUtils.createEcoKey("finalized");
 
     /**
      * Display on ItemStacks.
@@ -39,7 +54,49 @@ public final class Display {
      */
     public static ItemStack display(@NotNull final ItemStack itemStack,
                                     @Nullable final Player player) {
-        return handler.display(itemStack, player);
+        Map<String, Object[]> pluginVarArgs = new HashMap<>();
+
+        for (List<DisplayModule> modules : REGISTERED_MODULES.values()) {
+            for (DisplayModule module : modules) {
+                pluginVarArgs.put(module.getPluginName(), module.generateVarArgs(itemStack));
+            }
+        }
+
+        Display.revert(itemStack);
+
+        if (!itemStack.hasItemMeta()) {
+            return itemStack;
+        }
+
+        ItemStack original = itemStack.clone();
+        Inventory inventory = player == null ? null : player.getOpenInventory().getTopInventory();
+        boolean inInventory = inventory != null && inventory.contains(original);
+        boolean inGui = inventory != null && inventory.getHolder() == null;
+
+        DisplayProperties properties = new DisplayProperties(
+                inInventory,
+                inGui,
+                original
+        );
+
+        for (List<DisplayModule> modules : REGISTERED_MODULES.values()) {
+            for (DisplayModule module : modules) {
+                Object[] varargs = pluginVarArgs.get(module.getPluginName());
+
+                if (varargs == null) {
+                    continue;
+                }
+
+                module.display(itemStack, varargs);
+
+                if (player != null) {
+                    module.display(itemStack, player, varargs);
+                    module.display(itemStack, player, properties, varargs);
+                }
+            }
+        }
+
+        return itemStack;
     }
 
     /**
@@ -71,7 +128,25 @@ public final class Display {
      * @return The ItemStack.
      */
     public static ItemStack revert(@NotNull final ItemStack itemStack) {
-        return handler.revert(itemStack);
+        if (Display.isFinalized(itemStack)) {
+            Display.unfinalize(itemStack);
+        }
+
+        FastItemStack fast = FastItemStack.wrap(itemStack);
+
+        List<String> lore = fast.getLore();
+
+        if (!lore.isEmpty() && lore.removeIf(line -> line.startsWith(Display.PREFIX))) {
+            fast.setLore(lore);
+        }
+
+        for (List<DisplayModule> modules : REGISTERED_MODULES.values()) {
+            for (DisplayModule module : modules) {
+                module.revert(itemStack);
+            }
+        }
+
+        return itemStack;
     }
 
     /**
@@ -81,7 +156,15 @@ public final class Display {
      * @return The ItemStack.
      */
     public static ItemStack finalize(@NotNull final ItemStack itemStack) {
-        return handler.finalize(itemStack);
+        if (itemStack.getType().getMaxStackSize() > 1) {
+            return itemStack;
+        }
+
+        FastItemStack.wrap(itemStack)
+                .getPersistentDataContainer()
+                .set(FINALIZE_KEY, PersistentDataType.INTEGER, 1);
+
+        return itemStack;
     }
 
     /**
@@ -91,7 +174,11 @@ public final class Display {
      * @return The ItemStack.
      */
     public static ItemStack unfinalize(@NotNull final ItemStack itemStack) {
-        return handler.unfinalize(itemStack);
+        FastItemStack.wrap(itemStack)
+                .getPersistentDataContainer()
+                .remove(FINALIZE_KEY);
+
+        return itemStack;
     }
 
     /**
@@ -101,7 +188,9 @@ public final class Display {
      * @return If finalized.
      */
     public static boolean isFinalized(@NotNull final ItemStack itemStack) {
-        return handler.isFinalized(itemStack);
+        return FastItemStack.wrap(itemStack)
+                .getPersistentDataContainer()
+                .has(FINALIZE_KEY, PersistentDataType.INTEGER);
     }
 
     /**
@@ -110,69 +199,15 @@ public final class Display {
      * @param module The module.
      */
     public static void registerDisplayModule(@NotNull final DisplayModule module) {
-        handler.registerDisplayModule(module);
-    }
+        List<DisplayModule> modules = REGISTERED_MODULES.getOrDefault(
+                module.getWeight(),
+                new ArrayList<>()
+        );
 
-    /**
-     * Initialize the display system.
-     *
-     * @param handler The handler.
-     */
-    @ApiStatus.Internal
-    public static void init(@NotNull final DisplayHandler handler) {
-        if (Display.handler != null) {
-            throw new IllegalArgumentException("Already Initialized!");
-        }
-        Display.handler = handler;
-    }
+        modules.removeIf(it -> it.getPluginName().equalsIgnoreCase(module.getPluginName()));
+        modules.add(module);
 
-    /**
-     * Extremely janky method - also internal, so don't use it. <b>This method is
-     * NOT part of the API and may be removed at any time!</b>
-     * <p>
-     * This calls a display module with the specified parameters, now
-     * you might ask why I need a static java method when the DisplayHandler
-     * implementation could just call it itself? Well, kotlin doesn't really
-     * like dealing with vararg ambiguity, and so while kotlin can't figure out
-     * what is and isn't a vararg when I call display with a player, java can.
-     * <p>
-     * Because of this, I need to have this part of the code in java.
-     *
-     * <b>Don't call this method as part of your plugins!</b>
-     * <p>
-     * No, seriously - don't. This skips a bunch of checks and you'll almost
-     * definitely break something.
-     *
-     * @param module    The display module.
-     * @param itemStack The ItemStack.
-     * @param player    The player.
-     * @param args      The args.
-     */
-    @ApiStatus.Internal
-    public static void callDisplayModule(@NotNull final DisplayModule module,
-                                         @NotNull final ItemStack itemStack,
-                                         @Nullable final Player player,
-                                         @NotNull final Object... args) {
-        module.display(itemStack, args);
-        if (player != null) {
-            module.display(itemStack, player, args);
-        }
-    }
-
-    /**
-     * Set the display handler.
-     * <p>
-     * Internal API component, you will cause bugs if you create your own handler.
-     *
-     * @param handler The handler.
-     */
-    @ApiStatus.Internal
-    public static void setHandler(@NotNull final DisplayHandler handler) {
-        if (Display.handler != null) {
-            throw new IllegalStateException("Display already initialized!");
-        }
-
-        Display.handler = handler;
+        REGISTERED_MODULES.put(module.getWeight(), modules);
     }
 
     private Display() {

eco-api/src/main/java/com/willfp/eco/core/display/DisplayHandler.java

@@ -1,60 +0,0 @@
-package com.willfp.eco.core.display;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Interface for display implementations.
- */
-public interface DisplayHandler {
-    /**
-     * Register display module.
-     *
-     * @param module The module.
-     */
-    void registerDisplayModule(@NotNull DisplayModule module);
-
-    /**
-     * Display on ItemStacks.
-     *
-     * @param itemStack The item.
-     * @param player    The player.
-     * @return The ItemStack.
-     */
-    ItemStack display(@NotNull ItemStack itemStack,
-                      @Nullable Player player);
-
-    /**
-     * Revert on ItemStacks.
-     *
-     * @param itemStack The item.
-     * @return The ItemStack.
-     */
-    ItemStack revert(@NotNull ItemStack itemStack);
-
-    /**
-     * Finalize an ItemStacks.
-     *
-     * @param itemStack The item.
-     * @return The ItemStack.
-     */
-    ItemStack finalize(@NotNull ItemStack itemStack);
-
-    /**
-     * Unfinalize an ItemStacks.
-     *
-     * @param itemStack The item.
-     * @return The ItemStack.
-     */
-    ItemStack unfinalize(@NotNull ItemStack itemStack);
-
-    /**
-     * If an item is finalized.
-     *
-     * @param itemStack The item.
-     * @return If finalized.
-     */
-    boolean isFinalized(@NotNull ItemStack itemStack);
-}

eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java

@@ -1,7 +1,6 @@
 package com.willfp.eco.core.display;
 
 import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -10,11 +9,16 @@ import org.jetbrains.annotations.Nullable;
 /**
  * Class for all plugin-specific client-side item display modules.
  */
-public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
+public abstract class DisplayModule {
     /**
      * The priority of the module.
      */
-    private final DisplayPriority priority;
+    private final int weight;
+
+    /**
+     * The plugin.
+     */
+    private final EcoPlugin plugin;
 
     /**
      * Create a new display module.
@@ -24,8 +28,19 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      */
     protected DisplayModule(@NotNull final EcoPlugin plugin,
                             @NotNull final DisplayPriority priority) {
-        super(plugin);
-        this.priority = priority;
+        this(plugin, priority.getWeight());
+    }
+
+    /**
+     * Create a new display module.
+     *
+     * @param plugin The plugin that the display is for.
+     * @param weight The weight/priority of the module.
+     */
+    protected DisplayModule(@NotNull final EcoPlugin plugin,
+                            final int weight) {
+        this.plugin = plugin;
+        this.weight = weight;
     }
 
     /**
@@ -52,6 +67,21 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
         // Technically optional.
     }
 
+    /**
+     * Display an item.
+     *
+     * @param itemStack  The item.
+     * @param player     The player.
+     * @param properties The properties.
+     * @param args       Optional args for display.
+     */
+    public void display(@NotNull final ItemStack itemStack,
+                        @Nullable final Player player,
+                        @NotNull final DisplayProperties properties,
+                        @NotNull final Object... args) {
+        // Technically optional.
+    }
+
     /**
      * Revert an item.
      *
@@ -77,15 +107,41 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      * @return The plugin name.
      */
     public final String getPluginName() {
-        return super.getPlugin().getName();
+        return this.getPlugin().getName();
     }
 
     /**
      * Get the display priority.
      *
      * @return The priority.
+     * @deprecated Use getWeight instead.
      */
+    @Deprecated(since = "6.35.0", forRemoval = true)
     public DisplayPriority getPriority() {
-        return this.priority;
+        return switch (this.weight) {
+            case 100 -> DisplayPriority.LOWEST;
+            case 200 -> DisplayPriority.LOW;
+            case 300 -> DisplayPriority.HIGH;
+            case 400 -> DisplayPriority.HIGHEST;
+            default -> DisplayPriority.CUSTOM;
+        };
+    }
+
+    /**
+     * Get the display weight.
+     *
+     * @return The weight.
+     */
+    public int getWeight() {
+        return this.weight;
+    }
+
+    /**
+     * Get the plugin.
+     *
+     * @return The plugin.
+     */
+    public EcoPlugin getPlugin() {
+        return plugin;
     }
 }

eco-api/src/main/java/com/willfp/eco/core/display/DisplayPriority.java

@@ -4,23 +4,51 @@ package com.willfp.eco.core.display;
  * The priority (order) of display modules.
  */
 public enum DisplayPriority {
+    /**
+     * Custom weight.
+     */
+    CUSTOM(250),
+
     /**
      * Ran first.
      */
-    LOWEST,
+    LOWEST(100),
 
     /**
      * Ran second.
      */
-    LOW,
+    LOW(200),
 
     /**
      * Ran third.
      */
-    HIGH,
+    HIGH(300),
 
     /**
      * Ran last.
      */
-    HIGHEST
+    HIGHEST(400);
+
+    /**
+     * The display priority weight.
+     */
+    private final int weight;
+
+    /**
+     * Create new display priority.
+     *
+     * @param weight The weight.
+     */
+    DisplayPriority(final int weight) {
+        this.weight = weight;
+    }
+
+    /**
+     * Get the weight.
+     *
+     * @return The weight.
+     */
+    public int getWeight() {
+        return weight;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/display/DisplayProperties.java

@@ -0,0 +1,18 @@
+package com.willfp.eco.core.display;
+
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Extra properties passed into {@link DisplayModule}.
+ *
+ * @param inInventory  If the item was in an inventory.
+ * @param inGui        If the item is assumed to be in a gui. (Not perfectly accurate).
+ * @param originalItem The original item, not to be modified.
+ */
+public record DisplayProperties(
+        boolean inInventory,
+        boolean inGui,
+        @NotNull ItemStack originalItem
+) {
+}

eco-api/src/main/java/com/willfp/eco/core/drops/DropQueue.java

@@ -21,13 +21,25 @@ public class DropQueue {
     /**
      * The internally used {@link DropQueue}.
      */
-    private final InternalDropQueue handle;
+    private final DropQueue delegate;
 
     /**
+     * Create a new DropQueue.
+     *
      * @param player The player.
      */
     public DropQueue(@NotNull final Player player) {
-        handle = Eco.getHandler().getDropQueueFactory().create(player);
+        this.delegate = Eco.get().createDropQueue(player);
+    }
+
+    /**
+     * Create a new DropQueue with no delegate.
+     * <p>
+     * Call this constructor if you're creating custom DropQueue
+     * implementations.
+     */
+    protected DropQueue() {
+        this.delegate = null;
     }
 
     /**
@@ -37,7 +49,11 @@ public class DropQueue {
      * @return The DropQueue.
      */
     public DropQueue addItem(@NotNull final ItemStack item) {
-        handle.addItem(item);
+        if (delegate == null) {
+            return this;
+        }
+
+        delegate.addItem(item);
         return this;
     }
 
@@ -48,7 +64,11 @@ public class DropQueue {
      * @return The DropQueue.
      */
     public DropQueue addItems(@NotNull final Collection<ItemStack> itemStacks) {
-        handle.addItems(itemStacks);
+        if (delegate == null) {
+            return this;
+        }
+
+        delegate.addItems(itemStacks);
         return this;
     }
 
@@ -59,7 +79,11 @@ public class DropQueue {
      * @return The DropQueue.
      */
     public DropQueue addXP(final int amount) {
-        handle.addXP(amount);
+        if (delegate == null) {
+            return this;
+        }
+
+        delegate.addXP(amount);
         return this;
     }
 
@@ -70,7 +94,11 @@ public class DropQueue {
      * @return The DropQueue.
      */
     public DropQueue setLocation(@NotNull final Location location) {
-        handle.setLocation(location);
+        if (delegate == null) {
+            return this;
+        }
+
+        delegate.setLocation(location);
         return this;
     }
 
@@ -80,7 +108,11 @@ public class DropQueue {
      * @return The DropQueue.
      */
     public DropQueue forceTelekinesis() {
-        handle.forceTelekinesis();
+        if (delegate == null) {
+            return this;
+        }
+
+        delegate.forceTelekinesis();
         return this;
     }
 
@@ -88,6 +120,10 @@ public class DropQueue {
      * Push the queue.
      */
     public void push() {
-        handle.push();
+        if (delegate == null) {
+            return;
+        }
+
+        delegate.push();
     }
 }

eco-api/src/main/java/com/willfp/eco/core/drops/DropQueueFactory.java

@@ -1,17 +0,0 @@
-package com.willfp.eco.core.drops;
-
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Internal component to create backend DropQueue implementations.
- */
-public interface DropQueueFactory {
-    /**
-     * Create a DropQueue.
-     *
-     * @param player The player.
-     * @return The Queue.
-     */
-    InternalDropQueue create(@NotNull Player player);
-}

eco-api/src/main/java/com/willfp/eco/core/drops/InternalDropQueue.java

@@ -1,56 +0,0 @@
-package com.willfp.eco.core.drops;
-
-import org.bukkit.Location;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-
-/**
- * Internal interface for backend DropQueue implementations.
- */
-public interface InternalDropQueue {
-    /**
-     * Add item to queue.
-     *
-     * @param item The item to add.
-     * @return The DropQueue.
-     */
-    InternalDropQueue addItem(@NotNull ItemStack item);
-
-    /**
-     * Add multiple items to queue.
-     *
-     * @param itemStacks The items to add.
-     * @return The DropQueue.
-     */
-    InternalDropQueue addItems(@NotNull Collection<ItemStack> itemStacks);
-
-    /**
-     * Add xp to queue.
-     *
-     * @param amount The amount to add.
-     * @return The DropQueue.
-     */
-    InternalDropQueue addXP(int amount);
-
-    /**
-     * Set location of the origin of the drops.
-     *
-     * @param location The location.
-     * @return The DropQueue.
-     */
-    InternalDropQueue setLocation(@NotNull Location location);
-
-    /**
-     * Force the queue to act as if player is telekinetic.
-     *
-     * @return The DropQueue.
-     */
-    InternalDropQueue forceTelekinesis();
-
-    /**
-     * Push the queue.
-     */
-    void push();
-}

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.get().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");
+        }
+    }
+}