Fixed NamespacedKeyUtils.fromString

# Conflicts:
#	eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt

.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/java-ci.yml

@@ -0,0 +1,36 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+    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-
+
+      - run: ./gradlew build --full-stacktrace
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: eco-dev-${{ steps.vars.outputs.sha_short }}
+          path: build/libs

.github/workflows/publish-release.yml

@@ -12,11 +12,11 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: 16
+          distribution: 'temurin'
+          java-version: 17
 
       - name: Setup build cache
         uses: actions/cache@v2.1.6

CONTRIBUTING.md

@@ -5,23 +5,20 @@
 - The pull request must not have any checkstyle issues.
 - Every method and field must have a javadoc attached.
 
-2. Use lombok wherever possible.
-- @Getter, @Setter, @UtilityClass only.
-
-3. Use JetBrains annotations
+2. Use JetBrains annotations
 - Every parameter should be annotated with @NotNull or @Nullable
 - Use @NotNull over lombok @NonNull
 
-4. Imports
+3. Imports
 - No group (*) imports.
 - No static imports.
 
 ## Dependency Injection
 - eco uses Dependency Injection
-- Any calls to AbstractEcoPlugin#getInstance are code smells and should never be used unless **absolutely necessary**.
+- 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 16.
+- eco is built with java 17.

README.md

@@ -1,22 +1,45 @@
-<h1 align="center">
-  <br>
-  <img src="https://i.imgur.com/kU3ejCt.png" alt="eco logo" width="256">
-  <br>
-</h1>
+# eco
+eco is a powerful Spigot development library 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),
+[EcoArmor](https://polymart.org/resource/687), [Talismans](https://polymart.org/resource/611),
+and many more.
 
-<h4 align="center">eco - Simplify spigot development.</h4>
+<p>
+    <a href="https://github.com/Auxilor/eco/releases">
+        <img alt="spigot" src="https://img.shields.io/github/v/release/Auxilor/eco?color=informational"/>
+    </a>
+    <a href="https://bstats.org/plugin/bukkit/EcoEnchants" alt="bstats servers">
+        <img src="https://img.shields.io/bstats/servers/7666?color=informational"/>
+    </a>
+    <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"/>
+    </a>
+</p>
 
-### Plugin Information
+# For server owners
 - Requires ProtocolLib to be installed: get the latest version [here](https://www.spigotmc.org/resources/protocollib.1997/)
 - Supports 1.16.5+
 
-### bStats
-<img src="https://bstats.org/signatures/bukkit/eco.svg" width="512">
+## Downloads
 
-# Information for development
+- 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)
+
+# For developers
 
 ## Javadoc
-The 6.8.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.8.0/javadoc/)
+The 6.13.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.13.0/javadoc/)
 
 ## Plugin Information
 
@@ -28,12 +51,6 @@ depend:
   - eco
 ```
 
-eco is available from any of these places:
-
-- [GitHub](https://github.com/Auxilor/eco/releases)
-- [Polymart](https://polymart.org/resource/eco.773)
-- [Build it locally](https://github.com/Auxilor/eco#build-locally).
-
 ## Get from JitPack:
 
 Gradle:
@@ -51,7 +68,7 @@ dependencies {
 }
 ```
 
-Replace `Tag` with a release tag for eco, eg `6.0.0`.
+Replace `Tag` with a release tag for eco, eg `6.13.0`.
 
 Maven:
 
@@ -71,7 +88,7 @@ Maven:
 </dependency>
 ```
 
-Replace `Tag` with a release tag for eco, eg `6.8.0`.
+Replace `Tag` with a release tag for eco, eg `6.13.0`.
 
 ## Build locally:
 
@@ -84,85 +101,21 @@ cd eco
 ./gradlew build
 ```
 
-# Features
-
-Here's a list of some (not all) of the features of eco:
-
-- Command system with subcommands
-- Reworked config system
-- JSON Config Support
-- Client-Side item display
-- World drop system
-- Event manager
-    - PlayerJumpEvent
-    - ArmorEquipEvent
-    - EntityDeathByEntityEvent
-    - NaturalExpGainEvent
-- Plugin extensions (com.willfp.eco.internal.Plugins for plugins)
-- GUI System
-- Integration system for external plugins
-    - Anticheat support
-        - AAC
-        - Matrix
-        - NCP
-        - Spartan
-        - Vulcan
-    - Antigrief/Combat support
-        - CombatLogX (V10 + V11)
-        - FactionsUUID
-        - GriefPrevention
-        - Kingdoms
-        - Lands
-        - Towny
-        - WorldGuard
-    - mcMMO support
-    - Custom Items support
-        - Oraxen
-    - PlaceholderAPI support
-- NMS Proxy / Wrapper system built in
-- Custom Items system
-- Crafting Recipe handler
-- Tuples
-- Support uploading to / downloading from hastebin
-- Packet System (via ProtocolLib)
-- Dependency Injection systems
-- Prerequisite system
-- API additions (via utility classes)
-    - Get bow from arrow
-    - Break a block as a player
-    - Get a vein of blocks
-    - Create 2D lists
-    - Create NamespacedKeys safely
-    - Random number, distribution, roman numerals
-    - Set skull texture
-    - Format all strings
-        - Hex Support
-        - Gradient Support
-        - Placeholder Support
-    - Get a scoreboard team from any color
-    - Telekinesis (Drops straight to inventory) system
-    - More vector options
-- Update checker
-- bStats integration
-- Reworked systems for:
-    - NamespacedKey
-    - MetadataValue
-    - Runnables / Scheduling
-
-... and a lot more!
-
 ## License
 
 *Click here to read [the entire license](https://github.com/Auxilor/eco/blob/master/LICENSE.md).*
 
 <h1 align="center">
+  Check out our partners!
+  <br>
+  <div style="width: 50%; margin: 0 auto;">
   <br>
     <a href="https://gamersupps.gg/discount/Auxilor?afmc=Auxilor" target="_blank">
-      <img src="https://i.imgur.com/uFDpBAC.png" alt="supps banner">
+      <img src="https://i.imgur.com/7mFhlQO.png" alt="supps banner">
     </a>
     <a href="https://dedimc.promo/Auxilor" target="_blank">
-      <img src="https://i.imgur.com/zdDLhFA.png" alt="dedimc banner">
+      <img src="https://i.imgur.com/x9aeH38.png" alt="dedimc banner">
     </a>
   <br>
+  </div>
 </h1>
-

build.gradle

@@ -1,127 +0,0 @@
-plugins {
-    id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
-    id 'maven-publish'
-    id 'java'
-}
-
-dependencies {
-    implementation project(":eco-api")
-    implementation project(":eco-core:core-plugin")
-    implementation project(":eco-core:core-proxy")
-    implementation project(":eco-core:core-backend")
-    implementation project(":eco-core:core-nms:v1_16_R3")
-    implementation project(path: ":eco-core:core-nms:v1_17_R1", configuration: 'mapped')
-}
-
-allprojects {
-    apply plugin: 'java'
-    apply plugin: 'java-library'
-    apply plugin: 'maven-publish'
-    apply plugin: 'com.github.johnrengelman.shadow'
-
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        maven { url 'https://jitpack.io' }
-
-        // SuperiorSkyblock2
-        maven { url 'https://repo.bg-software.com/repository/api/' }
-
-        // NMS (for jitpack compilation)
-        maven { url 'https://repo.codemc.org/repository/nms/' }
-
-        // bStats, mcMMO, BentoBox
-        maven { url 'https://repo.codemc.org/repository/maven-public/' }
-
-        // Spigot API
-        maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
-
-        // PlaceholderAPI
-        maven { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
-
-        // ProtocolLib
-        maven { url 'https://repo.dmulloy2.net/nexus/repository/public/' }
-
-        // WorldGuard
-        maven { url 'https://maven.enginehub.org/repo/' }
-
-        // FactionsUUID
-        maven { url 'https://ci.ender.zone/plugin/repository/everything/' }
-
-        // NoCheatPlus
-        maven { url 'https://repo.md-5.net/content/repositories/snapshots/' }
-
-        // CombatLogX
-        maven { url 'https://nexus.sirblobman.xyz/repository/public/' }
-    }
-
-    dependencies {
-        compileOnly 'org.jetbrains:annotations:19.0.0'
-
-        // Lombok
-        compileOnly 'org.projectlombok:lombok:1.18.22'
-        annotationProcessor 'org.projectlombok:lombok:1.18.20'
-        testCompileOnly 'org.projectlombok:lombok:1.18.20'
-        testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
-
-        // Test
-        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
-        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
-    }
-
-    tasks.withType(JavaCompile) {
-        options.deprecation = true
-        options.encoding = 'UTF-8'
-    }
-
-    configurations.all {
-        exclude group: "org.codehaus.plexus", module: "plexus-utils"
-        exclude group: "com.mojang", module: "brigadier"
-        exclude group: "org.kitteh", module: "paste-gg-api"
-        exclude group: "org.kitteh", module: "pastegg"
-        exclude group: "org.spongepowered", module: "configurate-hocon"
-        exclude group: "com.darkblade12", module: "particleeffect"
-        exclude group: "com.github.cryptomorin", module: "XSeries"
-    }
-
-    shadowJar {
-        relocate('org.bstats', 'com.willfp.eco.shaded.bstats')
-        relocate('net.kyori.adventure.text.minimessage', 'com.willfp.eco.shaded.minimessage')
-    }
-
-    jar {
-        onlyIf { !sourceSets.main.allSource.files.isEmpty() }
-    }
-
-    compileJava {
-        onlyIf { !sourceSets.main.allSource.files.isEmpty() }
-    }
-
-    java {
-        sourceCompatibility = JavaVersion.VERSION_16
-        targetCompatibility = JavaVersion.VERSION_16
-        withSourcesJar()
-    }
-
-    test {
-        useJUnitPlatform()
-
-        // Always run tests, even when nothing changed.
-        dependsOn cleanTest
-
-        // Show test results.
-        testLogging {
-            events "passed", "skipped", "failed"
-        }
-    }
-
-    compileJava.options.encoding = 'UTF-8'
-    compileJava.dependsOn clean
-
-    build.dependsOn shadowJar
-}
-
-group = 'com.willfp'
-archivesBaseName = project.name
-version = findProperty("version")

build.gradle.kts

@@ -0,0 +1,134 @@
+plugins {
+    id("java-library")
+    id("com.github.johnrengelman.shadow") version "7.1.0"
+    id("maven-publish")
+    id("java")
+}
+
+dependencies {
+    implementation(project(":eco-api"))
+    implementation(project(":eco-core:core-plugin"))
+    implementation(project(":eco-core:core-proxy"))
+    implementation(project(":eco-core:core-backend"))
+    implementation(project(":eco-core:core-nms:v1_16_R3"))
+    implementation(project(path = ":eco-core:core-nms:v1_17_R1", configuration = "reobf"))
+    implementation(project(path = ":eco-core:core-nms:v1_18_R1", configuration = "reobf"))
+}
+
+allprojects {
+    apply(plugin = "java")
+    apply(plugin = "java-library")
+    apply(plugin = "maven-publish")
+    apply(plugin = "com.github.johnrengelman.shadow")
+
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        maven("https://jitpack.io")
+
+        // CustomCrafting
+        maven("https://maven.wolfyscript.com/repository/public/")
+
+        // 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/")
+
+        // Spigot API, Bungee API
+        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+
+        // PlaceholderAPI
+        maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+
+        // ProtocolLib
+        maven("https://repo.dmulloy2.net/nexus/repository/public/")
+
+        // WorldGuard
+        maven("https://maven.enginehub.org/repo/")
+
+        // FactionsUUID
+        maven("https://ci.ender.zone/plugin/repository/everything/")
+
+        // NoCheatPlus
+        maven("https://repo.md-5.net/content/repositories/snapshots/")
+
+        // 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")
+    }
+
+    dependencies {
+        compileOnly("org.jetbrains:annotations:23.0.0")
+
+        // Test
+        testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
+        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")
+    }
+
+    tasks.withType<JavaCompile> {
+        options.encoding = "UTF-8"
+    }
+
+    configurations.all {
+        exclude(group = "org.codehaus.plexus", module = "plexus-utils")
+        exclude(group = "com.mojang", module = "brigadier")
+        exclude(group = "org.kitteh", module = "paste-gg-api")
+        exclude(group = "org.kitteh", module = "pastegg")
+        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")
+    }
+
+    tasks {
+        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")
+        }
+
+        compileJava {
+            dependsOn(clean)
+            options.encoding = "UTF-8"
+        }
+
+        java {
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+            withSourcesJar()
+        }
+
+        test {
+            useJUnitPlatform()
+
+            // Show test results.
+            testLogging {
+                events("passed", "skipped", "failed")
+            }
+        }
+
+        build {
+            dependsOn(shadowJar)
+        }
+    }
+}
+
+group = "com.willfp"
+version = findProperty("version")!!

eco-api/build.gradle

@@ -9,15 +9,13 @@ dependencies {
     // Adventure
     compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
     compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
-    compileOnly 'net.kyori:adventure-api:4.9.2'
-    compileOnly 'net.kyori:adventure-text-serializer-gson:4.9.2'
-    compileOnly 'net.kyori:adventure-text-serializer-legacy:4.9.2'
 
     // 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.7.1-SNAPSHOT'
+    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 {

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

@@ -6,7 +6,6 @@ import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
-import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -26,7 +25,6 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
      * <p>
      * Useful for monitor priority adapters that <b>must</b> be ran last.
      */
-    @Getter
     private final boolean postLoad;
 
     /**
@@ -134,4 +132,13 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
             ProtocolLibrary.getProtocolManager().addPacketListener(this);
         }
     }
+
+    /**
+     * Get if the packet adapter should be loaded last.
+     *
+     * @return If post load.
+     */
+    public boolean isPostLoad() {
+        return this.postLoad;
+    }
 }

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

@@ -1,52 +1,58 @@
 package com.willfp.eco.core;
 
-import lombok.experimental.UtilityClass;
 import org.apache.commons.lang.Validate;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Base class to hold the handler.
+ * Holds the instance of the eco handler for bridging between the frontend
+ * and backend.
  *
+ * @see Eco#getHandler()
  * @see Handler
  */
-@UtilityClass
-public class Eco {
+@ApiStatus.Internal
+public final class Eco {
     /**
      * Instance of eco handler.
      */
     @ApiStatus.Internal
-    private Handler handler;
+    private static Handler handler;
 
     /**
      * Set the handler.
+     *
      * @param handler The handler.
      */
     @ApiStatus.Internal
-    public void setHandler(@NotNull final Handler handler) {
+    public static void setHandler(@NotNull final Handler handler) {
         Validate.isTrue(Eco.handler == null, "Already initialized!");
 
         Eco.handler = handler;
     }
 
     /**
-     * Get the instance of the eco handler.
+     * Get the instance of the eco handler; the bridge between the api frontend
+     * and the implementation backend.
      * <p>
-     * The handler is, in essence, a way to interface between the eco-api
-     * frontend module, and the eco-backend implementations.
+     * <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>
-     * There shouldn't really be any reason to ever use the handler
-     * in your own plugins, and you are likely to break things. All parts of
-     * the handler are abstracted into logically named parts of the API.
-     * <p>
-     * In versions of eco before 6.12.0, the handler was considered part of
-     * the eco API, however it has since been moved into an internal component
-     * that shouldn't be used in your plugins.
+     * 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.
      *
      * @return The handler.
      */
     @ApiStatus.Internal
-    public Handler getHandler() {
+    public static Handler getHandler() {
         return handler;
     }
+
+    private Eco() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

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

@@ -7,17 +7,16 @@ import com.willfp.eco.core.config.updating.ConfigHandler;
 import com.willfp.eco.core.display.Display;
 import com.willfp.eco.core.display.DisplayModule;
 import com.willfp.eco.core.events.EventManager;
+import com.willfp.eco.core.extensions.Extension;
 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.integrations.IntegrationLoader;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
-import com.willfp.eco.core.proxy.AbstractProxy;
 import com.willfp.eco.core.proxy.ProxyFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
 import com.willfp.eco.core.web.UpdateChecker;
-import lombok.Getter;
 import org.apache.commons.lang.Validate;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.bukkit.Bukkit;
@@ -32,6 +31,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -56,73 +56,61 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     /**
      * The polymart resource ID of the plugin.
      */
-    @Getter
     private final int resourceId;
 
     /**
      * The bStats resource ID of the plugin.
      */
-    @Getter
     private final int bStatsId;
 
     /**
      * The package where proxy implementations are.
      */
-    @Getter
     private final String proxyPackage;
 
     /**
      * The color of the plugin, used in messages.
      */
-    @Getter
     private final String color;
 
     /**
      * Loaded integrations.
      */
-    @Getter
     private final Set<String> loadedIntegrations = new HashSet<>();
 
     /**
      * The internal plugin scheduler.
      */
-    @Getter
     private final Scheduler scheduler;
 
     /**
      * The internal plugin Event Manager.
      */
-    @Getter
     private final EventManager eventManager;
 
     /**
      * Config.yml.
      */
-    @Getter
     private final ConfigYml configYml;
 
     /**
      * Lang.yml.
      */
-    @Getter
     private final LangYml langYml;
 
     /**
      * The internal factory to produce {@link org.bukkit.NamespacedKey}s.
      */
-    @Getter
     private final NamespacedKeyFactory namespacedKeyFactory;
 
     /**
      * The internal factory to produce {@link org.bukkit.metadata.FixedMetadataValue}s.
      */
-    @Getter
     private final MetadataValueFactory metadataValueFactory;
 
     /**
      * The internal factory to produce {@link com.willfp.eco.core.scheduling.RunnableTask}s.
      */
-    @Getter
     private final RunnableFactory runnableFactory;
 
     /**
@@ -130,19 +118,16 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      *
      * @see com.willfp.eco.core.extensions.Extension
      */
-    @Getter
     private final ExtensionLoader extensionLoader;
 
     /**
      * The handler class for updatable classes.
      */
-    @Getter
     private final ConfigHandler configHandler;
 
     /**
      * The display module for the plugin.
      */
-    @Getter
     private DisplayModule displayModule;
 
     /**
@@ -153,19 +138,17 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     /**
      * If the server is running an outdated version of the plugin.
      */
-    @Getter
     private boolean outdated = false;
 
     /**
      * If the plugin supports extensions.
      */
-    @Getter
     private final boolean supportingExtensions;
 
     /**
      * The proxy factory.
      */
-    @Getter
+    @Nullable
     private final ProxyFactory proxyFactory;
 
     /**
@@ -344,11 +327,9 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
                 DefaultArtifactVersion mostRecentVersion = new DefaultArtifactVersion(version);
                 if (!(currentVersion.compareTo(mostRecentVersion) > 0 || currentVersion.equals(mostRecentVersion))) {
                     this.outdated = true;
-                    this.getScheduler().runTimer(() -> {
-                        this.getLogger().info("&c " + this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
-                        this.getLogger().info("&cThe newest version is &f" + version);
-                        this.getLogger().info("&cDownload the new version!");
-                    }, 0, 864000);
+                    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!");
                 }
             });
         }
@@ -469,6 +450,10 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
 
         this.reload();
 
+        for (Extension extension : this.getExtensionLoader().getLoadedExtensions()) {
+            extension.handleAfterLoad();
+        }
+
         this.getLogger().info("Loaded " + this.color + this.getName());
     }
 
@@ -483,6 +468,10 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.getScheduler().cancelAll();
 
         this.handleReload();
+
+        for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
+            extension.handleReload();
+        }
     }
 
     /**
@@ -645,7 +634,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @param <T>        The proxy type.
      * @return The proxy.
      */
-    public final <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxyClass) {
+    public final <T> T getProxy(@NotNull final Class<T> proxyClass) {
         Validate.notNull(proxyFactory, "Plugin does not support proxy!");
 
         return proxyFactory.getProxy(proxyClass);
@@ -664,7 +653,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 this.getConfigYml().getBukkitHandle();
+        return Objects.requireNonNull(this.getConfigYml().getBukkitHandle());
     }
 
     /**
@@ -724,4 +713,168 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     public static Set<String> getPluginNames() {
         return new HashSet<>(Eco.getHandler().getLoadedPlugins());
     }
+
+    /**
+     * Get the polymart resource ID.
+     *
+     * @return The resource ID.
+     */
+    public int getResourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Get the bStats ID.
+     *
+     * @return The ID.
+     */
+    public int getBStatsId() {
+        return this.bStatsId;
+    }
+
+    /**
+     * Get the proxy package.
+     *
+     * @return The package where proxies are contained.
+     */
+    public String getProxyPackage() {
+        return this.proxyPackage;
+    }
+
+    /**
+     * Get the plugin color (uses legacy formatting).
+     *
+     * @return The color.
+     */
+    public String getColor() {
+        return this.color;
+    }
+
+    /**
+     * Get all loaded integration names.
+     *
+     * @return The integrations.
+     */
+    public Set<String> getLoadedIntegrations() {
+        return this.loadedIntegrations;
+    }
+
+    /**
+     * Get the scheduler.
+     *
+     * @return The scheduler.
+     */
+    public Scheduler getScheduler() {
+        return this.scheduler;
+    }
+
+    /**
+     * Get the event manager.
+     *
+     * @return The event manager.
+     */
+    public EventManager getEventManager() {
+        return this.eventManager;
+    }
+
+    /**
+     * Get config.yml.
+     *
+     * @return config.yml.
+     */
+    public ConfigYml getConfigYml() {
+        return this.configYml;
+    }
+
+    /**
+     * Get lang.yml.
+     *
+     * @return lang.yml.
+     */
+    public LangYml getLangYml() {
+        return this.langYml;
+    }
+
+    /**
+     * Get the NamespacedKey factory.
+     *
+     * @return The factory.
+     */
+    public NamespacedKeyFactory getNamespacedKeyFactory() {
+        return this.namespacedKeyFactory;
+    }
+
+    /**
+     * Get the metadata value factory.
+     *
+     * @return The factory.
+     */
+    public MetadataValueFactory getMetadataValueFactory() {
+        return this.metadataValueFactory;
+    }
+
+    /**
+     * Get the runnable factory.
+     *
+     * @return The runnable factory.
+     */
+    public RunnableFactory getRunnableFactory() {
+        return this.runnableFactory;
+    }
+
+    /**
+     * Get the extension loader.
+     *
+     * @return The extension loader.
+     */
+    public ExtensionLoader getExtensionLoader() {
+        return this.extensionLoader;
+    }
+
+    /**
+     * Get the config handler.
+     *
+     * @return The config handler.
+     */
+    public ConfigHandler getConfigHandler() {
+        return this.configHandler;
+    }
+
+    /**
+     * Get the plugin's display module.
+     *
+     * @return The display module.
+     */
+    @Nullable
+    public DisplayModule getDisplayModule() {
+        return this.displayModule;
+    }
+
+    /**
+     * Get if the plugin is outdated.
+     *
+     * @return If outdated.
+     */
+    public boolean isOutdated() {
+        return this.outdated;
+    }
+
+    /**
+     * Get if the plugin supports extensions.
+     *
+     * @return If extensions are supported.
+     */
+    public boolean isSupportingExtensions() {
+        return this.supportingExtensions;
+    }
+
+    /**
+     * Get the proxy factory.
+     *
+     * @return The proxy factory.
+     */
+    @Nullable
+    public ProxyFactory getProxyFactory() {
+        return this.proxyFactory;
+    }
 }

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

@@ -2,8 +2,8 @@ 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.keys.KeyRegistry;
 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;
@@ -18,6 +18,9 @@ import com.willfp.eco.core.proxy.ProxyFactory;
 import com.willfp.eco.core.requirement.RequirementFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import org.bukkit.Location;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Entity;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -230,5 +233,30 @@ public interface 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);
+
+    /**
+     * 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);
 }

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

@@ -1,11 +1,16 @@
 package com.willfp.eco.core;
 
-import lombok.AccessLevel;
-import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Quick DI class to manage passing eco plugins.
+ * <p>
+ * Basically just a quick bit of laziness if you can't be bothered to add a private field
+ * and a protected getter, don't use this in kotlin as you can just specify
+ * {@code
+ * private val plugin: EcoPlugin
+ * }
+ * in the constructor.
  *
  * @param <T> The eco plugin type.
  */
@@ -13,7 +18,6 @@ public abstract class PluginDependent<T extends EcoPlugin> {
     /**
      * The {@link EcoPlugin} that is stored.
      */
-    @Getter(AccessLevel.PROTECTED)
     @NotNull
     private final T plugin;
 
@@ -25,4 +29,14 @@ public abstract class PluginDependent<T extends EcoPlugin> {
     protected PluginDependent(@NotNull final T plugin) {
         this.plugin = plugin;
     }
+
+    /**
+     * Get the plugin.
+     *
+     * @return The plugin.
+     */
+    @NotNull
+    protected T getPlugin() {
+        return this.plugin;
+    }
 }

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

@@ -3,6 +3,7 @@ package com.willfp.eco.core;
 import com.willfp.eco.core.config.updating.ConfigHandler;
 
 import java.io.File;
+import java.util.logging.Logger;
 
 /**
  * Represents any class that acts like a plugin, for example {@link EcoPlugin}
@@ -26,4 +27,11 @@ public interface PluginLike {
      * @return The config handler.
      */
     ConfigHandler getConfigHandler();
+
+    /**
+     * Get the logger.
+     *
+     * @return The logger.
+     */
+    Logger getLogger();
 }

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

@@ -1,8 +1,8 @@
 package com.willfp.eco.core;
 
+import com.willfp.eco.core.integrations.economy.EconomyManager;
 import com.willfp.eco.core.proxy.ProxyConstants;
 import com.willfp.eco.util.ClassUtils;
-import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -31,25 +31,51 @@ public class Prerequisite {
     );
 
     /**
-     * Requires the server to be running an implementation of paper.
+     * Requires the server to have vault installed.
+     *
+     * @deprecated Use {@link EconomyManager#hasRegistrations()} instead.
      */
+    @Deprecated
     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.18.
+     */
+    public static final Prerequisite HAS_1_18 = new Prerequisite(
+            () -> ProxyConstants.NMS_VERSION.contains("18"),
+            "Requires server to be running 1.18+"
+    );
+
     /**
      * Requires the server to be running 1.17.
      */
     public static final Prerequisite HAS_1_17 = new Prerequisite(
-            () -> ProxyConstants.NMS_VERSION.contains("17"),
+            () -> ProxyConstants.NMS_VERSION.contains("17") || HAS_1_18.isMet(),
             "Requires server to be running 1.17+"
     );
 
+    /**
+     * Requires the server to be running an implementation of BungeeCord.
+     */
+    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)"
+    );
+
+    /**
+     * Requires the server to be running an implementation of Velocity.
+     */
+    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)"
+    );
+
     /**
      * If the necessary prerequisite condition has been met.
      */
-    @Getter
     private boolean isMet;
 
     /**
@@ -60,7 +86,6 @@ public class Prerequisite {
     /**
      * The description of the requirements of the prerequisite.
      */
-    @Getter
     private final String description;
 
     /**
@@ -105,4 +130,22 @@ public class Prerequisite {
     static {
         update();
     }
+
+    /**
+     * Get if the prerequisite is met.
+     *
+     * @return If the condition is met.
+     */
+    public boolean isMet() {
+        return this.isMet;
+    }
+
+    /**
+     * Get the description.
+     *
+     * @return The description.
+     */
+    public String getDescription() {
+        return this.description;
+    }
 }

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

@@ -1,7 +1,11 @@
 package com.willfp.eco.core.command;
 
+import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Interface for all command implementations.
  */
@@ -35,31 +39,70 @@ public interface CommandBase {
      */
     CommandBase addSubcommand(@NotNull CommandBase command);
 
+    /**
+     * Handle command execution.
+     * <p>
+     * Marked as default void with no implementation for backwards compatibility.
+     *
+     * @param sender The sender.
+     * @param args   The args.
+     */
+    default void onExecute(@NotNull CommandSender sender,
+                           @NotNull List<String> args) {
+        // Do nothing.
+    }
+
+    /**
+     * Handle tab completion.
+     * <p>
+     * Marked as default void with no implementation for backwards compatibility.
+     *
+     * @param sender The sender.
+     * @param args   The args.
+     * @return The results.
+     */
+    default List<String> tabComplete(@NotNull CommandSender sender,
+                                     @NotNull List<String> args) {
+        return new ArrayList<>();
+    }
+
     /**
      * Get the handler.
      *
      * @return The handler.
+     * @see CommandHandler
+     * @deprecated Use {@link CommandBase#onExecute(CommandSender, List)} instead.
      */
+    @Deprecated
     CommandHandler getHandler();
 
     /**
      * Set the handler.
      *
      * @param handler The handler.
+     * @see CommandHandler
+     * @deprecated Handlers have been deprecated.
      */
+    @Deprecated
     void setHandler(@NotNull CommandHandler handler);
 
     /**
      * Get the tab completer.
      *
      * @return The tab completer.
+     * @see TabCompleteHandler
+     * @deprecated Use {@link CommandBase#tabComplete(CommandSender, List)} instead.
      */
+    @Deprecated
     TabCompleteHandler getTabCompleter();
 
     /**
      * Set the tab completer.
      *
      * @param handler The handler.
+     * @see TabCompleteHandler
+     * @deprecated Handlers have been deprecated.
      */
+    @Deprecated
     void setTabCompleter(@NotNull TabCompleteHandler handler);
 }

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

@@ -10,9 +10,13 @@ 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.

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

@@ -10,9 +10,13 @@ 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.

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

@@ -5,13 +5,11 @@ 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 lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
 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;
@@ -26,11 +24,11 @@ import java.util.stream.Collectors;
  * 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.
      */
-    @Getter
     private final String name;
 
     /**
@@ -38,7 +36,6 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
      * <p>
      * Written out as a string for flexibility with subclasses.
      */
-    @Getter
     private final String permission;
 
     /**
@@ -46,27 +43,25 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
      * <p>
      * In other worlds, only allowed to be executed by console.
      */
-    @Getter
     private final boolean playersOnly;
 
     /**
      * The actual code to be executed in the command.
      */
-    @Getter
-    @Setter
-    private CommandHandler handler = (sender, args) -> { };
+    @Deprecated
+    @Nullable
+    private CommandHandler handler = null;
 
     /**
      * The tab completion code to be executed in the command.
      */
-    @Getter
-    @Setter
-    private TabCompleteHandler tabCompleter = (sender, args) -> new ArrayList<>();
+    @Deprecated
+    @Nullable
+    private TabCompleteHandler tabCompleter = null;
 
     /**
      * All subcommands for the command.
      */
-    @Getter(AccessLevel.PROTECTED)
     private final List<CommandBase> subcommands;
 
     /**
@@ -129,7 +124,11 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
             }
         }
 
-        this.getHandler().onExecute(sender, Arrays.asList(args));
+        if (this.getHandler() != null) {
+            this.getHandler().onExecute(sender, Arrays.asList(args));
+        } else {
+            this.onExecute(sender, Arrays.asList(args));
+        }
     }
 
     /**
@@ -176,7 +175,11 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
             }
         }
 
-        return this.getTabCompleter().tabComplete(sender, Arrays.asList(args));
+        if (this.getTabCompleter() != null) {
+            return this.getTabCompleter().tabComplete(sender, Arrays.asList(args));
+        } else {
+            return this.tabComplete(sender, Arrays.asList(args));
+        }
     }
 
     /**
@@ -202,4 +205,64 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
 
         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

@@ -12,7 +12,9 @@ import org.jetbrains.annotations.Nullable;
 import java.util.List;
 
 /**
- * PluginCommands are the class to be used instead of CommandExecutor.
+ * 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>

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

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.PluginLike;
+import com.willfp.eco.core.config.wrapper.LoadableConfigWrapper;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml).
+ * <p>
+ * Automatically updates.
+ */
+public abstract class BaseConfig extends LoadableConfigWrapper {
+    /**
+     * 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.
+     */
+    protected BaseConfig(@NotNull final String configName,
+                         @NotNull final PluginLike plugin,
+                         final boolean removeUnused,
+                         @NotNull final ConfigType type) {
+        super(Eco.getHandler().getConfigFactory().createUpdatableConfig(
+                configName,
+                plugin,
+                "",
+                plugin.getClass(),
+                removeUnused,
+                type
+        ));
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.willfp.eco.core.config;
+
+/**
+ * Config types, classified by file extension.
+ */
+public enum ConfigType {
+    /**
+     * .json config.
+     */
+    JSON,
+
+    /**
+     * .yml config.
+     */
+    YAML
+}

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

@@ -0,0 +1,44 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.PluginLike;
+import com.willfp.eco.core.config.wrapper.LoadableConfigWrapper;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Config implementation for configs present in one of two places:
+ * <ul>
+ *     <li>Plugin base directory (eg config.yml, lang.json)</li>
+ *     <li>Other extension's configs</li>
+ * </ul>
+ * <p>
+ * Automatically updates.
+ */
+public abstract class ExtendableConfig extends LoadableConfigWrapper {
+    /**
+     * @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 type             The config type.
+     * @param source           The class that owns the resource.
+     */
+    protected ExtendableConfig(@NotNull final String configName,
+                               final boolean removeUnused,
+                               @NotNull final PluginLike plugin,
+                               @NotNull final Class<?> source,
+                               @NotNull final String subDirectoryPath,
+                               @NotNull final ConfigType type,
+                               @NotNull final String... updateBlacklist) {
+        super(Eco.getHandler().getConfigFactory().createUpdatableConfig(
+                configName,
+                plugin,
+                subDirectoryPath,
+                source,
+                removeUnused,
+                type,
+                updateBlacklist
+        ));
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.PluginLike;
+import com.willfp.eco.core.config.wrapper.LoadableConfigWrapper;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Non-updatable yaml config that exists within a plugin jar.
+ */
+public abstract class StaticBaseConfig extends LoadableConfigWrapper {
+    /**
+     * 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.
+     * @param type       The config type.
+     */
+    protected StaticBaseConfig(@NotNull final String configName,
+                               @NotNull final PluginLike plugin,
+                               @NotNull final ConfigType type) {
+        super(Eco.getHandler().getConfigFactory().createLoadableConfig(
+                configName,
+                plugin,
+                "",
+                plugin.getClass(),
+                type
+        ));
+    }
+}

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

@@ -0,0 +1,48 @@
+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.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
+
+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.
+ */
+public class TransientConfig extends ConfigWrapper<Config> {
+    /**
+     * @param config The YamlConfiguration handle.
+     */
+    public TransientConfig(@NotNull final YamlConfiguration config) {
+        super(Eco.getHandler().getConfigFactory().createConfig(config));
+    }
+
+    /**
+     * Create a new empty transient config.
+     *
+     * @param values The values.
+     */
+    public TransientConfig(@NotNull final Map<String, Object> values) {
+        super(Eco.getHandler().getConfigFactory().createConfig(values));
+    }
+
+    /**
+     * Create a new empty transient config.
+     */
+    public TransientConfig() {
+        super(Eco.getHandler().getConfigFactory().createConfig("", ConfigType.YAML));
+    }
+
+    /**
+     * @param contents The contents of the config.
+     * @param type     The config type.
+     */
+    public TransientConfig(@NotNull final String contents,
+                           @NotNull final ConfigType type) {
+        super(Eco.getHandler().getConfigFactory().createConfig(contents, type));
+    }
+}

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

@@ -1,19 +1,55 @@
 package com.willfp.eco.core.config.base;
 
 import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.yaml.YamlBaseConfig;
+import com.willfp.eco.core.config.BaseConfig;
+import com.willfp.eco.core.config.ConfigType;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Default plugin config.yml.
  */
-public class ConfigYml extends YamlBaseConfig {
+public class ConfigYml extends BaseConfig {
     /**
      * Config.yml.
      *
      * @param plugin The plugin.
      */
     public ConfigYml(@NotNull final EcoPlugin plugin) {
-        super("config", true, plugin);
+        super("config", plugin, true, ConfigType.YAML);
+    }
+
+    /**
+     * Config.yml.
+     *
+     * @param plugin       The plugin.
+     * @param removeUnused Remove unused.
+     */
+    public ConfigYml(@NotNull final EcoPlugin plugin,
+                     final boolean removeUnused) {
+        super("config", plugin, removeUnused, ConfigType.YAML);
+    }
+
+    /**
+     * Config.yml.
+     *
+     * @param plugin The plugin.
+     * @param name   The config name.
+     */
+    public ConfigYml(@NotNull final EcoPlugin plugin,
+                     @NotNull final String name) {
+        super(name, plugin, true, ConfigType.YAML);
+    }
+
+    /**
+     * Config.yml.
+     *
+     * @param plugin       The plugin.
+     * @param name         The config name.
+     * @param removeUnused Remove unused.
+     */
+    public ConfigYml(@NotNull final EcoPlugin plugin,
+                     @NotNull final String name,
+                     final boolean removeUnused) {
+        super(name, plugin, removeUnused, ConfigType.YAML);
     }
 }

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

@@ -1,21 +1,22 @@
 package com.willfp.eco.core.config.base;
 
 import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.yaml.YamlBaseConfig;
+import com.willfp.eco.core.config.BaseConfig;
+import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Default plugin lang.yml.
  */
-public class LangYml extends YamlBaseConfig {
+public class LangYml extends BaseConfig {
     /**
      * Lang.yml.
      *
      * @param plugin The plugin.
      */
     public LangYml(@NotNull final EcoPlugin plugin) {
-        super("lang", false, plugin);
+        super("lang", plugin, false, ConfigType.YAML);
     }
 
     /**
@@ -24,7 +25,7 @@ public class LangYml extends YamlBaseConfig {
      * @return The prefix.
      */
     public String getPrefix() {
-        return this.getString("messages.prefix");
+        return this.getFormattedString("messages.prefix");
     }
 
     /**
@@ -33,7 +34,7 @@ public class LangYml extends YamlBaseConfig {
      * @return The message.
      */
     public String getNoPermission() {
-        return getPrefix() + this.getString("messages.no-permission");
+        return getPrefix() + this.getFormattedString("messages.no-permission");
     }
 
     /**
@@ -55,6 +56,6 @@ public class LangYml extends YamlBaseConfig {
      */
     public String getMessage(@NotNull final String message,
                              @NotNull final StringUtils.FormatOption option) {
-        return getPrefix() + this.getString("messages." + message, option);
+        return getPrefix() + this.getFormattedString("messages." + message, option);
     }
 }

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

@@ -1,16 +1,23 @@
 package com.willfp.eco.core.config.interfaces;
 
+import com.willfp.eco.core.config.ConfigType;
+import com.willfp.eco.core.config.TransientConfig;
+import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.StringUtils;
+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;
 
 /**
- * All canfigs implement this interface.
+ * All configs implement this interface.
  * <p>
  * Contains all methods that must exist in yaml and json configurations.
  */
+@SuppressWarnings("unused")
 public interface Config extends Cloneable {
     /**
      * Clears cache.
@@ -65,10 +72,12 @@ public interface Config extends Cloneable {
      * Get subsection from config.
      *
      * @param path The key to check.
-     * @return The subsection. Throws NPE if not found.
+     * @return The subsection. Returns an empty section if not found.
      */
     @NotNull
-    Config getSubsection(@NotNull String path);
+    default Config getSubsection(@NotNull String path) {
+        return Objects.requireNonNullElse(getSubsectionOrNull(path), new TransientConfig());
+    }
 
     /**
      * Get subsection from config.
@@ -85,7 +94,44 @@ public interface Config extends Cloneable {
      * @param path The key to fetch the value from.
      * @return The found value, or 0 if not found.
      */
-    int getInt(@NotNull String path);
+    default int getInt(@NotNull String path) {
+        return Objects.requireNonNullElse(getIntOrNull(path), 0);
+    }
+
+    /**
+     * Get an integer from config with a specified default (not found) value.
+     *
+     * @param path The key to fetch the value from.
+     * @param def  The value to default to if not found.
+     * @return The found value, or the default.
+     */
+    default int getInt(@NotNull String path,
+                       int def) {
+        return Objects.requireNonNullElse(getIntOrNull(path), def);
+    }
+
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path The key to fetch the value from.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default int getIntFromExpression(@NotNull String path) {
+        return getIntFromExpression(path, null);
+    }
+
+    /**
+     * 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.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default int getIntFromExpression(@NotNull String path,
+                                     @Nullable Player player) {
+        return Double.valueOf(getDoubleFromExpression(path, player)).intValue();
+    }
+
 
     /**
      * Get an integer from config.
@@ -96,16 +142,6 @@ public interface Config extends Cloneable {
     @Nullable
     Integer getIntOrNull(@NotNull String path);
 
-    /**
-     * Get an integer from config with a specified default (not found) value.
-     *
-     * @param path The key to fetch the value from.
-     * @param def  The value to default to if not found.
-     * @return The found value, or the default.
-     */
-    int getInt(@NotNull String path,
-               int def);
-
     /**
      * Get a list of integers from config.
      *
@@ -113,7 +149,9 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<Integer> getInts(@NotNull String path);
+    default List<Integer> getInts(@NotNull String path) {
+        return Objects.requireNonNullElse(getIntsOrNull(path), new ArrayList<>());
+    }
 
     /**
      * Get a list of integers from config.
@@ -130,7 +168,9 @@ public interface Config extends Cloneable {
      * @param path The key to fetch the value from.
      * @return The found value, or false if not found.
      */
-    boolean getBool(@NotNull String path);
+    default boolean getBool(@NotNull String path) {
+        return Objects.requireNonNullElse(getBoolOrNull(path), false);
+    }
 
     /**
      * Get a boolean from config.
@@ -148,7 +188,9 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<Boolean> getBools(@NotNull String path);
+    default List<Boolean> getBools(@NotNull String path) {
+        return Objects.requireNonNullElse(getBoolsOrNull(path), new ArrayList<>());
+    }
 
     /**
      * Get a list of booleans from config.
@@ -159,15 +201,41 @@ public interface Config extends Cloneable {
     @Nullable
     List<Boolean> getBoolsOrNull(@NotNull String path);
 
+    /**
+     * Get a formatted string from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or an empty string if not found.
+     */
+    @NotNull
+    default String getFormattedString(@NotNull String path) {
+        return getString(path, true, StringUtils.FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Get a formatted 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.
+     */
+    @NotNull
+    default String getFormattedString(@NotNull String path,
+                                      @NotNull StringUtils.FormatOption option) {
+        return getString(path, true, option);
+    }
+
     /**
      * Get a string from config.
+     * <p>
+     * Not formatted.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or an empty string if not found.
      */
     @NotNull
     default String getString(@NotNull String path) {
-        return getString(path, true);
+        return getString(path, false);
     }
 
     /**
@@ -176,8 +244,9 @@ public interface Config extends Cloneable {
      * @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.
      */
-    @NotNull
+    @Deprecated(since = "6.18.0")
     default String getString(@NotNull String path,
                              boolean format) {
         return this.getString(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
@@ -189,8 +258,10 @@ public interface Config extends Cloneable {
      * @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);
@@ -205,19 +276,47 @@ public interface Config extends Cloneable {
      * @return The found value, or an empty string if not found.
      */
     @NotNull
-    String getString(@NotNull String path,
-                     boolean format,
-                     @NotNull StringUtils.FormatOption option);
+    default String getString(@NotNull String path,
+                             boolean format,
+                             @NotNull StringUtils.FormatOption option) {
+        return Objects.requireNonNullElse(getStringOrNull(path, format, option), "");
+    }
+
+    /**
+     * Get a formatted string from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or an empty string if not found.
+     */
+    @Nullable
+    default String getFormattedStringOrNull(@NotNull String path) {
+        return getStringOrNull(path, true, StringUtils.FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Get a formatted 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.
+     */
+    @Nullable
+    default String getFormattedStringOrNull(@NotNull String path,
+                                            @NotNull StringUtils.FormatOption option) {
+        return getStringOrNull(path, true, option);
+    }
 
     /**
      * Get a string from config.
+     * <p>
+     * Formatted by default.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or null if not found.
      */
     @Nullable
     default String getStringOrNull(@NotNull String path) {
-        return getStringOrNull(path, true);
+        return getStringOrNull(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
     /**
@@ -226,8 +325,10 @@ public interface Config extends Cloneable {
      * @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);
@@ -239,8 +340,10 @@ public interface Config extends Cloneable {
      * @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);
@@ -251,7 +354,7 @@ public interface Config extends Cloneable {
      *
      * @param path   The key to fetch the value from.
      * @param format If the string should be formatted.
-     * @param option The format option.
+     * @param option The format option. If format is false, this will be ignored.
      * @return The found value, or null if not found.
      */
     @Nullable
@@ -268,8 +371,36 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
+    default List<String> getFormattedStrings(@NotNull String path) {
+        return getStrings(path, true, StringUtils.FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Get a list of strings from config.
+     * <p>
+     * Formatted by default.
+     *
+     * @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.
+     */
+    @NotNull
+    default List<String> getFormattedStrings(@NotNull String path,
+                                             @NotNull StringUtils.FormatOption option) {
+        return getStrings(path, true, option);
+    }
+
+    /**
+     * Get a list of strings from config.
+     * <p>
+     * Not formatted.
+     *
+     * @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<String> getStrings(@NotNull String path) {
-        return getStrings(path, true);
+        return getStrings(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
     /**
@@ -278,8 +409,10 @@ public interface Config extends Cloneable {
      * @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);
@@ -291,11 +424,13 @@ public interface Config extends Cloneable {
      * @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.
      */
-    @Nullable
+    @NotNull
+    @Deprecated
     default List<String> getStrings(@NotNull String path,
                                     @NotNull StringUtils.FormatOption option) {
-        return getStrings(path, true, option);
+        return getStrings(path, false, option);
     }
 
     /**
@@ -307,19 +442,53 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<String> getStrings(@NotNull String path,
-                            boolean format,
-                            @NotNull StringUtils.FormatOption option);
+    default List<String> getStrings(@NotNull String path,
+                                    boolean format,
+                                    @NotNull StringUtils.FormatOption option) {
+        return Objects.requireNonNullElse(getStringsOrNull(path, format, option), new ArrayList<>());
+    }
 
     /**
      * Get a list of strings from config.
+     * <p>
+     * Formatted.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    default List<String> getFormattedStringsOrNull(@NotNull String path) {
+        return getStringsOrNull(path, true, StringUtils.FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Get a list of strings from config.
+     * <p>
+     * Formatted.
+     *
+     * @param path   The key to fetch the value from.
+     * @param option The format option.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    default List<String> getFormattedStringsOrNull(@NotNull String path,
+                                                   @NotNull StringUtils.FormatOption option) {
+        return getStringsOrNull(path, true, option);
+    }
+
+    /**
+     * Get a list of strings from config.
+     * <p>
+     * Not formatted.
+     * <p>
+     * This will be changed in newer versions to <b>not</b> format by default.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or null if not found.
      */
     @Nullable
     default List<String> getStringsOrNull(@NotNull String path) {
-        return getStringsOrNull(path, true);
+        return getStringsOrNull(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
     /**
@@ -328,8 +497,10 @@ public interface Config extends Cloneable {
      * @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);
@@ -341,11 +512,13 @@ public interface Config extends Cloneable {
      * @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, true, option);
+        return getStringsOrNull(path, false, option);
     }
 
     /**
@@ -367,7 +540,31 @@ public interface Config extends Cloneable {
      * @param path The key to fetch the value from.
      * @return The found value, or 0 if not found.
      */
-    double getDouble(@NotNull String path);
+    default double getDouble(@NotNull String path) {
+        return Objects.requireNonNullElse(getDoubleOrNull(path), 0.0);
+    }
+
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path The key to fetch the value from.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default double getDoubleFromExpression(@NotNull String path) {
+        return getDoubleFromExpression(path, null);
+    }
+
+    /**
+     * 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.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default double getDoubleFromExpression(@NotNull String path,
+                                           @Nullable Player player) {
+        return NumberUtils.evaluateExpression(this.getString(path), player);
+    }
 
     /**
      * Get a decimal from config.
@@ -385,7 +582,9 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<Double> getDoubles(@NotNull String path);
+    default List<Double> getDoubles(@NotNull String path) {
+        return Objects.requireNonNullElse(getDoublesOrNull(path), new ArrayList<>());
+    }
 
     /**
      * Get a list of decimals from config.
@@ -396,6 +595,34 @@ public interface Config extends Cloneable {
     @Nullable
     List<Double> getDoublesOrNull(@NotNull String path);
 
+    /**
+     * 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<? extends Config> 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<? extends Config> getSubsectionsOrNull(@NotNull String path);
+
+    /**
+     * Get config type.
+     *
+     * @return The type.
+     */
+    @NotNull
+    ConfigType getType();
+
     /**
      * Clone the config.
      *

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

@@ -3,13 +3,19 @@ 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 configs have extra methods compared to yaml configs.
- * <p>
- * If you need to use them, then use JSONConfig instead.
+ * 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.
@@ -18,7 +24,9 @@ public interface JSONConfig extends Config {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<JSONConfig> getSubsections(@NotNull String path);
+    default List<JSONConfig> getSubsections(@NotNull String path) {
+        return Objects.requireNonNullElse(getSubsectionsOrNull(path), new ArrayList<>());
+    }
 
     /**
      * Get a list of subsections from config.

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

@@ -1,12 +1,16 @@
 package com.willfp.eco.core.config.interfaces;
 
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
 import java.io.IOException;
 
 /**
  * Interface for configs that physically exist as files in plugins.
  */
-public interface LoadableConfig {
+public interface LoadableConfig extends Config {
     /**
      * Create the file.
      */
@@ -39,4 +43,18 @@ public interface LoadableConfig {
      * @return The name.
      */
     String getName();
+
+    /**
+     * 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()}.
+     *
+     * @return The config, or null if config is not yaml-based.
+     */
+    @Nullable
+    YamlConfiguration getBukkitHandle();
 }

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

@@ -5,8 +5,12 @@ import org.bukkit.configuration.file.YamlConfiguration;
 /**
  * Interface for configs that wrap an {@link YamlConfiguration}.
  *
- * @see com.willfp.eco.core.config.yaml.wrapper.YamlConfigWrapper
+ * @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.

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

@@ -3,6 +3,8 @@ 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;
 
@@ -10,7 +12,12 @@ 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
@@ -23,13 +30,16 @@ public abstract class JSONBaseConfig extends LoadableJSONConfigWrapper {
                              @NotNull final PluginLike plugin,
                              @NotNull final String... updateBlacklist) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableJSONConfig(
-                        configName,
-                        plugin,
-                        "",
-                        plugin.getClass(),
-                        removeUnused, updateBlacklist
-                )
+                (JSONConfig)
+                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
+                                configName,
+                                plugin,
+                                "",
+                                plugin.getClass(),
+                                removeUnused,
+                                ConfigType.JSON,
+                                updateBlacklist
+                        )
         );
     }
 
@@ -42,13 +52,15 @@ public abstract class JSONBaseConfig extends LoadableJSONConfigWrapper {
                              final boolean removeUnused,
                              @NotNull final PluginLike plugin) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableJSONConfig(
-                        configName,
-                        plugin,
-                        "",
-                        plugin.getClass(),
-                        removeUnused
-                )
+                (JSONConfig)
+                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
+                                configName,
+                                plugin,
+                                "",
+                                plugin.getClass(),
+                                removeUnused,
+                                ConfigType.JSON
+                        )
         );
     }
 

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

@@ -3,6 +3,8 @@ 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;
 
@@ -14,7 +16,12 @@ import org.jetbrains.annotations.NotNull;
  * </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
@@ -31,16 +38,19 @@ public abstract class JSONExtendableConfig extends LoadableJSONConfigWrapper {
                                    @NotNull final String subDirectoryPath,
                                    @NotNull final String... updateBlacklist) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableJSONConfig(
-                        configName,
-                        plugin,
-                        subDirectoryPath,
-                        source,
-                        removeUnused,
-                        updateBlacklist
-                )
+                (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.

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

@@ -3,12 +3,19 @@ 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).
@@ -20,7 +27,7 @@ public abstract class JSONStaticBaseConfig extends LoadableJSONConfigWrapper {
      */
     protected JSONStaticBaseConfig(@NotNull final String configName,
                                    @NotNull final PluginLike plugin) {
-        super(Eco.getHandler().getConfigFactory().createLoadableJSONConfig(configName, plugin, "", plugin.getClass()));
+        super((JSONConfig) Eco.getHandler().getConfigFactory().createLoadableConfig(configName, plugin, "", plugin.getClass(), ConfigType.JSON));
     }
 
     /**

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

@@ -1,14 +1,21 @@
 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.
@@ -18,6 +25,13 @@ public class JSONTransientConfig extends JSONConfigWrapper {
      * @param values The map of values.
      */
     public JSONTransientConfig(@NotNull final Map<String, Object> values) {
-        super(Eco.getHandler().getConfigFactory().createJSONConfig(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

@@ -9,7 +9,12 @@ 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.

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

@@ -3,14 +3,21 @@ 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.
@@ -48,4 +55,9 @@ public abstract class LoadableJSONConfigWrapper extends JSONConfigWrapper implem
     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

@@ -23,10 +23,14 @@ import java.lang.annotation.Target;
  * <p>
  * The second:
  * <pre>{@code
- * public static void update(EcoPlugin plugin) {}
+ * public static void update(EcoPlugin plugin) {
  *     // Update code
+ * }
  * }</pre>
  * <p>
+ * If using kotlin, you have to annotate the method with {@code @JvmStatic}
+ * in order to prevent null pointer exceptions.
+ * <p>
  * Config update methods in all classes in a plugin jar will be called
  * on reload.
  * <p>

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

@@ -1,9 +1,11 @@
 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.JSONConfig;
+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;
@@ -11,6 +13,7 @@ import java.util.Map;
 /**
  * Internal component to create backend config implementations.
  */
+@ApiStatus.Internal
 public interface ConfigFactory {
     /**
      * Updatable config.
@@ -20,75 +23,57 @@ public interface ConfigFactory {
      * @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.
      */
-    Config createUpdatableYamlConfig(@NotNull String configName,
-                                     @NotNull PluginLike plugin,
-                                     @NotNull String subDirectoryPath,
-                                     @NotNull Class<?> source,
-                                     boolean removeUnused,
-                                     @NotNull String... updateBlacklist);
-
-    /**
-     * 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 updateBlacklist  Substring of keys to not add/remove keys for.
-     * @return The config implementation.
-     */
-    JSONConfig createUpdatableJSONConfig(@NotNull String configName,
+    LoadableConfig createUpdatableConfig(@NotNull String configName,
                                          @NotNull PluginLike plugin,
                                          @NotNull String subDirectoryPath,
                                          @NotNull Class<?> source,
                                          boolean removeUnused,
+                                         @NotNull ConfigType type,
                                          @NotNull String... updateBlacklist);
 
     /**
-     * JSON loadable config.
+     * 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.
      */
-    JSONConfig createLoadableJSONConfig(@NotNull String configName,
+    LoadableConfig createLoadableConfig(@NotNull String configName,
                                         @NotNull PluginLike plugin,
                                         @NotNull String subDirectoryPath,
-                                        @NotNull Class<?> source);
+                                        @NotNull Class<?> source,
+                                        @NotNull ConfigType type);
 
     /**
-     * Yaml 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.
-     * @return The config implementation.
-     */
-    Config createLoadableYamlConfig(@NotNull String configName,
-                                    @NotNull PluginLike plugin,
-                                    @NotNull String subDirectoryPath,
-                                    @NotNull Class<?> source);
-
-    /**
-     * Yaml config.
+     * Create config.
      *
      * @param config The handle.
      * @return The config implementation.
      */
-    Config createYamlConfig(@NotNull YamlConfiguration config);
+    Config createConfig(@NotNull YamlConfiguration config);
 
     /**
-     * JSON config.
+     * Create config.
      *
      * @param values The values.
      * @return The config implementation.
      */
-    JSONConfig createJSONConfig(@NotNull Map<String, Object> values);
+    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

@@ -1,8 +1,8 @@
 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.util.StringUtils;
-import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -16,6 +16,7 @@ import java.util.List;
  *
  * @param <T> The type of the handle.
  */
+@SuppressWarnings("MethodDoesntCallSuperMethod")
 public abstract class ConfigWrapper<T extends Config> implements Config {
     /**
      * Configs from eco have an internal implementation,
@@ -27,7 +28,6 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
      * <p>
      * In general use, though, the handle isn't necessary.
      */
-    @Getter
     private final T handle;
 
     /**
@@ -70,70 +70,31 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         handle.set(path, object);
     }
 
-    @Override
-    public @NotNull Config getSubsection(@NotNull final String path) {
-        return handle.getSubsection(path);
-    }
-
     @Override
     public @Nullable Config getSubsectionOrNull(@NotNull final String path) {
         return handle.getSubsectionOrNull(path);
     }
 
-    @Override
-    public int getInt(@NotNull final String path) {
-        return handle.getInt(path);
-    }
-
     @Override
     public @Nullable Integer getIntOrNull(@NotNull final String path) {
         return handle.getIntOrNull(path);
     }
 
-    @Override
-    public int getInt(@NotNull final String path,
-                      final int def) {
-        return handle.getInt(path, def);
-    }
-
-    @Override
-    public @NotNull List<Integer> getInts(@NotNull final String path) {
-        return handle.getInts(path);
-    }
-
     @Override
     public @Nullable List<Integer> getIntsOrNull(@NotNull final String path) {
         return handle.getIntsOrNull(path);
     }
 
-    @Override
-    public boolean getBool(@NotNull final String path) {
-        return handle.getBool(path);
-    }
-
     @Override
     public @Nullable Boolean getBoolOrNull(@NotNull final String path) {
         return handle.getBoolOrNull(path);
     }
 
-    @Override
-    public @NotNull List<Boolean> getBools(@NotNull final String path) {
-        return handle.getBools(path);
-    }
-
     @Override
     public @Nullable List<Boolean> getBoolsOrNull(@NotNull final String path) {
         return handle.getBoolsOrNull(path);
     }
 
-
-    @Override
-    public @NotNull String getString(@NotNull final String path,
-                                     final boolean format,
-                                     @NotNull final StringUtils.FormatOption option) {
-        return handle.getString(path, format, option);
-    }
-
     @Override
     public @Nullable String getStringOrNull(@NotNull final String path,
                                             final boolean format,
@@ -141,13 +102,6 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getStringOrNull(path, format, option);
     }
 
-    @Override
-    public @NotNull List<String> getStrings(@NotNull final String path,
-                                            final boolean format,
-                                            @NotNull final StringUtils.FormatOption option) {
-        return handle.getStrings(path, format, option);
-    }
-
     @Override
     public @Nullable List<String> getStringsOrNull(@NotNull final String path,
                                                    final boolean format,
@@ -155,28 +109,37 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getStringsOrNull(path, format, option);
     }
 
-    @Override
-    public double getDouble(@NotNull final String path) {
-        return handle.getDouble(path);
-    }
-
     @Override
     public @Nullable Double getDoubleOrNull(@NotNull final String path) {
         return handle.getDoubleOrNull(path);
     }
 
     @Override
-    public @NotNull List<Double> getDoubles(@NotNull final String path) {
-        return handle.getDoubles(path);
+    public @Nullable List<Double> getDoublesOrNull(@NotNull final String path) {
+        return handle.getDoublesOrNull(path);
     }
 
     @Override
-    public @Nullable List<Double> getDoublesOrNull(@NotNull final String path) {
-        return handle.getDoublesOrNull(path);
+    public @Nullable List<? extends Config> getSubsectionsOrNull(@NotNull final String path) {
+        return handle.getSubsectionsOrNull(path);
     }
 
     @Override
     public Config clone() {
         return handle.clone();
     }
+
+    @Override
+    public @NotNull ConfigType getType() {
+        return handle.getType();
+    }
+
+    /**
+     * Get the handle.
+     *
+     * @return The handle.
+     */
+    public T getHandle() {
+        return this.handle;
+    }
 }

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

@@ -0,0 +1,53 @@
+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;
+
+/**
+ * Wrapper to handle the backend loadable yaml config implementations.
+ */
+public abstract class LoadableConfigWrapper extends ConfigWrapper<LoadableConfig> implements LoadableConfig {
+    /**
+     * Create a config wrapper.
+     *
+     * @param handle The handle.
+     */
+    protected LoadableConfigWrapper(@NotNull final LoadableConfig handle) {
+        super(handle);
+    }
+
+    @Override
+    public void createFile() {
+        this.getHandle().createFile();
+    }
+
+    @Override
+    public String getResourcePath() {
+        return this.getHandle().getResourcePath();
+    }
+
+    @Override
+    public void save() throws IOException {
+        this.getHandle().save();
+    }
+
+    @Override
+    public File getConfigFile() {
+        return this.getHandle().getConfigFile();
+    }
+
+    @Override
+    public String getName() {
+        return this.getHandle().getName();
+    }
+
+    @Override
+    public @Nullable YamlConfiguration getBukkitHandle() {
+        return this.getHandle().getBukkitHandle();
+    }
+}

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

@@ -3,6 +3,7 @@ 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;
 
@@ -10,7 +11,12 @@ 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
@@ -23,12 +29,14 @@ public abstract class YamlBaseConfig extends LoadableYamlConfigWrapper {
                              @NotNull final PluginLike plugin,
                              @NotNull final String... updateBlacklist) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableYamlConfig(
+                Eco.getHandler().getConfigFactory().createUpdatableConfig(
                         configName,
                         plugin,
                         "",
                         plugin.getClass(),
-                        removeUnused, updateBlacklist
+                        removeUnused,
+                        ConfigType.YAML,
+                        updateBlacklist
                 )
         );
     }
@@ -42,12 +50,13 @@ public abstract class YamlBaseConfig extends LoadableYamlConfigWrapper {
                              final boolean removeUnused,
                              @NotNull final PluginLike plugin) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableYamlConfig(
+                Eco.getHandler().getConfigFactory().createUpdatableConfig(
                         configName,
                         plugin,
                         "",
                         plugin.getClass(),
-                        removeUnused
+                        removeUnused,
+                        ConfigType.YAML
                 )
         );
     }

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

@@ -3,6 +3,7 @@ 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;
 
@@ -14,7 +15,12 @@ import org.jetbrains.annotations.NotNull;
  * </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
@@ -31,16 +37,18 @@ public abstract class YamlExtendableConfig extends LoadableYamlConfigWrapper {
                                    @NotNull final String subDirectoryPath,
                                    @NotNull final String... updateBlacklist) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableYamlConfig(
+                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.

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

@@ -3,12 +3,18 @@ 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).
@@ -20,7 +26,7 @@ public abstract class YamlStaticBaseConfig extends LoadableYamlConfigWrapper {
      */
     protected YamlStaticBaseConfig(@NotNull final String configName,
                                    @NotNull final PluginLike plugin) {
-        super(Eco.getHandler().getConfigFactory().createLoadableYamlConfig(configName, plugin, "", plugin.getClass()));
+        super(Eco.getHandler().getConfigFactory().createLoadableConfig(configName, plugin, "", plugin.getClass(), ConfigType.YAML));
     }
 
     /**

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

@@ -1,6 +1,7 @@
 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;
@@ -11,19 +12,31 @@ 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.
+     * @param config The YamlConfiguration handle.
      */
     public YamlTransientConfig(@NotNull final YamlConfiguration config) {
-        super(Eco.getHandler().getConfigFactory().createYamlConfig(config));
+        super(Eco.getHandler().getConfigFactory().createConfig(config));
     }
 
     /**
-     * @param contents     The contents of the config.
+     * @param contents The contents of the config.
      */
     public YamlTransientConfig(@NotNull final String contents) {
-        super(Eco.getHandler().getConfigFactory().createYamlConfig(YamlConfiguration.loadConfiguration(new StringReader(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

@@ -3,14 +3,21 @@ 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.
@@ -48,4 +55,9 @@ public abstract class LoadableYamlConfigWrapper extends YamlConfigWrapper implem
     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

@@ -8,7 +8,12 @@ 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.
@@ -19,7 +24,6 @@ public abstract class YamlConfigWrapper extends ConfigWrapper<Config> implements
         super(handle);
     }
 
-
     @Override
     public YamlConfiguration getBukkitHandle() {
         return ((WrappedYamlConfiguration) this.getHandle()).getBukkitHandle();

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

@@ -1,7 +1,9 @@
 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;
 
 /**
@@ -17,16 +19,60 @@ public interface PlayerProfileHandler {
     PlayerProfile load(@NotNull UUID uuid);
 
     /**
-     * Save a player profile.
+     * Unload a player profile from memory.
+     * <p>
+     * This will not save the profile first.
      *
      * @param uuid The uuid.
      */
-    void savePlayer(@NotNull UUID 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.
      */
-    void saveAll(boolean async);
+    @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/keys/PersistentDataKey.java

@@ -1,10 +1,11 @@
 package com.willfp.eco.core.data.keys;
 
 import com.willfp.eco.core.Eco;
-import lombok.Getter;
 import org.bukkit.NamespacedKey;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Set;
+
 /**
  * A persistent data key is a key with a type that can be stored about an offline player.
  *
@@ -14,20 +15,17 @@ public class PersistentDataKey<T> {
     /**
      * The key of the persistent data value.
      */
-    @Getter
     private final NamespacedKey key;
 
     /**
      * The default value for the key.
      */
-    @Getter
     private final T defaultValue;
 
     /**
      * The persistent data key type.
      */
-    @Getter
-    private final PersistentDataKeyType type;
+    private final PersistentDataKeyType<T> type;
 
     /**
      * Create a new Persistent Data Key.
@@ -37,7 +35,7 @@ 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;
@@ -54,4 +52,40 @@ public class PersistentDataKey<T> {
                 + ", type=" + type
                 + '}';
     }
+
+    /**
+     * Get the key.
+     *
+     * @return The key.
+     */
+    public NamespacedKey getKey() {
+        return this.key;
+    }
+
+    /**
+     * Get the default value.
+     *
+     * @return The default value.
+     */
+    public T getDefaultValue() {
+        return this.defaultValue;
+    }
+
+    /**
+     * Get the data key type.
+     *
+     * @return The key type.
+     */
+    public PersistentDataKeyType<T> getType() {
+        return this.type;
+    }
+
+    /**
+     * Get all persistent data keys.
+     *
+     * @return The keys.
+     */
+    public static Set<PersistentDataKey<?>> values() {
+        return Eco.getHandler().getKeyRegistry().getRegisteredKeys();
+    }
 }

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

@@ -1,26 +1,108 @@
 package com.willfp.eco.core.data.keys;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 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");
+
+    /**
+     * 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.
+     */
+    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(@NotNull final Class<T> typeClass,
+                                  @NotNull final String name) {
+        VALUES.add(this);
+
+        this.typeClass = typeClass;
+        this.name = 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,6 +1,5 @@
 package com.willfp.eco.core.display;
 
-import lombok.experimental.UtilityClass;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
@@ -10,8 +9,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * Utility class to manage client-side item display.
  */
-@UtilityClass
-public class Display {
+public final class Display {
     /**
      * The prefix for client-side lore lines.
      */
@@ -28,7 +26,7 @@ public class Display {
      * @param itemStack The item.
      * @return The ItemStack.
      */
-    public ItemStack display(@NotNull final ItemStack itemStack) {
+    public static ItemStack display(@NotNull final ItemStack itemStack) {
         return display(itemStack, null);
     }
 
@@ -39,8 +37,8 @@ public class Display {
      * @param player    The player.
      * @return The ItemStack.
      */
-    public ItemStack display(@NotNull final ItemStack itemStack,
-                             @Nullable final Player player) {
+    public static ItemStack display(@NotNull final ItemStack itemStack,
+                                    @Nullable final Player player) {
         return handler.display(itemStack, player);
     }
 
@@ -50,7 +48,7 @@ public class Display {
      * @param itemStack The item.
      * @return The ItemStack.
      */
-    public ItemStack displayAndFinalize(@NotNull final ItemStack itemStack) {
+    public static ItemStack displayAndFinalize(@NotNull final ItemStack itemStack) {
         return finalize(display(itemStack, null));
     }
 
@@ -61,8 +59,8 @@ public class Display {
      * @param player    The player.
      * @return The ItemStack.
      */
-    public ItemStack displayAndFinalize(@NotNull final ItemStack itemStack,
-                                        @Nullable final Player player) {
+    public static ItemStack displayAndFinalize(@NotNull final ItemStack itemStack,
+                                               @Nullable final Player player) {
         return finalize(display(itemStack, player));
     }
 
@@ -72,7 +70,7 @@ public class Display {
      * @param itemStack The item.
      * @return The ItemStack.
      */
-    public ItemStack revert(@NotNull final ItemStack itemStack) {
+    public static ItemStack revert(@NotNull final ItemStack itemStack) {
         return handler.revert(itemStack);
     }
 
@@ -82,7 +80,7 @@ public class Display {
      * @param itemStack The item.
      * @return The ItemStack.
      */
-    public ItemStack finalize(@NotNull final ItemStack itemStack) {
+    public static ItemStack finalize(@NotNull final ItemStack itemStack) {
         return handler.finalize(itemStack);
     }
 
@@ -92,7 +90,7 @@ public class Display {
      * @param itemStack The item.
      * @return The ItemStack.
      */
-    public ItemStack unfinalize(@NotNull final ItemStack itemStack) {
+    public static ItemStack unfinalize(@NotNull final ItemStack itemStack) {
         return handler.unfinalize(itemStack);
     }
 
@@ -102,7 +100,7 @@ public class Display {
      * @param itemStack The item.
      * @return If finalized.
      */
-    public boolean isFinalized(@NotNull final ItemStack itemStack) {
+    public static boolean isFinalized(@NotNull final ItemStack itemStack) {
         return handler.isFinalized(itemStack);
     }
 
@@ -111,7 +109,7 @@ public class Display {
      *
      * @param module The module.
      */
-    public void registerDisplayModule(@NotNull final DisplayModule module) {
+    public static void registerDisplayModule(@NotNull final DisplayModule module) {
         handler.registerDisplayModule(module);
     }
 
@@ -176,4 +174,8 @@ public class Display {
 
         Display.handler = handler;
     }
+
+    private Display() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

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

@@ -2,7 +2,6 @@ package com.willfp.eco.core.display;
 
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.PluginDependent;
-import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -15,7 +14,6 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
     /**
      * The priority of the module.
      */
-    @Getter
     private final DisplayPriority priority;
 
     /**
@@ -81,4 +79,13 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
     public final String getPluginName() {
         return super.getPlugin().getName();
     }
+
+    /**
+     * Get the display priority.
+     *
+     * @return The priority.
+     */
+    public DisplayPriority getPriority() {
+        return this.priority;
+    }
 }

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

@@ -0,0 +1,84 @@
+package com.willfp.eco.core.entities;
+
+import org.apache.commons.lang.Validate;
+import org.bukkit.Location;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * A custom entity has 3 components.
+ *
+ * <ul>
+ *     <li>The key to identify it</li>
+ *     <li>The test to check if any entity is this custom entity</li>
+ *     <li>The supplier to spawn the custom {@link org.bukkit.entity.Entity}</li>
+ * </ul>
+ */
+public class CustomEntity implements TestableEntity {
+    /**
+     * The key.
+     */
+    private final NamespacedKey key;
+
+    /**
+     * The test for Entities to pass.
+     */
+    private final Predicate<@NotNull Entity> test;
+
+    /**
+     * The provider to spawn the entity.
+     */
+    private final Function<Location, Entity> provider;
+
+    /**
+     * Create a new custom entity.
+     *
+     * @param key      The entity key.
+     * @param test     The test.
+     * @param provider The provider to spawn the entity.
+     */
+    public CustomEntity(@NotNull final NamespacedKey key,
+                        @NotNull final Predicate<@NotNull Entity> test,
+                        @NotNull final Function<Location, Entity> provider) {
+        this.key = key;
+        this.test = test;
+        this.provider = provider;
+    }
+
+    @Override
+    public boolean matches(@Nullable final Entity entity) {
+        if (entity == null) {
+            return false;
+        }
+
+        return test.test(entity);
+    }
+
+    @Override
+    public Entity spawn(@NotNull final Location location) {
+        Validate.notNull(location.getWorld());
+
+        return provider.apply(location);
+    }
+
+    /**
+     * Register the entity.
+     */
+    public void register() {
+        Entities.registerCustomEntity(this.getKey(), this);
+    }
+
+    /**
+     * Get the key.
+     *
+     * @return The key.
+     */
+    public NamespacedKey getKey() {
+        return this.key;
+    }
+}

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

@@ -0,0 +1,239 @@
+package com.willfp.eco.core.entities;
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult;
+import com.willfp.eco.core.entities.args.EntityArgParser;
+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;
+import org.bukkit.entity.EntityType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+/**
+ * Class to manage all custom and vanilla entities.
+ */
+public final class Entities {
+    /**
+     * All entities.
+     */
+    private static final Map<NamespacedKey, TestableEntity> REGISTRY = new ConcurrentHashMap<>();
+
+    /**
+     * All entity parsers.
+     */
+    private static final List<EntityArgParser> ARG_PARSERS = new ArrayList<>();
+
+    /**
+     * Register a new custom item.
+     *
+     * @param key  The key of the item.
+     * @param item The item.
+     */
+    public static void registerCustomEntity(@NotNull final NamespacedKey key,
+                                            @NotNull final TestableEntity item) {
+        REGISTRY.put(key, item);
+    }
+
+    /**
+     * Register a new arg parser.
+     *
+     * @param parser The parser.
+     */
+    public static void registerArgParser(@NotNull final EntityArgParser parser) {
+        ARG_PARSERS.add(parser);
+    }
+
+    /**
+     * Remove an entity.
+     *
+     * @param key The key of the entity.
+     */
+    public static void removeCustomEntity(@NotNull final NamespacedKey key) {
+        REGISTRY.remove(key);
+    }
+
+    /**
+     * This is the backbone of the entire eco entity system.
+     * <p>
+     * You can look up a TestableEntity for any type or custom entity,
+     * and it will return it with any modifiers passed as parameters.
+     * <p>
+     * If you want to get an Entity instance from this, then just call
+     * {@link TestableEntity#spawn(Location)}.
+     * <p>
+     * The advantages of the testable entity system are that there is the inbuilt
+     * {@link TestableEntity#matches(Entity)} - this allows to check if any entity
+     * is that testable entity; which may sound negligible, but actually it allows for
+     * much more power and flexibility. For example, you can have an entity with an
+     * extra metadata tag, extra lore lines, different display name - and it
+     * will still work as long as the test passes.
+     *
+     * @param key The lookup string.
+     * @return The testable entity, or an empty testable entity if not found.
+     */
+    @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);
+
+        if (args.length == 0) {
+            return new EmptyTestableEntity();
+        }
+
+        TestableEntity entity;
+
+        String[] split = args[0].toLowerCase().split(":");
+
+        if (split.length == 1) {
+            EntityType type;
+            try {
+                type = EntityType.valueOf(args[0].toUpperCase());
+            } catch (IllegalArgumentException e) {
+                return new EmptyTestableEntity();
+            }
+            entity = new SimpleTestableEntity(type);
+        } else {
+            String namespace = split[0];
+            String keyID = split[1];
+            NamespacedKey namespacedKey = NamespacedKeyUtils.create(namespace, keyID);
+
+            TestableEntity part = REGISTRY.get(namespacedKey);
+
+            if (part == null) {
+                return new EmptyTestableEntity();
+            }
+
+            entity = part;
+        }
+
+
+        String[] modifierArgs = Arrays.copyOfRange(args, 1, args.length);
+
+        List<EntityArgParseResult> parseResults = new ArrayList<>();
+
+        for (EntityArgParser argParser : ARG_PARSERS) {
+            EntityArgParseResult result = argParser.parseArguments(modifierArgs);
+            if (result != null) {
+                parseResults.add(result);
+            }
+        }
+
+        Function<Location, Entity> spawner = entity::spawn;
+
+        if (!parseResults.isEmpty()) {
+            entity = new ModifiedTestableEntity(
+                    entity,
+                    test -> {
+                        for (EntityArgParseResult parseResult : parseResults) {
+                            if (!parseResult.test().test(test)) {
+                                return false;
+                            }
+                        }
+
+                        return true;
+                    },
+                    location -> {
+                        Entity spawned = spawner.apply(location);
+
+                        for (EntityArgParseResult parseResult : parseResults) {
+                            parseResult.modifier().accept(spawned);
+                        }
+
+                        return spawned;
+                    }
+            );
+        }
+
+        return entity;
+    }
+
+
+    /**
+     * Get a Testable Entity from an ItemStack.
+     * <p>
+     * Will search for registered entity first. If there are no matches in the registry,
+     * then it will return a {@link com.willfp.eco.core.entities.impl.SimpleTestableEntity} matching the entity type.
+     * <p>
+     * If the entity is not custom and has unknown type, this will return null.
+     *
+     * @param entity The Entity.
+     * @return The found Testable Entity.
+     */
+    @Nullable
+    public static TestableEntity getEntity(@Nullable final Entity entity) {
+        if (entity == null) {
+            return null;
+        }
+
+        TestableEntity customEntity = getEntity(entity);
+
+        if (customEntity != null) {
+            return customEntity;
+        }
+
+        for (TestableEntity known : REGISTRY.values()) {
+            if (known.matches(entity)) {
+                return known;
+            }
+        }
+
+        if (entity.getType() == EntityType.UNKNOWN) {
+            return null;
+        }
+
+        return new SimpleTestableEntity(entity.getType());
+    }
+
+    /**
+     * Get if entity is a custom entity.
+     *
+     * @param entity The entity to check.
+     * @return If is custom.
+     */
+    public static boolean isCustomEntity(@NotNull final Entity entity) {
+        for (TestableEntity testable : REGISTRY.values()) {
+            if (testable.matches(entity)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get all registered custom items.
+     *
+     * @return A set of all items.
+     */
+    public static Set<TestableEntity> getCustomEntities() {
+        return new HashSet<>(REGISTRY.values());
+    }
+
+    private Entities() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.willfp.eco.core.entities;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * An item with a test to see if any item is that item.
+ */
+public interface TestableEntity {
+    /**
+     * If an Entity matches the test.
+     *
+     * @param entity The entity to test.
+     * @return If the entity matches.
+     */
+    boolean matches(@Nullable Entity entity);
+
+    /**
+     * Spawn the entity.
+     *
+     * @param location The location.
+     * @return The entity.
+     */
+    Entity spawn(@NotNull Location location);
+}

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

@@ -0,0 +1,33 @@
+package com.willfp.eco.core.entities.args;
+
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+/**
+ * @param test     The test for the entity.
+ * @param modifier The modifier to apply to the entity.
+ * @see EntityArgParser
+ */
+public record EntityArgParseResult(@NotNull Predicate<Entity> test,
+                                   @NotNull Consumer<Entity> modifier) {
+    /**
+     * Kotlin destructuring support.
+     *
+     * @return The test.
+     */
+    public Predicate<Entity> component1() {
+        return test;
+    }
+
+    /**
+     * Kotlin destructuring support.
+     *
+     * @return The modifier.
+     */
+    public Consumer<Entity> component2() {
+        return modifier;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.willfp.eco.core.entities.args;
+
+import com.willfp.eco.core.entities.TestableEntity;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * An argument parser should generate the predicate as well
+ * as modify the Entity for {@link TestableEntity#spawn(Location)}.
+ */
+public interface EntityArgParser {
+    /**
+     * Parse the arguments.
+     *
+     * @param args The arguments.
+     * @return The predicate test to apply to the modified entity.
+     */
+    @Nullable EntityArgParseResult parseArguments(@NotNull String[] args);
+}

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

@@ -0,0 +1,33 @@
+package com.willfp.eco.core.entities.impl;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.entities.TestableEntity;
+import org.apache.commons.lang.Validate;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Empty entity.
+ */
+public class EmptyTestableEntity implements TestableEntity {
+    /**
+     * Create a new empty testable entity.
+     */
+    public EmptyTestableEntity() {
+
+    }
+
+    @Override
+    public boolean matches(@Nullable final Entity entity) {
+        return false;
+    }
+
+    @Override
+    public Entity spawn(@NotNull final Location location) {
+        Validate.notNull(location.getWorld());
+
+        return Eco.getHandler().createDummyEntity(location);
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.willfp.eco.core.entities.impl;
+
+import com.willfp.eco.core.entities.TestableEntity;
+import org.apache.commons.lang.Validate;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * Existing testable entity with an extra filter.
+ *
+ * @see com.willfp.eco.core.entities.CustomEntity
+ */
+public class ModifiedTestableEntity implements TestableEntity {
+    /**
+     * The item.
+     */
+    private final TestableEntity handle;
+
+    /**
+     * The amount.
+     */
+    private final Predicate<Entity> test;
+
+    /**
+     * The provider to spawn the entity.
+     */
+    private final Function<Location, Entity> provider;
+
+    /**
+     * Create a new modified testable entity.
+     *
+     * @param entity   The base entity.
+     * @param test     The test.
+     * @param provider The provider to spawn the entity.
+     */
+    public ModifiedTestableEntity(@NotNull final TestableEntity entity,
+                                  @NotNull final Predicate<@NotNull Entity> test,
+                                  @NotNull final Function<Location, Entity> provider) {
+        this.handle = entity;
+        this.test = test;
+        this.provider = provider;
+    }
+
+    @Override
+    public boolean matches(@Nullable final Entity entity) {
+        return entity != null && handle.matches(entity) && test.test(entity);
+    }
+
+    @Override
+    public Entity spawn(@NotNull final Location location) {
+        Validate.notNull(location.getWorld());
+
+        return provider.apply(location);
+    }
+
+    /**
+     * Get the handle.
+     *
+     * @return The handle.
+     */
+    public TestableEntity getHandle() {
+        return this.handle;
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.willfp.eco.core.entities.impl;
+
+import com.willfp.eco.core.entities.TestableEntity;
+import org.apache.commons.lang.Validate;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Default vanilla entities.
+ */
+public class SimpleTestableEntity implements TestableEntity {
+    /**
+     * The entity type.
+     */
+    private final EntityType type;
+
+    /**
+     * Create a new simple testable entity.
+     *
+     * @param type The entity type.
+     */
+    public SimpleTestableEntity(@NotNull final EntityType type) {
+        this.type = type;
+
+        Validate.notNull(type.getEntityClass(), "Entity cannot be of unknown type!");
+    }
+
+    @Override
+    public boolean matches(@Nullable final Entity entity) {
+        return entity != null && entity.getType() == type;
+    }
+
+    @Override
+    public Entity spawn(@NotNull final Location location) {
+        Validate.notNull(location.getWorld());
+
+        assert type.getEntityClass() != null;
+
+        return location.getWorld().spawn(location, type.getEntityClass());
+    }
+
+    /**
+     * Get the type.
+     *
+     * @return The type.
+     */
+    public EntityType getType() {
+        return this.type;
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/events/ArmorChangeEvent.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.events;
 
-import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
@@ -23,13 +22,11 @@ public class ArmorChangeEvent extends PlayerEvent {
     /**
      * The armor contents before. 0 is helmet, 3 is boots.
      */
-    @Getter
     private final List<ItemStack> before;
 
     /**
      * The armor contents after. 0 is helmet, 3 is boots.
      */
-    @Getter
     private final List<ItemStack> after;
 
     /**
@@ -37,7 +34,7 @@ public class ArmorChangeEvent extends PlayerEvent {
      *
      * @param player The player.
      * @param before The armor contents before.
-     * @param after The armor contents after.
+     * @param after  The armor contents after.
      */
     public ArmorChangeEvent(@NotNull final Player player,
                             @NotNull final List<ItemStack> before,
@@ -52,7 +49,6 @@ public class ArmorChangeEvent extends PlayerEvent {
      *
      * @return A list of handlers handling this event.
      */
-
     @Override
     @NotNull
     public HandlerList getHandlers() {
@@ -67,4 +63,22 @@ public class ArmorChangeEvent extends PlayerEvent {
     public static HandlerList getHandlerList() {
         return HANDLERS;
     }
+
+    /**
+     * Get the contents before the change.
+     *
+     * @return The contents.
+     */
+    public List<ItemStack> getBefore() {
+        return this.before;
+    }
+
+    /**
+     * Get the current contents.
+     *
+     * @return The contents.
+     */
+    public List<ItemStack> getAfter() {
+        return this.after;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/events/DropQueuePushEvent.java

@@ -0,0 +1,143 @@
+package com.willfp.eco.core.events;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+/**
+ * Called on DropQueue push.
+ */
+public class DropQueuePushEvent extends PlayerEvent implements Cancellable {
+    /**
+     * Cancel state.
+     */
+    private boolean cancelled;
+
+    /**
+     * If telekinetic.
+     */
+    private final boolean isTelekinetic;
+
+    /**
+     * The items.
+     */
+    private final Collection<? extends ItemStack> items;
+
+    /**
+     * The xp.
+     */
+    private final int xp;
+
+    /**
+     * The location.
+     */
+    private final Location location;
+
+    /**
+     * Bukkit parity.
+     */
+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * Create a new DropQueuePushEvent.
+     *
+     * @param player        The player.
+     * @param items         The items.
+     * @param location      The location.
+     * @param xp            The xp.
+     * @param isTelekinetic If the event is telekinetic.
+     */
+    public DropQueuePushEvent(@NotNull final Player player,
+                              @NotNull final Collection<? extends ItemStack> items,
+                              @NotNull final Location location,
+                              final int xp,
+                              final boolean isTelekinetic) {
+        super(player);
+        this.items = items;
+        this.location = location;
+        this.xp = xp;
+        this.isTelekinetic = isTelekinetic;
+    }
+
+    /**
+     * Gets a list of handlers handling this event.
+     *
+     * @return A list of handlers handling this event.
+     */
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Bukkit parity.
+     *
+     * @return The handler list.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
+    /**
+     * Get cancel state.
+     *
+     * @return The cancel state.
+     */
+    @Override
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    /**
+     * Set cancel state.
+     *
+     * @param cancelled If cancelled.
+     */
+    @Override
+    public void setCancelled(final boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    /**
+     * Get the items to be dropped.
+     *
+     * @return The items.
+     */
+    public Collection<? extends ItemStack> getItems() {
+        return items;
+    }
+
+    /**
+     * Get the xp to be dropped.
+     *
+     * @return The xp.
+     */
+    public int getXp() {
+        return xp;
+    }
+
+    /**
+     * Get the location.
+     *
+     * @return The location.
+     */
+    public Location getLocation() {
+        return location;
+    }
+
+    /**
+     * Get force telekinesis state.
+     *
+     * @return The force telekinesis state.
+     */
+    public boolean isTelekinetic() {
+        return this.isTelekinetic;
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/events/EntityDeathByEntityEvent.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.events;
 
-import lombok.Getter;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
@@ -25,31 +24,26 @@ public class EntityDeathByEntityEvent extends Event {
     /**
      * The {@link LivingEntity} killed.
      */
-    @Getter
     private final LivingEntity victim;
 
     /**
      * The {@link Entity} that killed.
      */
-    @Getter
     private final Entity killer;
 
     /**
      * The associated {@link EntityDeathEvent}.
      */
-    @Getter
     private final EntityDeathEvent deathEvent;
 
     /**
      * The entity drops.
      */
-    @Getter
     private final List<ItemStack> drops;
 
     /**
      * The xp to drop.
      */
-    @Getter
     private final int xp;
 
     /**
@@ -91,4 +85,49 @@ public class EntityDeathByEntityEvent extends Event {
     public static HandlerList getHandlerList() {
         return HANDLERS;
     }
+
+    /**
+     * Get the entity killed.
+     *
+     * @return The victim.
+     */
+    public LivingEntity getVictim() {
+        return this.victim;
+    }
+
+    /**
+     * Get the killer.
+     *
+     * @return The killer.
+     */
+    public Entity getKiller() {
+        return this.killer;
+    }
+
+    /**
+     * Get the death event that caused this event.
+     *
+     * @return The death event.
+     */
+    public EntityDeathEvent getDeathEvent() {
+        return this.deathEvent;
+    }
+
+    /**
+     * Get the drops.
+     *
+     * @return The drops.
+     */
+    public List<ItemStack> getDrops() {
+        return this.drops;
+    }
+
+    /**
+     * Get the experience dropped.
+     *
+     * @return The experience.
+     */
+    public int getXp() {
+        return this.xp;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/events/EventManager.java

@@ -1,6 +1,7 @@
 package com.willfp.eco.core.events;
 
 import org.bukkit.event.Listener;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Manages listeners for a plugin.
@@ -11,14 +12,14 @@ public interface EventManager {
      *
      * @param listener The listener to register.
      */
-    void registerListener(Listener listener);
+    void registerListener(@NotNull Listener listener);
 
     /**
      * Unregister a listener with bukkit.
      *
      * @param listener The listener to unregister.
      */
-    void unregisterListener(Listener listener);
+    void unregisterListener(@NotNull Listener listener);
 
     /**
      * Unregister all listeners associated with the plugin.

eco-api/src/main/java/com/willfp/eco/core/events/NaturalExpGainEvent.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.events;
 
-import lombok.Getter;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerExpChangeEvent;
@@ -20,7 +19,6 @@ public class NaturalExpGainEvent extends Event {
      * The associated {@link PlayerExpChangeEvent}.
      * Use this to modify event parameters.
      */
-    @Getter
     private final PlayerExpChangeEvent expChangeEvent;
 
     /**
@@ -50,4 +48,13 @@ public class NaturalExpGainEvent extends Event {
     public static HandlerList getHandlerList() {
         return HANDLERS;
     }
+
+    /**
+     * Get the event that caused this event.
+     *
+     * @return The exp change event.
+     */
+    public PlayerExpChangeEvent getExpChangeEvent() {
+        return this.expChangeEvent;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/extensions/Extension.java

@@ -3,12 +3,11 @@ package com.willfp.eco.core.extensions;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.PluginLike;
 import com.willfp.eco.core.config.updating.ConfigHandler;
-import lombok.AccessLevel;
-import lombok.Getter;
 import org.apache.commons.lang.Validate;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
+import java.util.logging.Logger;
 
 /**
  * An extension is a separate jar file that hooks into the base plugin jar.
@@ -25,7 +24,6 @@ public abstract class Extension implements PluginLike {
     /**
      * The {@link EcoPlugin} that this extension is for.
      */
-    @Getter(AccessLevel.PROTECTED)
     private final EcoPlugin plugin;
 
     /**
@@ -57,6 +55,20 @@ public abstract class Extension implements PluginLike {
         this.onDisable();
     }
 
+    /**
+     * Method to handle after load.
+     */
+    public final void handleAfterLoad() {
+        this.onAfterLoad();
+    }
+
+    /**
+     * Method to handle plugin reloads.
+     */
+    public final void handleReload() {
+        this.onReload();
+    }
+
     /**
      * Called on enabling Extension.
      */
@@ -67,6 +79,20 @@ public abstract class Extension implements PluginLike {
      */
     protected abstract void onDisable();
 
+    /**
+     * Called the once the base plugin is done loading.
+     */
+    protected void onAfterLoad() {
+        // Override if needed
+    }
+
+    /**
+     * Called on plugin reload.
+     */
+    protected void onReload() {
+        // Override if needed
+    }
+
     /**
      * Set the metadata of the extension.
      * <p>
@@ -117,4 +143,18 @@ public abstract class Extension implements PluginLike {
     public ConfigHandler getConfigHandler() {
         return this.plugin.getConfigHandler();
     }
+
+    @Override
+    public Logger getLogger() {
+        return this.plugin.getLogger();
+    }
+
+    /**
+     * Get the plugin for the extension.
+     *
+     * @return The plugin.
+     */
+    protected EcoPlugin getPlugin() {
+        return this.plugin;
+    }
 }

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

@@ -70,14 +70,14 @@ public interface FastItemStack {
      *
      * @param hideFlags The flags.
      */
-    void addItemFlags(ItemFlag... hideFlags);
+    void addItemFlags(@NotNull ItemFlag... hideFlags);
 
     /**
      * Remove ItemFlags.
      *
      * @param hideFlags The flags.
      */
-    void removeItemFlags(ItemFlag... hideFlags);
+    void removeItemFlags(@NotNull ItemFlag... hideFlags);
 
     /**
      * Get the ItemFlags.
@@ -92,7 +92,7 @@ public interface FastItemStack {
      * @param flag The flag.
      * @return If the flag is present.
      */
-    boolean hasItemFlag(ItemFlag flag);
+    boolean hasItemFlag(@NotNull ItemFlag flag);
 
     /**
      * Get the Bukkit ItemStack again.

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

@@ -2,7 +2,6 @@ package com.willfp.eco.core.gui.slot;
 
 import com.willfp.eco.core.items.builder.ItemStackBuilder;
 import com.willfp.eco.util.ListUtils;
-import lombok.Getter;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -29,7 +28,6 @@ public class FillerMask {
     /**
      * Mask.
      */
-    @Getter
     private final List<List<Slot>> mask;
 
     /**
@@ -47,7 +45,7 @@ public class FillerMask {
      * Create a new filler mask.
      *
      * @param materials The mask materials.
-     * @param pattern  The pattern.
+     * @param pattern   The pattern.
      */
     public FillerMask(@NotNull final MaskMaterials materials,
                       @NotNull final String... pattern) {
@@ -82,4 +80,13 @@ public class FillerMask {
             }
         }
     }
+
+    /**
+     * Get the mask.
+     *
+     * @return The mask.
+     */
+    public List<List<Slot>> getMask() {
+        return this.mask;
+    }
 }

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

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.gui.slot;
 
-import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -14,7 +13,6 @@ public class FillerSlot implements Slot {
     /**
      * The ItemStack.
      */
-    @Getter
     private final ItemStack itemStack;
 
     /**
@@ -35,4 +33,13 @@ public class FillerSlot implements Slot {
     public boolean isCaptive() {
         return false;
     }
+
+    /**
+     * Get the ItemStack.
+     *
+     * @return The ItemStack.
+     */
+    public ItemStack getItemStack() {
+        return this.itemStack;
+    }
 }

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

@@ -1,8 +1,13 @@
 package com.willfp.eco.core.integrations;
 
-import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * An integration loader runs a runnable only if a specific plugin is present on the server.
  * <p>
@@ -10,21 +15,28 @@ import org.jetbrains.annotations.NotNull;
  */
 public class IntegrationLoader {
     /**
-     * The lambda to be ran if the plugin is present.
+     * All loaded plugins on the server.
+     */
+    private static final Set<String> LOADED_PLUGINS = Arrays.stream(Bukkit.getPluginManager().getPlugins())
+            .map(Plugin::getName)
+            .map(String::toLowerCase)
+            .collect(Collectors.toSet());
+
+    /**
+     * The lambda to be run if the plugin is present.
      */
     private final Runnable runnable;
 
     /**
      * The plugin to require to load the integration.
      */
-    @Getter
     private final String pluginName;
 
     /**
      * Create a new Integration Loader.
      *
      * @param pluginName The plugin to require.
-     * @param onLoad     The lambda to be ran if the plugin is present.
+     * @param onLoad     The lambda to be run if the plugin is present.
      */
     public IntegrationLoader(@NotNull final String pluginName,
                              @NotNull final Runnable onLoad) {
@@ -32,10 +44,28 @@ public class IntegrationLoader {
         this.pluginName = pluginName;
     }
 
+    /**
+     * Load the integration if the specified plugin is present on the server.
+     */
+    public void loadIfPresent() {
+        if (LOADED_PLUGINS.contains(this.pluginName.toLowerCase())) {
+            this.load();
+        }
+    }
+
     /**
      * Load the integration.
      */
     public void load() {
         runnable.run();
     }
+
+    /**
+     * Get the plugin name.
+     *
+     * @return The plugin name.
+     */
+    public String getPluginName() {
+        return this.pluginName;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.integrations.afk;
 
-import lombok.experimental.UtilityClass;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -10,20 +9,19 @@ import java.util.Set;
 /**
  * Class to handle afk integrations.
  */
-@UtilityClass
-public class AFKManager {
+public final class AFKManager {
     /**
      * A set of all registered integrations.
      */
-    private final Set<AFKWrapper> registered = new HashSet<>();
+    private static final Set<AFKWrapper> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public void register(@NotNull final AFKWrapper integration) {
-        registered.add(integration);
+    public static void register(@NotNull final AFKWrapper integration) {
+        REGISTERED.add(integration);
     }
 
     /**
@@ -32,8 +30,8 @@ public class AFKManager {
      * @param player The player.
      * @return If afk.
      */
-    public boolean isAfk(@NotNull final Player player) {
-        for (AFKWrapper afkWrapper : registered) {
+    public static boolean isAfk(@NotNull final Player player) {
+        for (AFKWrapper afkWrapper : REGISTERED) {
             if (afkWrapper.isAfk(player)) {
                 return true;
             }
@@ -41,4 +39,8 @@ public class AFKManager {
 
         return false;
     }
+
+    private AFKManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java

@@ -1,7 +1,6 @@
 package com.willfp.eco.core.integrations.anticheat;
 
 import com.willfp.eco.core.EcoPlugin;
-import lombok.experimental.UtilityClass;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
@@ -12,12 +11,11 @@ import java.util.Set;
 /**
  * Class to handle anticheat integrations.
  */
-@UtilityClass
-public class AnticheatManager {
+public final class AnticheatManager {
     /**
      * A set of all registered anticheats.
      */
-    private final Set<AnticheatWrapper> anticheats = new HashSet<>();
+    private static final Set<AnticheatWrapper> ANTICHEATS = new HashSet<>();
 
     /**
      * Register a new anticheat.
@@ -25,12 +23,12 @@ public class AnticheatManager {
      * @param plugin    The plugin.
      * @param anticheat The anticheat to register.
      */
-    public void register(@NotNull final EcoPlugin plugin,
-                         @NotNull final AnticheatWrapper anticheat) {
+    public static void register(@NotNull final EcoPlugin plugin,
+                                @NotNull final AnticheatWrapper anticheat) {
         if (anticheat instanceof Listener) {
             plugin.getEventManager().registerListener((Listener) anticheat);
         }
-        anticheats.add(anticheat);
+        ANTICHEATS.add(anticheat);
     }
 
     /**
@@ -38,8 +36,8 @@ public class AnticheatManager {
      *
      * @param player The player to exempt.
      */
-    public void exemptPlayer(@NotNull final Player player) {
-        anticheats.forEach(anticheat -> anticheat.exempt(player));
+    public static void exemptPlayer(@NotNull final Player player) {
+        ANTICHEATS.forEach(anticheat -> anticheat.exempt(player));
     }
 
     /**
@@ -48,7 +46,11 @@ public class AnticheatManager {
      *
      * @param player The player to remove the exemption.
      */
-    public void unexemptPlayer(@NotNull final Player player) {
-        anticheats.forEach(anticheat -> anticheat.unexempt(player));
+    public static void unexemptPlayer(@NotNull final Player player) {
+        ANTICHEATS.forEach(anticheat -> anticheat.unexempt(player));
+    }
+
+    private AnticheatManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }
 }

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

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.integrations.antigrief;
 
-import lombok.experimental.UtilityClass;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
@@ -13,20 +12,19 @@ import java.util.Set;
 /**
  * Class to handle antigrief integrations.
  */
-@UtilityClass
-public class AntigriefManager {
+public final class AntigriefManager {
     /**
      * Registered antigriefs.
      */
-    private final Set<AntigriefWrapper> registered = new HashSet<>();
+    private static final Set<AntigriefWrapper> REGISTERED = new HashSet<>();
 
     /**
      * Register a new AntiGrief/Land Management integration.
      *
      * @param antigrief The integration to register.
      */
-    public void register(@NotNull final AntigriefWrapper antigrief) {
-        registered.add(antigrief);
+    public static void register(@NotNull final AntigriefWrapper antigrief) {
+        REGISTERED.add(antigrief);
     }
 
     /**
@@ -34,9 +32,20 @@ public class AntigriefManager {
      *
      * @param antigrief The integration to unregister.
      */
-    public void unregister(@NotNull final AntigriefWrapper antigrief) {
-        registered.removeIf(it -> it.getPluginName().equalsIgnoreCase(antigrief.getPluginName()));
-        registered.remove(antigrief);
+    public static void unregister(@NotNull final AntigriefWrapper antigrief) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(antigrief.getPluginName()));
+        REGISTERED.remove(antigrief);
+    }
+
+    /**
+     * Can player pickup item.
+     *
+     * @param player   The player.
+     * @param location The location.
+     * @return If player can pick up item.
+     */
+    public static boolean canPickupItem(@NotNull final Player player, @NotNull final Location location) {
+        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canPickupItem(player, location));
     }
 
     /**
@@ -46,9 +55,9 @@ public class AntigriefManager {
      * @param block  The block.
      * @return If player can break block.
      */
-    public boolean canBreakBlock(@NotNull final Player player,
-                                 @NotNull final Block block) {
-        return registered.stream().allMatch(antigriefWrapper -> antigriefWrapper.canBreakBlock(player, block));
+    public static boolean canBreakBlock(@NotNull final Player player,
+                                        @NotNull final Block block) {
+        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canBreakBlock(player, block));
     }
 
     /**
@@ -58,9 +67,9 @@ public class AntigriefManager {
      * @param location The location.
      * @return If player can create explosion.
      */
-    public boolean canCreateExplosion(@NotNull final Player player,
-                                      @NotNull final Location location) {
-        return registered.stream().allMatch(antigriefWrapper -> antigriefWrapper.canCreateExplosion(player, location));
+    public static boolean canCreateExplosion(@NotNull final Player player,
+                                             @NotNull final Location location) {
+        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canCreateExplosion(player, location));
     }
 
     /**
@@ -70,9 +79,9 @@ public class AntigriefManager {
      * @param block  The block.
      * @return If player can place block.
      */
-    public boolean canPlaceBlock(@NotNull final Player player,
-                                 @NotNull final Block block) {
-        return registered.stream().allMatch(antigriefWrapper -> antigriefWrapper.canPlaceBlock(player, block));
+    public static boolean canPlaceBlock(@NotNull final Player player,
+                                        @NotNull final Block block) {
+        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canPlaceBlock(player, block));
     }
 
     /**
@@ -82,8 +91,12 @@ public class AntigriefManager {
      * @param victim The victim.
      * @return If player can injure.
      */
-    public boolean canInjure(@NotNull final Player player,
-                             @NotNull final LivingEntity victim) {
-        return registered.stream().allMatch(antigriefWrapper -> antigriefWrapper.canInjure(player, victim));
+    public static boolean canInjure(@NotNull final Player player,
+                                    @NotNull final LivingEntity victim) {
+        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canInjure(player, victim));
+    }
+
+    private AntigriefManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }
 }

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

@@ -5,6 +5,7 @@ import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Wrapper class for antigrief integrations.
@@ -15,9 +16,9 @@ public interface AntigriefWrapper extends Integration {
      *
      * @param player The player.
      * @param block  The block.
-     * @return If player cna break block.
+     * @return If player can break block.
      */
-    boolean canBreakBlock(Player player, Block block);
+    boolean canBreakBlock(@NotNull Player player, @NotNull Block block);
 
     /**
      * Can player create explosion at location.
@@ -26,7 +27,7 @@ public interface AntigriefWrapper extends Integration {
      * @param location The location.
      * @return If player can create explosion.
      */
-    boolean canCreateExplosion(Player player, Location location);
+    boolean canCreateExplosion(@NotNull Player player, @NotNull Location location);
 
     /**
      * Can player place block.
@@ -35,7 +36,7 @@ public interface AntigriefWrapper extends Integration {
      * @param block  The block.
      * @return If player can place block.
      */
-    boolean canPlaceBlock(Player player, Block block);
+    boolean canPlaceBlock(@NotNull Player player, @NotNull Block block);
 
     /**
      * Can player injure living entity.
@@ -44,5 +45,16 @@ public interface AntigriefWrapper extends Integration {
      * @param victim The victim.
      * @return If player can injure.
      */
-    boolean canInjure(Player player, LivingEntity victim);
+    boolean canInjure(@NotNull Player player, @NotNull LivingEntity victim);
+
+    /**
+     * Can player pick up item.
+     *
+     * @param player   The player.
+     * @param location The location.
+     * @return If player can pick up item.
+     */
+    default boolean canPickupItem(@NotNull Player player, @NotNull Location location) {
+        return true;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java

@@ -0,0 +1,40 @@
+package com.willfp.eco.core.integrations.customentities;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Class to handle custom entity integrations.
+ */
+public final class CustomEntitiesManager {
+    /**
+     * A set of all registered integrations.
+     */
+    private static final Set<CustomEntitiesWrapper> REGISTERED = new HashSet<>();
+
+    /**
+     * Register a new integration.
+     *
+     * @param integration The integration to register.
+     */
+    public static void register(@NotNull final CustomEntitiesWrapper integration) {
+        REGISTERED.add(integration);
+    }
+
+    /**
+     * Register all the custom entities for a specific plugin into eco.
+     *
+     * @see com.willfp.eco.core.entities.Entities
+     */
+    public static void registerAllEntities() {
+        for (CustomEntitiesWrapper wrapper : REGISTERED) {
+            wrapper.registerAllEntities();
+        }
+    }
+
+    private CustomEntitiesManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java

@@ -0,0 +1,15 @@
+package com.willfp.eco.core.integrations.customentities;
+
+import com.willfp.eco.core.integrations.Integration;
+
+/**
+ * Wrapper class for custom item integrations.
+ */
+public interface CustomEntitiesWrapper extends Integration {
+    /**
+     * Register all the custom entities for a specific plugin into eco.
+     *
+     * @see com.willfp.eco.core.entities.Entities
+     */
+    void registerAllEntities();
+}

eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.integrations.customitems;
 
-import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
@@ -9,20 +8,19 @@ import java.util.Set;
 /**
  * Class to handle custom item integrations.
  */
-@UtilityClass
-public class CustomItemsManager {
+public final class CustomItemsManager {
     /**
      * A set of all registered integrations.
      */
-    private final Set<CustomItemsWrapper> registered = new HashSet<>();
+    private static final Set<CustomItemsWrapper> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public void register(@NotNull final CustomItemsWrapper integration) {
-        registered.add(integration);
+    public static void register(@NotNull final CustomItemsWrapper integration) {
+        REGISTERED.add(integration);
     }
 
     /**
@@ -30,9 +28,13 @@ public class CustomItemsManager {
      *
      * @see com.willfp.eco.core.items.Items
      */
-    public void registerAllItems() {
-        for (CustomItemsWrapper customItemsWrapper : registered) {
+    public static void registerAllItems() {
+        for (CustomItemsWrapper customItemsWrapper : REGISTERED) {
             customItemsWrapper.registerAllItems();
         }
     }
+
+    private CustomItemsManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.integrations.economy;
 
-import lombok.experimental.UtilityClass;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
 
@@ -10,20 +9,19 @@ import java.util.Set;
 /**
  * Class to handle economy.
  */
-@UtilityClass
-public class EconomyManager {
+public final class EconomyManager {
     /**
      * A set of all registered integrations.
      */
-    private final Set<EconomyWrapper> registered = new HashSet<>();
+    private static final Set<EconomyWrapper> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public void register(@NotNull final EconomyWrapper integration) {
-        registered.add(integration);
+    public static void register(@NotNull final EconomyWrapper integration) {
+        REGISTERED.add(integration);
     }
 
     /**
@@ -31,8 +29,8 @@ public class EconomyManager {
      *
      * @return If any economy.
      */
-    public boolean hasRegistrations() {
-        return !registered.isEmpty();
+    public static boolean hasRegistrations() {
+        return !REGISTERED.isEmpty();
     }
 
     /**
@@ -42,9 +40,9 @@ public class EconomyManager {
      * @param amount The amount.
      * @return If the player has the amount.
      */
-    public boolean hasAmount(@NotNull final OfflinePlayer player,
-                             final double amount) {
-        for (EconomyWrapper wrapper : registered) {
+    public static boolean hasAmount(@NotNull final OfflinePlayer player,
+                                    final double amount) {
+        for (EconomyWrapper wrapper : REGISTERED) {
             return wrapper.hasAmount(player, amount);
         }
 
@@ -58,9 +56,9 @@ public class EconomyManager {
      * @param amount The amount to give.
      * @return If the transaction was a success.
      */
-    public boolean giveMoney(@NotNull final OfflinePlayer player,
-                             final double amount) {
-        for (EconomyWrapper wrapper : registered) {
+    public static boolean giveMoney(@NotNull final OfflinePlayer player,
+                                    final double amount) {
+        for (EconomyWrapper wrapper : REGISTERED) {
             return wrapper.giveMoney(player, amount);
         }
 
@@ -74,9 +72,9 @@ public class EconomyManager {
      * @param amount The amount to remove.
      * @return If the transaction was a success.
      */
-    public boolean removeMoney(@NotNull final OfflinePlayer player,
-                               final double amount) {
-        for (EconomyWrapper wrapper : registered) {
+    public static boolean removeMoney(@NotNull final OfflinePlayer player,
+                                      final double amount) {
+        for (EconomyWrapper wrapper : REGISTERED) {
             return wrapper.removeMoney(player, amount);
         }
 
@@ -89,11 +87,15 @@ public class EconomyManager {
      * @param player The player.
      * @return The balance.
      */
-    public double getBalance(@NotNull final OfflinePlayer player) {
-        for (EconomyWrapper wrapper : registered) {
+    public static double getBalance(@NotNull final OfflinePlayer player) {
+        for (EconomyWrapper wrapper : REGISTERED) {
             return wrapper.getBalance(player);
         }
 
         return 0;
     }
+
+    private EconomyManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.integrations.hologram;
 
-import lombok.experimental.UtilityClass;
 import org.bukkit.Location;
 import org.jetbrains.annotations.NotNull;
 
@@ -11,20 +10,19 @@ import java.util.Set;
 /**
  * Class to handle hologram integrations.
  */
-@UtilityClass
-public class HologramManager {
+public final class HologramManager {
     /**
      * A set of all registered integrations.
      */
-    private final Set<HologramWrapper> registered = new HashSet<>();
+    private static final Set<HologramWrapper> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public void register(@NotNull final HologramWrapper integration) {
-        registered.add(integration);
+    public static void register(@NotNull final HologramWrapper integration) {
+        REGISTERED.add(integration);
     }
 
     /**
@@ -34,12 +32,16 @@ public class HologramManager {
      * @param contents The contents for the hologram.
      * @return The hologram.
      */
-    public Hologram createHologram(@NotNull final Location location,
-                                   @NotNull final List<String> contents) {
-        for (HologramWrapper wrapper : registered) {
+    public static Hologram createHologram(@NotNull final Location location,
+                                          @NotNull final List<String> contents) {
+        for (HologramWrapper wrapper : REGISTERED) {
             return wrapper.createHologram(location, contents);
         }
 
         return new DummyHologram();
     }
+
+    private HologramManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.integrations.mcmmo;
 
-import lombok.experimental.UtilityClass;
 import org.bukkit.block.Block;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
@@ -11,20 +10,19 @@ import java.util.Set;
 /**
  * Class to handle mcmmo integrations.
  */
-@UtilityClass
-public class McmmoManager {
+public final class McmmoManager {
     /**
      * A set of all registered integrations.
      */
-    private final Set<McmmoWrapper> registered = new HashSet<>();
+    private static final Set<McmmoWrapper> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public void register(@NotNull final McmmoWrapper integration) {
-        registered.add(integration);
+    public static void register(@NotNull final McmmoWrapper integration) {
+        REGISTERED.add(integration);
     }
 
     /**
@@ -33,8 +31,8 @@ public class McmmoManager {
      * @param block The block.
      * @return The bonus drop count.
      */
-    public int getBonusDropCount(@NotNull final Block block) {
-        for (McmmoWrapper mcmmoWrapper : registered) {
+    public static int getBonusDropCount(@NotNull final Block block) {
+        for (McmmoWrapper mcmmoWrapper : REGISTERED) {
             return mcmmoWrapper.getBonusDropCount(block);
         }
         return 0;
@@ -46,10 +44,14 @@ public class McmmoManager {
      * @param event The event to check.
      * @return If the event is fake.
      */
-    public boolean isFake(@NotNull final Event event) {
-        for (McmmoWrapper mcmmoWrapper : registered) {
+    public static boolean isFake(@NotNull final Event event) {
+        for (McmmoWrapper mcmmoWrapper : REGISTERED) {
             return mcmmoWrapper.isFake(event);
         }
         return false;
     }
+
+    private McmmoManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

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

@@ -1,6 +1,6 @@
 package com.willfp.eco.core.integrations.placeholder;
 
-import lombok.Getter;
+import com.willfp.eco.core.EcoPlugin;
 import org.apache.commons.lang.Validate;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -17,7 +17,6 @@ public class PlaceholderEntry {
     /**
      * The name of the placeholder, used in lookups.
      */
-    @Getter
     private final String identifier;
 
     /**
@@ -30,12 +29,20 @@ public class PlaceholderEntry {
      */
     private final boolean requiresPlayer;
 
+    /**
+     * The plugin for the placeholder.
+     */
+    @Nullable
+    private final EcoPlugin plugin;
+
     /**
      * Create a placeholder entry that doesn't require a player.
      *
      * @param identifier The identifier of the placeholder.
      * @param function   A lambda to get the result of the placeholder given a player.
+     * @deprecated Specify a plugin.
      */
+    @Deprecated
     public PlaceholderEntry(@NotNull final String identifier,
                             @NotNull final Function<Player, String> function) {
         this(identifier, function, false);
@@ -47,10 +54,41 @@ public class PlaceholderEntry {
      * @param identifier     The identifier of the placeholder.
      * @param function       A lambda to get the result of the placeholder.
      * @param requiresPlayer If the placeholder requires a player.
+     * @deprecated Specify a plugin.
      */
+    @Deprecated
     public PlaceholderEntry(@NotNull final String identifier,
                             @NotNull final Function<Player, String> function,
                             final boolean requiresPlayer) {
+        this(null, identifier, function, requiresPlayer);
+    }
+
+    /**
+     * Create a placeholder entry that doesn't require a player.
+     *
+     * @param plugin     The plugin for the placeholder.
+     * @param identifier The identifier of the placeholder.
+     * @param function   A lambda to get the result of the placeholder given a player.
+     */
+    public PlaceholderEntry(@Nullable final EcoPlugin plugin,
+                            @NotNull final String identifier,
+                            @NotNull final Function<Player, String> function) {
+        this(plugin, identifier, function, false);
+    }
+
+    /**
+     * Create a placeholder entry that may require a player.
+     *
+     * @param plugin         The plugin for the placeholder.
+     * @param identifier     The identifier of the placeholder.
+     * @param function       A lambda to get the result of the placeholder.
+     * @param requiresPlayer If the placeholder requires a player.
+     */
+    public PlaceholderEntry(@Nullable final EcoPlugin plugin,
+                            @NotNull final String identifier,
+                            @NotNull final Function<Player, String> function,
+                            final boolean requiresPlayer) {
+        this.plugin = plugin;
         this.identifier = identifier;
         this.function = function;
         this.requiresPlayer = requiresPlayer;
@@ -78,6 +116,25 @@ public class PlaceholderEntry {
         return requiresPlayer;
     }
 
+    /**
+     * Get the identifier.
+     *
+     * @return The identifier.
+     */
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    /**
+     * Get the plugin.
+     *
+     * @return The plugin.
+     */
+    @Nullable
+    public EcoPlugin getPlugin() {
+        return plugin;
+    }
+
     /**
      * Register the placeholder.
      */

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

@@ -5,6 +5,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Wrapper class for placeholder integrations.
  */
@@ -24,4 +27,14 @@ public interface PlaceholderIntegration extends Integration {
      */
     String translate(@NotNull String text,
                      @Nullable Player player);
+
+    /**
+     * Find all placeholders in a given text.
+     *
+     * @param text The text.
+     * @return The placeholders.
+     */
+    default List<String> findPlaceholdersIn(@NotNull String text) {
+        return new ArrayList<>();
+    }
 }

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

@@ -1,24 +1,26 @@
 package com.willfp.eco.core.integrations.placeholder;
 
-import lombok.experimental.UtilityClass;
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 /**
  * Class to handle placeholder integrations.
  */
-@UtilityClass
-public class PlaceholderManager {
+public final class PlaceholderManager {
     /**
      * All registered placeholders.
      */
-    private static final Map<String, PlaceholderEntry> REGISTERED_PLACEHOLDERS = new HashMap<>();
+    private static final Map<EcoPlugin, Map<String, PlaceholderEntry>> REGISTERED_PLACEHOLDERS = new HashMap<>();
 
     /**
      * All registered placeholder integrations.
@@ -41,8 +43,11 @@ public class PlaceholderManager {
      * @param expansion The {@link PlaceholderEntry} to register.
      */
     public static void registerPlaceholder(@NotNull final PlaceholderEntry expansion) {
-        REGISTERED_PLACEHOLDERS.remove(expansion.getIdentifier());
-        REGISTERED_PLACEHOLDERS.put(expansion.getIdentifier(), expansion);
+        EcoPlugin plugin = expansion.getPlugin() == null ? Eco.getHandler().getEcoPlugin() : expansion.getPlugin();
+        Map<String, PlaceholderEntry> pluginPlaceholders = REGISTERED_PLACEHOLDERS
+                .getOrDefault(plugin, new HashMap<>());
+        pluginPlaceholders.put(expansion.getIdentifier(), expansion);
+        REGISTERED_PLACEHOLDERS.put(plugin, pluginPlaceholders);
     }
 
     /**
@@ -51,10 +56,36 @@ public class PlaceholderManager {
      * @param player     The player to get the result from.
      * @param identifier The placeholder identifier.
      * @return The value of the placeholder.
+     * @deprecated Specify a plugin to get the result from.
      */
+    @Deprecated
     public static String getResult(@Nullable final Player player,
                                    @NotNull final String identifier) {
-        PlaceholderEntry entry = REGISTERED_PLACEHOLDERS.get(identifier.toLowerCase());
+        return getResult(player, identifier, null);
+    }
+
+    /**
+     * Get the result of a placeholder with respect to a player.
+     *
+     * @param player     The player to get the result from.
+     * @param identifier The placeholder identifier.
+     * @param plugin     The plugin for the placeholder.
+     * @return The value of the placeholder.
+     */
+    public static String getResult(@Nullable final Player player,
+                                   @NotNull final String identifier,
+                                   @Nullable final EcoPlugin plugin) {
+        EcoPlugin owner = plugin == null ? Eco.getHandler().getEcoPlugin() : plugin;
+        PlaceholderEntry entry = REGISTERED_PLACEHOLDERS.getOrDefault(owner, new HashMap<>()).get(identifier.toLowerCase());
+
+        if (entry == null && plugin != null) {
+            PlaceholderEntry alternate = REGISTERED_PLACEHOLDERS.getOrDefault(Eco.getHandler().getEcoPlugin(), new HashMap<>())
+                    .get(identifier.toLowerCase());
+            if (alternate != null) {
+                entry = alternate;
+            }
+        }
+
         if (entry == null) {
             return "";
         }
@@ -81,4 +112,23 @@ public class PlaceholderManager {
         }
         return processed;
     }
+
+    /**
+     * Find all placeholders in a given text.
+     *
+     * @param text The text.
+     * @return The placeholders.
+     */
+    public static List<String> findPlaceholdersIn(@NotNull final String text) {
+        List<String> found = new ArrayList<>();
+        for (PlaceholderIntegration integration : REGISTERED_INTEGRATIONS) {
+            found.addAll(integration.findPlaceholdersIn(text));
+        }
+
+        return found;
+    }
+
+    private PlaceholderManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.core.integrations.shop;
 
-import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
@@ -9,28 +8,31 @@ import java.util.Set;
 /**
  * Class to handle shop integrations.
  */
-@UtilityClass
-public class ShopManager {
+public final class ShopManager {
     /**
      * A set of all registered integrations.
      */
-    private final Set<ShopWrapper> registered = new HashSet<>();
+    private static final Set<ShopWrapper> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public void register(@NotNull final ShopWrapper integration) {
-        registered.add(integration);
+    public static void register(@NotNull final ShopWrapper integration) {
+        REGISTERED.add(integration);
     }
 
     /**
      * Register eco item provider for shop plugins.
      */
-    public void registerEcoProvider() {
-        for (ShopWrapper shopWrapper : registered) {
+    public static void registerEcoProvider() {
+        for (ShopWrapper shopWrapper : REGISTERED) {
             shopWrapper.registerEcoProvider();
         }
     }
+
+    private ShopManager() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.willfp.eco.core.items;
 
 import com.willfp.eco.core.Eco;
-import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
@@ -23,7 +22,6 @@ public class CustomItem implements TestableItem {
     /**
      * The key.
      */
-    @Getter
     private final NamespacedKey key;
 
     /**
@@ -68,7 +66,7 @@ public class CustomItem implements TestableItem {
 
     @Override
     public ItemStack getItem() {
-        return item;
+        return item.clone();
     }
 
     /**
@@ -77,4 +75,13 @@ public class CustomItem implements TestableItem {
     public void register() {
         Items.registerCustomItem(this.getKey(), this);
     }
+
+    /**
+     * Get the key.
+     *
+     * @return The key.
+     */
+    public NamespacedKey getKey() {
+        return this.key;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.items;
 
+import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.core.items.args.LookupArgParser;
 import com.willfp.eco.core.items.provider.ItemProvider;
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
@@ -8,11 +9,12 @@ import com.willfp.eco.core.recipe.parts.ModifiedTestableItem;
 import com.willfp.eco.core.recipe.parts.TestableStack;
 import com.willfp.eco.util.NamespacedKeyUtils;
 import com.willfp.eco.util.NumberUtils;
-import lombok.experimental.UtilityClass;
+import com.willfp.eco.util.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -28,13 +30,17 @@ import java.util.stream.Collectors;
 /**
  * Class to manage all custom and vanilla items.
  */
-@UtilityClass
 public final class Items {
     /**
      * All recipe parts.
      */
     private static final Map<NamespacedKey, TestableItem> REGISTRY = new ConcurrentHashMap<>();
 
+    /**
+     * Cached custom item lookups, using {@link FastItemStack#hashCode()}.
+     */
+    private static final Map<Integer, TestableItem> CACHE = new ConcurrentHashMap<>();
+
     /**
      * All item providers.
      */
@@ -51,8 +57,8 @@ public final class Items {
      * @param key  The key of the item.
      * @param item The item.
      */
-    public void registerCustomItem(@NotNull final NamespacedKey key,
-                                   @NotNull final TestableItem item) {
+    public static void registerCustomItem(@NotNull final NamespacedKey key,
+                                          @NotNull final TestableItem item) {
         REGISTRY.put(key, item);
     }
 
@@ -61,7 +67,7 @@ public final class Items {
      *
      * @param provider The provider.
      */
-    public void registerItemProvider(@NotNull final ItemProvider provider) {
+    public static void registerItemProvider(@NotNull final ItemProvider provider) {
         PROVIDERS.put(provider.getNamespace(), provider);
     }
 
@@ -70,7 +76,7 @@ public final class Items {
      *
      * @param parser The parser.
      */
-    public void registerArgParser(@NotNull final LookupArgParser parser) {
+    public static void registerArgParser(@NotNull final LookupArgParser parser) {
         ARG_PARSERS.add(parser);
     }
 
@@ -79,14 +85,14 @@ public final class Items {
      *
      * @param key The key of the recipe part.
      */
-    public void removeCustomItem(@NotNull final NamespacedKey key) {
+    public static void removeCustomItem(@NotNull final NamespacedKey key) {
         REGISTRY.remove(key);
     }
 
     /**
      * This is the backbone of the entire eco item system.
      * <p>
-     * You can lookup a TestableItem for any material, custom item,
+     * You can look up a TestableItem for any material, custom item,
      * or item in general, and it will return it with any modifiers
      * passed as parameters. This includes stack size (item amount)
      * and enchantments that should be present on the item.
@@ -96,8 +102,8 @@ public final class Items {
      * <p>
      * The advantages of the testable item system are that there is the inbuilt
      * {@link TestableItem#matches(ItemStack)} - this allows to check if any item
-     * is that testable item; which may sound negligible but actually it allows for
-     * much more power an flexibility. For example, you can have an item with an
+     * is that testable item; which may sound negligible, but actually it allows for
+     * much more power and flexibility. For example, you can have an item with an
      * extra metadata tag, extra lore lines, different display name - and it
      * will still work as long as the test passes. This is very important
      * for custom crafting recipes where other plugins may add metadata
@@ -106,7 +112,8 @@ public final class Items {
      * @param key The lookup string.
      * @return The testable item, or an {@link EmptyTestableItem}.
      */
-    public TestableItem lookup(@NotNull final String key) {
+    @NotNull
+    public static TestableItem lookup(@NotNull final String key) {
         if (key.contains("?")) {
             String[] options = key.split("\\?");
             for (String option : options) {
@@ -119,7 +126,8 @@ public final class Items {
             return new EmptyTestableItem();
         }
 
-        String[] args = key.split(" ");
+        String[] args = StringUtils.parseTokens(key);
+
         if (args.length == 0) {
             return new EmptyTestableItem();
         }
@@ -237,19 +245,45 @@ public final class Items {
         }
     }
 
+    /**
+     * Get a Testable Item from an ItemStack.
+     * <p>
+     * Will search for registered items first. If there are no matches in the registry,
+     * then it will return a {@link MaterialTestableItem} matching the item type.
+     * <p>
+     * Does not account for modifiers (arg parser data).
+     *
+     * @param item The ItemStack.
+     * @return The found Testable Item.
+     */
+    @NotNull
+    public static TestableItem getItem(@Nullable final ItemStack item) {
+        if (item == null || item.getType().isAir()) {
+            return new EmptyTestableItem();
+        }
+
+        CustomItem customItem = getCustomItem(item);
+
+        if (customItem != null) {
+            return customItem;
+        }
+
+        for (TestableItem known : REGISTRY.values()) {
+            if (known.matches(item)) {
+                return known;
+            }
+        }
+        return new MaterialTestableItem(item.getType());
+    }
+
     /**
      * Get if itemStack is a custom item.
      *
      * @param itemStack The itemStack to check.
      * @return If is recipe.
      */
-    public boolean isCustomItem(@NotNull final ItemStack itemStack) {
-        for (TestableItem item : REGISTRY.values()) {
-            if (item.matches(itemStack)) {
-                return true;
-            }
-        }
-        return false;
+    public static boolean isCustomItem(@NotNull final ItemStack itemStack) {
+        return getCustomItem(itemStack) != null;
     }
 
     /**
@@ -259,13 +293,31 @@ public final class Items {
      * @return The custom item, or null if not exists.
      */
     @Nullable
-    public CustomItem getCustomItem(@NotNull final ItemStack itemStack) {
+    public static CustomItem getCustomItem(@NotNull final ItemStack itemStack) {
+        int hash = FastItemStack.wrap(itemStack).hashCode();
+        TestableItem cached = CACHE.get(hash);
+        if (cached != null) {
+            return getOrWrap(cached);
+        } else {
+            CACHE.remove(hash);
+        }
+
+        TestableItem match = null;
+
         for (TestableItem item : REGISTRY.values()) {
             if (item.matches(itemStack)) {
-                return getOrWrap(item);
+                match = item;
+                break;
             }
         }
-        return null;
+
+        if (match == null) {
+            return null;
+        }
+
+        CACHE.put(hash, match);
+
+        return getOrWrap(match);
     }
 
     /**
@@ -273,7 +325,7 @@ public final class Items {
      *
      * @return A set of all items.
      */
-    public Set<CustomItem> getCustomItems() {
+    public static Set<CustomItem> getCustomItems() {
         return REGISTRY.values().stream().map(Items::getOrWrap).collect(Collectors.toSet());
     }
 
@@ -286,7 +338,8 @@ public final class Items {
      * @param item The item.
      * @return The CustomItem.
      */
-    public CustomItem getOrWrap(@NotNull final TestableItem item) {
+    @NotNull
+    public static CustomItem getOrWrap(@NotNull final TestableItem item) {
         if (item instanceof CustomItem) {
             return (CustomItem) item;
         } else {
@@ -297,4 +350,16 @@ public final class Items {
             );
         }
     }
+
+    /**
+     * Clear the lookup cache.
+     */
+    @ApiStatus.Internal
+    public static void clearCache() {
+        CACHE.clear();
+    }
+
+    private Items() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

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

@@ -1,83 +0,0 @@
-package com.willfp.eco.core.items.args;
-
-import org.bukkit.NamespacedKey;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.EnchantmentStorageMeta;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Predicate;
-
-/**
- * Parses enchantment arguments.
- */
-public class EnchantmentArgParser implements LookupArgParser {
-    @Override
-    public @Nullable Predicate<ItemStack> parseArguments(@NotNull final String[] args,
-                                                         @NotNull final ItemMeta meta) {
-        Map<Enchantment, Integer> requiredEnchantments = new HashMap<>();
-
-        for (String enchantArg : args) {
-            String[] enchantArgSplit = enchantArg.split(":");
-
-            Enchantment enchantment = Enchantment.getByKey(NamespacedKey.minecraft(enchantArgSplit[0].toLowerCase()));
-            if (enchantment == null) {
-                continue;
-            }
-
-            if (enchantArgSplit.length < 2) {
-                continue;
-            }
-
-            int level = Integer.parseInt(enchantArgSplit[1]);
-
-            requiredEnchantments.put(enchantment, level);
-        }
-
-        if (requiredEnchantments.isEmpty()) {
-            return null;
-        }
-
-        if (meta instanceof EnchantmentStorageMeta storageMeta) {
-            requiredEnchantments.forEach((enchantment, integer) -> storageMeta.addStoredEnchant(enchantment, integer, true));
-        } else {
-            requiredEnchantments.forEach((enchantment, integer) -> meta.addEnchant(enchantment, integer, true));
-        }
-
-        return test -> {
-            if (!test.hasItemMeta()) {
-                return false;
-            }
-
-            ItemMeta testMeta = test.getItemMeta();
-
-            assert testMeta != null;
-
-            if (testMeta instanceof EnchantmentStorageMeta storageMeta) {
-                for (Map.Entry<Enchantment, Integer> entry : requiredEnchantments.entrySet()) {
-                    if (!storageMeta.hasStoredEnchant(entry.getKey())) {
-                        return false;
-                    }
-                    if (storageMeta.getStoredEnchantLevel(entry.getKey()) < entry.getValue()) {
-                        return false;
-                    }
-                }
-            } else {
-                for (Map.Entry<Enchantment, Integer> entry : requiredEnchantments.entrySet()) {
-                    if (!testMeta.hasEnchant(entry.getKey())) {
-                        return false;
-                    }
-                    if (testMeta.getEnchantLevel(entry.getKey()) < entry.getValue()) {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        };
-    }
-}

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

@@ -1,59 +0,0 @@
-package com.willfp.eco.core.items.args;
-
-import com.willfp.eco.util.SkullUtils;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.SkullMeta;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.function.Predicate;
-
-/**
- * Parse skull textures.
- */
-public class TextureArgParser implements LookupArgParser {
-    @Override
-    public @Nullable Predicate<ItemStack> parseArguments(@NotNull final String[] args,
-                                                         @NotNull final ItemMeta meta) {
-        String skullTexture = null;
-
-        for (String arg : args) {
-            String[] argSplit = arg.split(":");
-            if (!argSplit[0].equalsIgnoreCase("texture")) {
-                continue;
-            }
-
-            if (argSplit.length < 2) {
-                continue;
-            }
-
-            skullTexture = argSplit[1];
-        }
-
-        if (meta instanceof SkullMeta skullMeta && skullTexture != null) {
-            SkullUtils.setSkullTexture(skullMeta, skullTexture);
-        }
-
-        if (skullTexture == null) {
-            return null;
-        }
-
-        String finalSkullTexture = skullTexture;
-        return test -> {
-            if (!test.hasItemMeta()) {
-                return false;
-            }
-
-            ItemMeta testMeta = test.getItemMeta();
-
-            assert testMeta != null;
-
-            if (testMeta instanceof SkullMeta skullMeta) {
-                return finalSkullTexture.equalsIgnoreCase(SkullUtils.getSkullTexture(skullMeta));
-            }
-
-            return true;
-        };
-    }
-}

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

@@ -1,8 +1,7 @@
 package com.willfp.eco.core.items.builder;
 
+import com.willfp.eco.core.items.TestableItem;
 import com.willfp.eco.util.StringUtils;
-import lombok.AccessLevel;
-import lombok.Getter;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
@@ -29,13 +28,11 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
     /**
      * The ItemMeta used while building.
      */
-    @Getter(AccessLevel.PROTECTED)
     private final T meta;
 
     /**
      * The ItemStack.
      */
-    @Getter(AccessLevel.PROTECTED)
     private final ItemStack base;
 
     /**
@@ -47,6 +44,15 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
         this(new ItemStack(material));
     }
 
+    /**
+     * Create a new ItemStackBuilder to modify an existing item.
+     *
+     * @param item The item to start with.
+     */
+    protected AbstractItemStackBuilder(@NotNull final TestableItem item) {
+        this(item.getItem());
+    }
+
     /**
      * Create a new ItemStackBuilder to modify an existing item.
      *
@@ -73,6 +79,11 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
     @Override
     public U addEnchantment(@NotNull final Enchantment enchantment,
                             final int level) {
+        //noinspection ConstantConditions
+        if (enchantment == null) {
+            return (U) this;
+        }
+
         meta.addEnchant(enchantment, level, true);
         return (U) this;
     }
@@ -196,4 +207,22 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
 
         return base;
     }
+
+    /**
+     * Get the base ItemStack.
+     *
+     * @return The base ItemStack.
+     */
+    protected ItemStack getBase() {
+        return base;
+    }
+
+    /**
+     * Get the meta.
+     *
+     * @return The meta.
+     */
+    protected T getMeta() {
+        return meta;
+    }
 }

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

@@ -39,7 +39,7 @@ public class EnchantedBookBuilder extends AbstractItemStackBuilder<EnchantmentSt
      * @return The builder.
      */
     public EnchantedBookBuilder addStoredEnchantment(@NotNull final Supplier<Enchantment> enchantment,
-                                                     final Supplier<Integer> level) {
+                                                     @NotNull final Supplier<Integer> level) {
         return this.addStoredEnchantment(enchantment.get(), level.get());
     }
 }

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.items.builder;
 
+import com.willfp.eco.core.items.TestableItem;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -26,4 +27,13 @@ public class ItemStackBuilder extends AbstractItemStackBuilder<ItemMeta, ItemSta
     public ItemStackBuilder(@NotNull final ItemStack base) {
         super(base);
     }
+
+    /**
+     * Create a new ItemStackBuilder to modify an existing item.
+     *
+     * @param item The item to start with.
+     */
+    public ItemStackBuilder(@NotNull final TestableItem item) {
+        super(item);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.items.builder;
 
+import com.willfp.eco.core.items.TestableItem;
 import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -30,6 +31,15 @@ public class LeatherArmorBuilder extends AbstractItemStackBuilder<LeatherArmorMe
         super(base);
     }
 
+    /**
+     * Create a new ItemStackBuilder to modify an existing item.
+     *
+     * @param item The item to start with.
+     */
+    public LeatherArmorBuilder(@NotNull final TestableItem item) {
+        super(item);
+    }
+
     /**
      * Set leather color.
      *

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

@@ -1,7 +1,6 @@
 package com.willfp.eco.core.items.provider;
 
 import com.willfp.eco.core.items.TestableItem;
-import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,7 +16,6 @@ public abstract class ItemProvider {
     /**
      * The namespace.
      */
-    @Getter
     private final String namespace;
 
     /**
@@ -37,4 +35,13 @@ public abstract class ItemProvider {
      */
     @Nullable
     public abstract TestableItem provideForKey(@NotNull String key);
+
+    /**
+     * Get the namespace.
+     *
+     * @return The namespace.
+     */
+    public String getNamespace() {
+        return this.namespace;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java

@@ -1,14 +1,12 @@
 package com.willfp.eco.core.proxy;
 
 /**
- * All proxies must implement this interface.
- * <p>
- * A proxy is an NMS implementation of a proxy interface.
- * <p>
- * This allows for cross-version support.
- * <p>
- * See the core-spigot and core-nms modules of eco to see an example.
+ * Prior to 6.17.0, all proxies were required to implement this interface,
+ * however it produced no functionality and was not even used internally.
+ *
+ * @deprecated Unused class, not required. Will be removed in a subsequent release.
  */
+@Deprecated(since = "6.17.0", forRemoval = true)
 public interface AbstractProxy {
 
 }

eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java

@@ -1,15 +1,17 @@
 package com.willfp.eco.core.proxy;
 
-import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 
 /**
  * Proxy / NMS constants.
  */
-@UtilityClass
-public class ProxyConstants {
+public final class ProxyConstants {
     /**
      * The NMS version that the server is running on.
      */
     public static final String NMS_VERSION = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+
+    private ProxyConstants() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java

@@ -13,5 +13,5 @@ public interface ProxyFactory {
      * @param <T>        The proxy class.
      * @return The proxy implementation.
      */
-    <T extends AbstractProxy> @NotNull T getProxy(@NotNull Class<T> proxyClass);
+    <T> @NotNull T getProxy(@NotNull Class<T> proxyClass);
 }

eco-api/src/main/java/com/willfp/eco/core/recipe/Recipes.java

@@ -6,7 +6,7 @@ import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.items.Items;
 import com.willfp.eco.core.recipe.recipes.CraftingRecipe;
 import com.willfp.eco.core.recipe.recipes.ShapedCraftingRecipe;
-import lombok.experimental.UtilityClass;
+import com.willfp.eco.util.NamespacedKeyUtils;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -17,9 +17,8 @@ import java.util.List;
 /**
  * Utility class to manage and register crafting recipes.
  */
-@UtilityClass
 @SuppressWarnings("deprecation")
-public class Recipes {
+public final class Recipes {
     /**
      * Registry of all recipes.
      */
@@ -31,7 +30,7 @@ public class Recipes {
      *
      * @param recipe The recipe.
      */
-    public void register(@NotNull final CraftingRecipe recipe) {
+    public static void register(@NotNull final CraftingRecipe recipe) {
         RECIPES.forcePut(recipe.getKey(), recipe);
     }
 
@@ -42,7 +41,7 @@ public class Recipes {
      * @return The match, or null if not found.
      */
     @Nullable
-    public CraftingRecipe getMatch(@NotNull final ItemStack[] matrix) {
+    public static CraftingRecipe getMatch(@NotNull final ItemStack[] matrix) {
         return RECIPES.values().stream().filter(recipe -> recipe.test(matrix)).findFirst().orElse(null);
     }
 
@@ -53,14 +52,17 @@ public class Recipes {
      * @return The recipe, or null if not found.
      */
     @Nullable
-    public CraftingRecipe getRecipe(@NotNull final NamespacedKey key) {
+    public static CraftingRecipe getRecipe(@NotNull final NamespacedKey key) {
         CraftingRecipe recipe = RECIPES.get(key);
         if (recipe != null) {
             return recipe;
         }
 
         if (key.getKey().contains("_displayed")) {
-            NamespacedKey otherKey = new NamespacedKey(key.getNamespace(), key.getKey().replace("_displayed", ""));
+            NamespacedKey otherKey = NamespacedKeyUtils.create(
+                    key.getNamespace(),
+                    key.getKey().replace("_displayed", "")
+            );
 
             return RECIPES.get(otherKey);
         }
@@ -77,11 +79,31 @@ public class Recipes {
      * @param recipeStrings The recipe.
      * @return The recipe.
      */
-    public CraftingRecipe createAndRegisterRecipe(@NotNull final EcoPlugin plugin,
-                                                  @NotNull final String key,
-                                                  @NotNull final ItemStack output,
-                                                  @NotNull final List<String> recipeStrings) {
-        ShapedCraftingRecipe.Builder builder = ShapedCraftingRecipe.builder(plugin, key).setOutput(output);
+    public static CraftingRecipe createAndRegisterRecipe(@NotNull final EcoPlugin plugin,
+                                                         @NotNull final String key,
+                                                         @NotNull final ItemStack output,
+                                                         @NotNull final List<String> recipeStrings) {
+        return createAndRegisterRecipe(plugin, key, output, recipeStrings, null);
+    }
+
+    /**
+     * Create and register recipe.
+     *
+     * @param plugin        The plugin.
+     * @param key           The key.
+     * @param output        The output.
+     * @param recipeStrings The recipe.
+     * @param permission    The permission.
+     * @return The recipe.
+     */
+    public static CraftingRecipe createAndRegisterRecipe(@NotNull final EcoPlugin plugin,
+                                                         @NotNull final String key,
+                                                         @NotNull final ItemStack output,
+                                                         @NotNull final List<String> recipeStrings,
+                                                         @Nullable final String permission) {
+        ShapedCraftingRecipe.Builder builder = ShapedCraftingRecipe.builder(plugin, key)
+                .setOutput(output)
+                .setPermission(permission);
 
         for (int i = 0; i < 9; i++) {
             builder.setRecipePart(i, Items.lookup(recipeStrings.get(i)));
@@ -92,4 +114,8 @@ public class Recipes {
 
         return recipe;
     }
+
+    private Recipes() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/MaterialTestableItem.java

@@ -1,7 +1,6 @@
 package com.willfp.eco.core.recipe.parts;
 
 import com.willfp.eco.core.items.TestableItem;
-import lombok.Getter;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -15,7 +14,6 @@ public class MaterialTestableItem implements TestableItem {
     /**
      * The material.
      */
-    @Getter
     private final Material material;
 
     /**
@@ -44,4 +42,13 @@ public class MaterialTestableItem implements TestableItem {
     public ItemStack getItem() {
         return new ItemStack(material);
     }
+
+    /**
+     * Get the material.
+     *
+     * @return The material.
+     */
+    public Material getMaterial() {
+        return this.material;
+    }
 }