Fixed readme again

Update oraxen dependency

CONTRIBUTING.md

@@ -1,38 +1,7 @@
 # How to contribute to eco
 
-## Codestyle
+Please open any Pull Requests into the `develop` branch or ideally into a new branch for your changes. PRs that go into `master` won't be ignored, but I have to checkout and merge manually, which makes your PR show as being closed.
 
-1. The eco checkstyle is in /config/checkstyle.xml
+Do not write any Kotlin-only APIs; all API components should be written in Java, Kotlin extensions should not have functionality that isn't available in java. The same applies the other way round, do not write any backend code in Java, it should be Kotlin-exclusive.
 
-- The pull request must not have any checkstyle issues.
-- Every method and field must have a javadoc attached.
-
-2. Use JetBrains annotations
-
-- Every parameter should be annotated with @NotNull or @Nullable
-
-3. Imports
-
-- No group (*) imports.
-- No static imports.
-
-4. Kotlin
-
-- Kotlin should be the only language used in the backend, java should be the only language used in the frontend.
-- Kotlin API extensions should only be for creating extension functions and extra niceties that aren't possible in java.
-  Do not write API components in kotlin.
-- Kotlin code should never be called directly from the frontend Java API. Kotlin API extensions should always rely on
-  java, not the other way round.
-
-## Dependency Injection
-
-- eco uses Dependency Injection
-- Any calls to Eco#getHandler#getEcoPlugin are code smells and should never be used unless **absolutely necessary**.
-- NamespacedKeys, FixedMetadataValues, Runnables, and Schedules should be managed using AbstractEcoPlugin through DI.
-- Any DI class should extend PluginDependent where possible. If the class extends another, then you **must** store the
-  plugin instance in a private final variable called **plugin** with a private or protected getter.
-
-## Other
-
-- All drops **must** be sent through a DropQueue - calls to World#dropItem will get your PR rejected.
-- eco is built with java 17.
+If you have any questions about contributing, feel free to ask in the [Discord](https://discord.gg/ZcwpSsE)!

README.md

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

build.gradle.kts

@@ -25,6 +25,7 @@ dependencies {
     implementation(project(path = ":eco-core:core-nms:v1_18_R1", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_18_R2", configuration = "reobf"))
     implementation(project(path = ":eco-core:core-nms:v1_19_R1", configuration = "reobf"))
+    implementation(project(path = ":eco-core:core-nms:v1_19_R2", configuration = "reobf"))
 }
 
 allprojects {
@@ -77,6 +78,8 @@ allprojects {
 
         // LibsDisguises
         maven("https://repo.md-5.net/content/groups/public/")
+
+        maven("https://repo.techscode.com/repository/maven-releases/")
     }
 
     dependencies {

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

@@ -13,27 +13,30 @@ import java.util.Collections;
 
 /**
  * Wrapper class for ProtocolLib packets.
+ *
+ * @deprecated ProtocolLib is no longer used by eco. Use {@link com.willfp.eco.core.packet.PacketListener} instead.
  */
+@Deprecated(since = "6.51.0")
 public abstract class AbstractPacketAdapter extends PacketAdapter {
     /**
-     * The packet type to listen for.
+     * The handle type to listen for.
      */
     private final PacketType type;
 
     /**
-     * Whether the packet adapter should be registered after the server has loaded.
+     * Whether the handle adapter should be registered after the server has loaded.
      * <p>
      * Useful for monitor priority adapters that <b>must</b> be ran last.
      */
     private final boolean postLoad;
 
     /**
-     * Create a new packet adapter for a specified plugin and type.
+     * Create a new handle adapter for a specified plugin and type.
      *
      * @param plugin   The plugin that ProtocolLib should mark as the owner.
      * @param type     The {@link PacketType} to listen for.
-     * @param priority The priority at which the adapter should be ran on packet send/receive.
-     * @param postLoad If the packet adapter should be registered after the server has loaded.
+     * @param priority The priority at which the adapter should be ran on handle send/receive.
+     * @param postLoad If the handle adapter should be registered after the server has loaded.
      */
     protected AbstractPacketAdapter(@NotNull final EcoPlugin plugin,
                                     @NotNull final PacketType type,
@@ -45,11 +48,11 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
     }
 
     /**
-     * Create a new packet adapter for a specified plugin and type.
+     * Create a new handle adapter for a specified plugin and type.
      *
      * @param plugin   The plugin that ProtocolLib should mark as the owner.
      * @param type     The {@link PacketType} to listen for.
-     * @param postLoad If the packet adapter should be registered after the server has loaded.
+     * @param postLoad If the handle adapter should be registered after the server has loaded.
      */
     protected AbstractPacketAdapter(@NotNull final EcoPlugin plugin,
                                     @NotNull final PacketType type,
@@ -58,9 +61,9 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
     }
 
     /**
-     * The code that should be executed once the packet has been received.
+     * The code that should be executed once the handle has been received.
      *
-     * @param packet The packet.
+     * @param packet The handle.
      * @param player The player.
      * @param event  The event.
      */
@@ -71,9 +74,9 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
     }
 
     /**
-     * THe code that should be executed once the packet has been sent.
+     * THe code that should be executed once the handle has been sent.
      *
-     * @param packet The packet.
+     * @param packet The handle.
      * @param player The player.
      * @param event  The event.
      */
@@ -84,7 +87,7 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
     }
 
     /**
-     * Boilerplate to assert that the packet is of the specified type.
+     * Boilerplate to assert that the handle is of the specified type.
      *
      * @param event The ProtocolLib event.
      */
@@ -102,7 +105,7 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
     }
 
     /**
-     * Boilerplate to assert that the packet is of the specified type.
+     * Boilerplate to assert that the handle is of the specified type.
      *
      * @param event The ProtocolLib event.
      */
@@ -125,7 +128,7 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
     }
 
     /**
-     * Register the packet adapter with ProtocolLib.
+     * Register the handle adapter with ProtocolLib.
      */
     public final void register() {
         if (!ProtocolLibrary.getProtocolManager().getPacketListeners().contains(this)) {
@@ -134,7 +137,7 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
     }
 
     /**
-     * Get if the packet adapter should be loaded last.
+     * Get if the handle adapter should be loaded last.
      *
      * @return If post load.
      */

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

@@ -1,5 +1,8 @@
 package com.willfp.eco.core;
 
+import com.willfp.eco.core.command.CommandBase;
+import com.willfp.eco.core.command.PluginCommandBase;
+import com.willfp.eco.core.command.impl.PluginCommand;
 import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.interfaces.Config;
 import com.willfp.eco.core.config.interfaces.LoadableConfig;
@@ -21,10 +24,9 @@ import com.willfp.eco.core.gui.menu.MenuBuilder;
 import com.willfp.eco.core.gui.menu.MenuType;
 import com.willfp.eco.core.gui.slot.SlotBuilder;
 import com.willfp.eco.core.gui.slot.functional.SlotProvider;
-import com.willfp.eco.core.integrations.placeholder.PlaceholderIntegration;
 import com.willfp.eco.core.items.TestableItem;
-import com.willfp.eco.core.placeholder.AdditionalPlayer;
-import com.willfp.eco.core.placeholder.PlaceholderInjectable;
+import com.willfp.eco.core.math.MathContext;
+import com.willfp.eco.core.packet.Packet;
 import com.willfp.eco.core.proxy.ProxyFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
@@ -42,7 +44,6 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -50,18 +51,18 @@ import java.util.UUID;
 import java.util.logging.Logger;
 
 /**
- * Holds the instance of eco for bridging between the frontend
- * and backend.
+ * Holds the instance of eco for bridging between the frontend and backend.
  * <p>
  * <strong>Do not use this in your plugins!</strong> It can and will contain
- * breaking changes between minor versions and even patches, and you will create
- * compatibility issues by. All parts of this have been abstracted
- * into logically named API components that you can use.
+ * breaking changes between minor versions and even patches, and you will create compatibility
+ * issues by. All parts of this have been abstracted into logically named API components that you
+ * can use.
  *
  * @see Eco#get()
  */
 @ApiStatus.Internal
 public interface Eco {
+
     /**
      * Create a scheduler.
      *
@@ -74,7 +75,7 @@ public interface Eco {
     /**
      * Create an event manager.
      *
-     * @param plugin The plugin.
+     * @param plugin The plugin.F
      * @return The event manager.
      */
     @NotNull
@@ -138,10 +139,8 @@ public interface Eco {
      * Create a PAPI integration.
      *
      * @param plugin The plugin.
-     * @return The integration.
      */
-    @NotNull
-    PlaceholderIntegration createPAPIIntegration(@NotNull EcoPlugin plugin);
+    void createPAPIIntegration(@NotNull EcoPlugin plugin);
 
     /**
      * Create a proxy factory.
@@ -160,6 +159,40 @@ public interface Eco {
     @NotNull
     EcoPlugin getEcoPlugin();
 
+    /**
+     * Create PluginCommandBase implementation of {@link PluginCommand}.
+     *
+     * @param parentDelegate the enclosing class of this implementation.
+     * @param plugin         the plugin.
+     * @param name           the name of the command.
+     * @param permission     the permission of the command.
+     * @param playersOnly    if the command is players only.
+     * @return The PluginCommandBase implementation
+     */
+    @NotNull
+    PluginCommandBase createPluginCommand(@NotNull CommandBase parentDelegate,
+                                          @NotNull EcoPlugin plugin,
+                                          @NotNull String name,
+                                          @NotNull String permission,
+                                          boolean playersOnly);
+
+    /**
+     * Create CommandBase implementation of {@link com.willfp.eco.core.command.impl.Subcommand Subcommand}.
+     *
+     * @param parentDelegate the enclosing class of this implementation.
+     * @param plugin         the plugin.
+     * @param name           the name of the command.
+     * @param permission     the permission of the command.
+     * @param playersOnly    if the command is players only.
+     * @return The CommandBase implementation
+     */
+    @NotNull
+    CommandBase createSubcommand(@NotNull CommandBase parentDelegate,
+                                 @NotNull EcoPlugin plugin,
+                                 @NotNull String name,
+                                 @NotNull String permission,
+                                 boolean playersOnly);
+
     /**
      * Updatable config.
      *
@@ -173,6 +206,7 @@ public interface Eco {
      * @param requiresChangesToSave If the config must be changed in order to save the config.
      * @return The config implementation.
      */
+    @NotNull
     LoadableConfig createUpdatableConfig(@NotNull String configName,
                                          @NotNull PluginLike plugin,
                                          @NotNull String subDirectoryPath,
@@ -193,6 +227,7 @@ public interface Eco {
      * @param requiresChangesToSave If the config must be changed in order to save the config.
      * @return The config implementation.
      */
+    @NotNull
     LoadableConfig createLoadableConfig(@NotNull String configName,
                                         @NotNull PluginLike plugin,
                                         @NotNull String subDirectoryPath,
@@ -206,6 +241,7 @@ public interface Eco {
      * @param config The handle.
      * @return The config implementation.
      */
+    @NotNull
     Config wrapConfigurationSection(@NotNull ConfigurationSection config);
 
     /**
@@ -215,6 +251,7 @@ public interface Eco {
      * @param type   The config type.
      * @return The config implementation.
      */
+    @NotNull
     Config createConfig(@NotNull Map<String, Object> values,
                         @NotNull ConfigType type);
 
@@ -225,6 +262,7 @@ public interface Eco {
      * @param type     The type.
      * @return The config implementation.
      */
+    @NotNull
     Config createConfig(@NotNull String contents,
                         @NotNull ConfigType type);
 
@@ -335,23 +373,16 @@ public interface Eco {
      *
      * @return The keys.
      */
+    @NotNull
     Set<PersistentDataKey<?>> getRegisteredPersistentDataKeys();
 
-    /**
-     * Get persistent data key from namespaced key.
-     *
-     * @param namespacedKey The key.
-     * @return The key, or null if not found.
-     */
-    @Nullable
-    PersistentDataKey<?> getPersistentDataKeyFrom(@NotNull NamespacedKey namespacedKey);
-
     /**
      * Load a player profile.
      *
      * @param uuid The UUID.
      * @return The profile.
      */
+    @NotNull
     PlayerProfile loadPlayerProfile(@NotNull UUID uuid);
 
     /**
@@ -359,6 +390,7 @@ public interface Eco {
      *
      * @return The profile.
      */
+    @NotNull
     ServerProfile getServerProfile();
 
     /**
@@ -370,24 +402,6 @@ public interface Eco {
      */
     void unloadPlayerProfile(@NotNull UUID uuid);
 
-    /**
-     * Save keys for a player.
-     * <p>
-     * Can run async if using MySQL.
-     *
-     * @param uuid The uuid.
-     * @param keys The keys.
-     */
-    void savePersistentDataKeysFor(@NotNull UUID uuid,
-                                   @NotNull Set<PersistentDataKey<?>> keys);
-
-    /**
-     * Commit all changes to the file.
-     * <p>
-     * Does nothing if using MySQL.
-     */
-    void saveAllProfiles();
-
     /**
      * Create dummy entity - never spawned, exists purely in code.
      *
@@ -400,9 +414,8 @@ public interface Eco {
     /**
      * 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.
+     * 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.
@@ -514,15 +527,11 @@ public interface Eco {
      * Evaluate an expression.
      *
      * @param expression The expression.
-     * @param player            The player.
-     * @param injectable        The injectable placeholders.
-     * @param additionalPlayers The additional players.
+     * @param context    The context.
      * @return The value of the expression, or zero if invalid.
      */
     double evaluate(@NotNull String expression,
-                    @Nullable Player player,
-                    @NotNull PlaceholderInjectable injectable,
-                    @NotNull Collection<AdditionalPlayer> additionalPlayers);
+                    @NotNull MathContext context);
 
     /**
      * Get the menu a player currently has open.
@@ -534,8 +543,28 @@ public interface Eco {
     Menu getOpenMenu(@NotNull Player player);
 
     /**
-     * Get the instance of eco; the bridge between the api frontend
-     * and the implementation backend.
+     * Sync commands.
+     */
+    void syncCommands();
+
+    /**
+     * Unregister a command.
+     *
+     * @param command The command.
+     */
+    void unregisterCommand(@NotNull PluginCommandBase command);
+
+    /**
+     * Send a packet.
+     *
+     * @param player The player.
+     * @param packet The packet.
+     */
+    void sendPacket(@NotNull Player player,
+                    @NotNull Packet packet);
+
+    /**
+     * Get the instance of eco; the bridge between the api frontend and the implementation backend.
      *
      * @return The instance of eco.
      */
@@ -549,6 +578,7 @@ public interface Eco {
      */
     @ApiStatus.Internal
     final class Instance {
+
         /**
          * Instance of eco.
          */

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

@@ -13,7 +13,7 @@ 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.packet.PacketListener;
 import com.willfp.eco.core.proxy.ProxyFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
 import com.willfp.eco.core.web.UpdateChecker;
@@ -53,7 +53,7 @@ import java.util.stream.Collectors;
  * <b>IMPORTANT: When reloading a plugin, all runnables / tasks will
  * be cancelled.</b>
  */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "DeprecatedIsStillUsed", "deprecation", "RedundantSuppression"})
 public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     /**
      * The polymart resource ID of the plugin.
@@ -153,6 +153,31 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     @Nullable
     private final ProxyFactory proxyFactory;
 
+    /**
+     * The tasks to run on enable.
+     */
+    private final List<Runnable> onEnable = new ArrayList<>();
+
+    /**
+     * The tasks to run on disable.
+     */
+    private final List<Runnable> onDisable = new ArrayList<>();
+
+    /**
+     * The tasks to run on reload.
+     */
+    private final List<Runnable> onReload = new ArrayList<>();
+
+    /**
+     * The tasks to run on load.
+     */
+    private final List<Runnable> onLoad = new ArrayList<>();
+
+    /**
+     * The tasks to run after load.
+     */
+    private final List<Runnable> afterLoad = new ArrayList<>();
+
     /**
      * Create a new plugin.
      * <p>
@@ -320,6 +345,13 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.configHandler = Eco.get().createConfigHandler(this);
 
         this.langYml = this.createLangYml();
+
+        if (!this.langYml.isValid() && !(this instanceof Eco)) {
+            this.getLogger().warning("Notify plugin authors " + String.join(", ", this.getDescription().getAuthors()) + " that");
+            this.getLogger().warning("they are missing crucial lang.yml keys! They can be found");
+            this.getLogger().warning("in the LangYml class.");
+        }
+
         this.configYml = this.createConfigYml();
 
         Eco.get().addNewPlugin(this);
@@ -375,8 +407,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
                 .collect(Collectors.toSet());
 
         if (enabledPlugins.contains("PlaceholderAPI".toLowerCase())) {
-            this.loadedIntegrations.add("PlaceholderAPI");
-            PlaceholderManager.addIntegration(Eco.get().createPAPIIntegration(this));
+            Eco.get().createPAPIIntegration(this);
         }
 
         this.loadIntegrationLoaders().forEach(integrationLoader -> {
@@ -386,17 +417,22 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
             }
         });
 
+        this.loadedIntegrations.removeIf(pl -> pl.equalsIgnoreCase(this.getName()));
+
         this.getLogger().info("Loaded integrations: " + String.join(", ", this.getLoadedIntegrations()));
 
         Prerequisite.update();
 
+        if (Prerequisite.HAS_PROTOCOLLIB.isMet()) {
             this.loadPacketAdapters().forEach(abstractPacketAdapter -> {
                 if (!abstractPacketAdapter.isPostLoad()) {
                     abstractPacketAdapter.register();
                 }
             });
+        }
 
         this.loadListeners().forEach(listener -> this.getEventManager().registerListener(listener));
+        this.loadPacketListeners().forEach(listener -> this.getEventManager().registerPacketListener(listener));
 
         this.loadPluginCommands().forEach(PluginCommand::register);
 
@@ -414,10 +450,20 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         }
 
         this.handleEnable();
+        this.onEnable.forEach(Runnable::run);
 
         this.getLogger().info("");
     }
 
+    /**
+     * Add new task to run on enable.
+     *
+     * @param task The task.
+     */
+    public final void onEnable(@NotNull final Runnable task) {
+        this.onEnable.add(task);
+    }
+
     /**
      * Default code to be executed on plugin disable.
      */
@@ -429,6 +475,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.getScheduler().cancelAll();
 
         this.handleDisable();
+        this.onDisable.forEach(Runnable::run);
 
         if (this.isSupportingExtensions()) {
             this.getExtensionLoader().unloadExtensions();
@@ -438,6 +485,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         Eco.get().clean(this);
     }
 
+    /**
+     * Add new task to run on disable.
+     *
+     * @param task The task.
+     */
+    public final void onDisable(@NotNull final Runnable task) {
+        this.onDisable.add(task);
+    }
+
     /**
      * Default code to be executed on plugin load.
      */
@@ -446,6 +502,16 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         super.onLoad();
 
         this.handleLoad();
+        this.onLoad.forEach(Runnable::run);
+    }
+
+    /**
+     * Add new task to run on load.
+     *
+     * @param task The task.
+     */
+    public final void onLoad(@NotNull final Runnable task) {
+        this.onLoad.add(task);
     }
 
     /**
@@ -458,11 +524,13 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
             Display.registerDisplayModule(this.getDisplayModule());
         }
 
+        if (Prerequisite.HAS_PROTOCOLLIB.isMet()) {
             this.loadPacketAdapters().forEach(abstractPacketAdapter -> {
                 if (abstractPacketAdapter.isPostLoad()) {
                     abstractPacketAdapter.register();
                 }
             });
+        }
 
         if (!Prerequisite.HAS_PAPER.isMet()) {
             this.getLogger().severe("");
@@ -478,6 +546,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         }
 
         this.handleAfterLoad();
+        this.afterLoad.forEach(Runnable::run);
 
         this.reload();
 
@@ -488,6 +557,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.getLogger().info("Loaded " + this.color + this.getName());
     }
 
+    /**
+     * Add new task to run after load.
+     *
+     * @param task The task.
+     */
+    public final void afterLoad(@NotNull final Runnable task) {
+        this.afterLoad.add(task);
+    }
+
     /**
      * Reload the plugin.
      */
@@ -499,12 +577,22 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
         this.getConfigHandler().callUpdate(); // Call twice to fix issues
 
         this.handleReload();
+        this.onReload.forEach(Runnable::run);
 
         for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
             extension.handleReload();
         }
     }
 
+    /**
+     * Add new task to run on enable.
+     *
+     * @param task The task.
+     */
+    public final void onReload(@NotNull final Runnable task) {
+        this.onReload.add(task);
+    }
+
     /**
      * Reload the plugin and return the time taken to reload.
      *
@@ -599,16 +687,27 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     }
 
     /**
-     * ProtocolLib packet adapters to be registered.
+     * ProtocolLib handle adapters to be registered.
      * <p>
      * If the plugin does not require ProtocolLib this can be left empty.
      *
-     * @return A list of packet adapters.
+     * @return A list of handle adapters.
+     * @deprecated Use {@link #loadPacketListeners()} instead.
      */
+    @Deprecated(since = "6.51.0")
     protected List<AbstractPacketAdapter> loadPacketAdapters() {
         return new ArrayList<>();
     }
 
+    /**
+     * Packet Listeners to be registered.
+     *
+     * @return A list of handle listeners.
+     */
+    protected List<PacketListener> loadPacketListeners() {
+        return new ArrayList<>();
+    }
+
     /**
      * All listeners to be registered.
      *
@@ -624,7 +723,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @return lang.yml.
      */
     protected LangYml createLangYml() {
+        try {
             return new LangYml(this);
+        } catch (NullPointerException e) {
+            this.getLogger().severe("Failed to load lang.yml!");
+            this.getLogger().severe("For the developer of this plugin: make sure you have a lang.yml");
+            e.printStackTrace();
+            Bukkit.getPluginManager().disablePlugin(this);
+            return null;
+        }
     }
 
     /**
@@ -635,7 +742,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @return config.yml.
      */
     protected ConfigYml createConfigYml() {
+        try {
             return new ConfigYml(this);
+        } catch (NullPointerException e) {
+            this.getLogger().severe("Failed to load config.yml!");
+            this.getLogger().severe("For the developer of this plugin: make sure you have a config.yml");
+            e.printStackTrace();
+            Bukkit.getPluginManager().disablePlugin(this);
+            return null;
+        }
     }
 
     /**

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

@@ -221,7 +221,7 @@ public final class PluginProps {
 
     /**
      * Create new props from known values.
-     *
+     * <p>
      * Marked as internal as this method will break whenever the properties themselves
      * are updated (e.g. if a new property is added) - so to prevent any potential
      * backwards-compatibility bugs, this method cannot be invoked outside eco itself.

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

@@ -30,6 +30,14 @@ public class Prerequisite {
             "Requires server to be running paper (or a fork)"
     );
 
+    /**
+     * Requires the server to be running an implementation of paper.
+     */
+    public static final Prerequisite HAS_PROTOCOLLIB = new Prerequisite(
+            () -> ClassUtils.exists("com.comphenix.protocol.events.PacketAdapter"),
+            "Requires server to have ProtocolLib"
+    );
+
     /**
      * Requires the server to have vault installed.
      *
@@ -70,7 +78,10 @@ public class Prerequisite {
 
     /**
      * Requires the server to be running an implementation of BungeeCord.
+     *
+     * @deprecated This will never return true.
      */
+    @Deprecated(since = "6.49.0", forRemoval = true)
     public static final Prerequisite HAS_BUNGEECORD = new Prerequisite(
             () -> ClassUtils.exists("net.md_5.bungee.api.event.ServerConnectedEvent"),
             "Requires server to be running BungeeCord (or a fork)"
@@ -78,7 +89,10 @@ public class Prerequisite {
 
     /**
      * Requires the server to be running an implementation of Velocity.
+     *
+     * @deprecated This will never return true.
      */
+    @Deprecated(since = "6.49.0", forRemoval = true)
     public static final Prerequisite HAS_VELOCITY = new Prerequisite(
             () -> ClassUtils.exists("com.velocitypowered.api.event.player.ServerConnectedEvent"),
             "Requires server to be running Velocity (or a fork)"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -6,12 +6,12 @@ import org.jetbrains.annotations.Nullable;
 /**
  * Builder for configs to create them programmatically.
  */
-public class BuildableConfig extends TransientConfig {
+public class BuildableConfig extends GenericConfig {
     /**
      * Create a new empty config builder.
      */
     public BuildableConfig() {
-        super();
+
     }
 
     /**

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

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

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

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

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

@@ -20,7 +20,10 @@ import java.util.Map;
  * Config that exists purely in the code, not linked to any file.
  * <p>
  * Use for inline configs to move data around or to add subsections to other configs.
+ *
+ * @deprecated Poorly named class, makes the config system seem needlessly complicated.
  */
+@Deprecated(since = "6.44.0", forRemoval = true)
 public class TransientConfig extends ConfigWrapper<Config> {
     /**
      * @param config The ConfigurationSection handle.

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

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

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

@@ -2,7 +2,7 @@ package com.willfp.eco.core.config.interfaces;
 
 import com.willfp.eco.core.config.BuildableConfig;
 import com.willfp.eco.core.config.ConfigType;
-import com.willfp.eco.core.config.TransientConfig;
+import com.willfp.eco.core.config.Configs;
 import com.willfp.eco.core.placeholder.AdditionalPlayer;
 import com.willfp.eco.core.placeholder.InjectablePlaceholder;
 import com.willfp.eco.core.placeholder.PlaceholderInjectable;
@@ -103,7 +103,7 @@ public interface Config extends Cloneable, PlaceholderInjectable {
      */
     @NotNull
     default Config getSubsection(@NotNull String path) {
-        return Objects.requireNonNullElse(getSubsectionOrNull(path), new TransientConfig());
+        return Objects.requireNonNullElse(getSubsectionOrNull(path), Configs.empty());
     }
 
     /**

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

@@ -134,7 +134,7 @@ public final class PersistentDataKey<T> {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof PersistentDataKey that)) {
+        if (!(o instanceof PersistentDataKey<?> that)) {
             return false;
         }
         return Objects.equals(this.getKey(), that.getKey());

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

@@ -99,7 +99,7 @@ public final class PersistentDataKeyType<T> {
         if (this == that) {
             return true;
         }
-        if (!(that instanceof PersistentDataKeyType type)) {
+        if (!(that instanceof PersistentDataKeyType<?> type)) {
             return false;
         }
         return Objects.equals(this.name, type.name);

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

@@ -1,13 +1,13 @@
 package com.willfp.eco.core.display;
 
 import com.willfp.eco.core.fast.FastItemStack;
+import com.willfp.eco.core.integrations.guidetection.GUIDetectionManager;
 import com.willfp.eco.util.NamespacedKeyUtils;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.persistence.PersistentDataType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -19,6 +19,9 @@ import java.util.TreeMap;
 
 /**
  * Utility class to manage client-side item display.
+ * <p>
+ * Packet display is not done on the main thread, so make sure
+ * all your modules are thread-safe.
  */
 public final class Display {
     /**
@@ -72,7 +75,7 @@ public final class Display {
         ItemStack original = itemStack.clone();
         Inventory inventory = player == null ? null : player.getOpenInventory().getTopInventory();
         boolean inInventory = inventory != null && inventory.contains(original);
-        boolean inGui = inventory != null && inventory.getHolder() == null;
+        boolean inGui = player != null && GUIDetectionManager.hasGUIOpen(player);
 
         DisplayProperties properties = new DisplayProperties(
                 inInventory,

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

@@ -8,6 +8,8 @@ import org.jetbrains.annotations.Nullable;
 
 /**
  * Class for all plugin-specific client-side item display modules.
+ * <p>
+ * Display modules are called in the netty thread, so make sure they are thread-safe.
  */
 public abstract class DisplayModule {
     /**

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

@@ -45,7 +45,6 @@ public record EntityGoalAvoidEntity(
                 return null;
             }
 
-            try {
             TestableEntity entity = Entities.lookup(config.getString("entity"));
 
             return new EntityGoalAvoidEntity(
@@ -54,14 +53,6 @@ public record EntityGoalAvoidEntity(
                     config.getDouble("slowSpeed"),
                     config.getDouble("fastSpeed")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalBreakDoors(
                 return null;
             }
 
-            try {
             return new EntityGoalBreakDoors(
                     config.getInt("ticks")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalBreed(
                 return null;
             }
 
-            try {
             return new EntityGoalBreed(
                     config.getDouble("speed")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -37,19 +37,10 @@ public record EntityGoalCatLieOnBed(
                 return null;
             }
 
-            try {
             return new EntityGoalCatLieOnBed(
                     config.getDouble("speed"),
                     config.getInt("range")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalCatSitOnBed(
                 return null;
             }
 
-            try {
             return new EntityGoalCatSitOnBed(
                     config.getDouble("speed")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalFleeSun(
                 return null;
             }
 
-            try {
             return new EntityGoalFleeSun(
                     config.getDouble("speed")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -40,20 +40,11 @@ public record EntityGoalFollowMobs(
                 return null;
             }
 
-            try {
             return new EntityGoalFollowMobs(
                     config.getDouble("speed"),
                     config.getDouble("minDistance"),
                     config.getDouble("maxDistance")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -42,20 +42,11 @@ public record EntityGoalInteract(
                 return null;
             }
 
-            try {
             return new EntityGoalInteract(
                     Entities.lookup(config.getString("target")),
                     config.getDouble("range"),
                     config.getDouble("chance")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalLeapAtTarget(
                 return null;
             }
 
-            try {
             return new EntityGoalLeapAtTarget(
                     config.getDouble("velocity")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -37,19 +37,10 @@ public record EntityGoalLookAtPlayer(
                 return null;
             }
 
-            try {
             return new EntityGoalLookAtPlayer(
                     config.getDouble("range"),
                     config.getDouble("chance")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -37,19 +37,10 @@ public record EntityGoalMeleeAttack(
                 return null;
             }
 
-            try {
             return new EntityGoalMeleeAttack(
                     config.getDouble("speed"),
                     config.getBool("pauseWhenMobIdle")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -37,19 +37,10 @@ public record EntityGoalMoveBackToVillage(
                 return null;
             }
 
-            try {
             return new EntityGoalMoveBackToVillage(
                     config.getDouble("speed"),
                     config.getBool("canDespawn")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -43,21 +43,12 @@ public record EntityGoalMoveThroughVillage(
                 return null;
             }
 
-            try {
             return new EntityGoalMoveThroughVillage(
                     config.getDouble("speed"),
                     config.getBool("onlyAtNight"),
                     config.getInt("distance"),
                     config.getBool("canPassThroughDoors")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalMoveTowardsRestriction(
                 return null;
             }
 
-            try {
             return new EntityGoalMoveTowardsRestriction(
                     config.getDouble("speed")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -37,19 +37,10 @@ public record EntityGoalMoveTowardsTarget(
                 return null;
             }
 
-            try {
             return new EntityGoalMoveTowardsTarget(
                     config.getDouble("speed"),
                     config.getDouble("maxDistance")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalOpenDoors(
                 return null;
             }
 
-            try {
             return new EntityGoalOpenDoors(
                     config.getBool("delayClosing")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalPanic(
                 return null;
             }
 
-            try {
             return new EntityGoalPanic(
                     config.getDouble("speed")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -40,20 +40,11 @@ public record EntityGoalRandomStroll(
                 return null;
             }
 
-            try {
             return new EntityGoalRandomStroll(
                     config.getDouble("speed"),
                     config.getInt("interval"),
                     config.getBool("canDespawn")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -37,19 +37,10 @@ public record EntityGoalRandomSwimming(
                 return null;
             }
 
-            try {
             return new EntityGoalRandomSwimming(
                     config.getDouble("speed"),
                     config.getInt("interval")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -45,21 +45,12 @@ public record EntityGoalRangedAttack(
                 return null;
             }
 
-            try {
             return new EntityGoalRangedAttack(
                     config.getDouble("speed"),
                     config.getInt("minInterval"),
                     config.getInt("maxInterval"),
                     config.getDouble("range")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -42,20 +42,11 @@ public record EntityGoalRangedBowAttack(
                 return null;
             }
 
-            try {
             return new EntityGoalRangedBowAttack(
                     config.getDouble("speed"),
                     config.getInt("interval"),
                     config.getDouble("range")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -39,19 +39,10 @@ public record EntityGoalRangedCrossbowAttack(
                 return null;
             }
 
-            try {
             return new EntityGoalRangedCrossbowAttack(
                     config.getDouble("speed"),
                     config.getDouble("range")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalStrollThroughVillage(
                 return null;
             }
 
-            try {
             return new EntityGoalStrollThroughVillage(
                     config.getInt("searchRange")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -58,7 +58,6 @@ public record EntityGoalTempt(
                 return null;
             }
 
-            try {
             Collection<TestableItem> items = config.getStrings("items").stream()
                     .map(Items::lookup)
                     .filter(it -> !(it instanceof EmptyTestableItem))
@@ -69,14 +68,6 @@ public record EntityGoalTempt(
                     items,
                     config.getBool("canBeScared")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -48,7 +48,6 @@ public record EntityGoalUseItem(
                 return null;
             }
 
-            try {
             TestableEntity filter = Entities.lookup(config.getString("condition"));
 
             return new EntityGoalUseItem(
@@ -56,14 +55,6 @@ public record EntityGoalUseItem(
                     Sound.valueOf(config.getString("sound").toUpperCase()),
                     filter::matches
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalWaterAvoidingRandomFlying(
                 return null;
             }
 
-            try {
             return new EntityGoalWaterAvoidingRandomFlying(
                     config.getDouble("speed")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -37,19 +37,10 @@ public record EntityGoalWaterAvoidingRandomStroll(
                 return null;
             }
 
-            try {
             return new EntityGoalWaterAvoidingRandomStroll(
                     config.getDouble("speed"),
                     config.getDouble("chance")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -34,18 +34,9 @@ public record EntityGoalWolfBeg(
                 return null;
             }
 
-            try {
             return new EntityGoalWolfBeg(
                     config.getDouble("distance")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -37,18 +37,9 @@ public record TargetGoalHurtBy(
                 return null;
             }
 
-            try {
             return new TargetGoalHurtBy(
                     Entities.lookup(config.getString("blacklist"))
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -63,7 +63,6 @@ public record TargetGoalNearestAttackable(
                 return null;
             }
 
-            try {
             if (config.has("targetFilter")) {
                 TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
 
@@ -82,14 +81,6 @@ public record TargetGoalNearestAttackable(
                         config.getInt("reciprocalChance")
                 );
             }
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -63,7 +63,6 @@ public record TargetGoalNearestAttackableWitch(
                 return null;
             }
 
-            try {
             if (config.has("targetFilter")) {
                 TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
 
@@ -82,14 +81,6 @@ public record TargetGoalNearestAttackableWitch(
                         config.getInt("reciprocalChance")
                 );
             }
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -53,7 +53,6 @@ public record TargetGoalNearestHealableRaider(
                 return null;
             }
 
-            try {
             if (config.has("targetFilter")) {
                 TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
 
@@ -68,14 +67,6 @@ public record TargetGoalNearestHealableRaider(
                         config.getBool("checkVisibility")
                 );
             }
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -53,7 +53,6 @@ public record TargetGoalNonTameRandom(
                 return null;
             }
 
-            try {
             if (config.has("targetFilter")) {
                 TestableEntity filter = Entities.lookup(config.getString("targetFilter"));
 
@@ -68,14 +67,6 @@ public record TargetGoalNonTameRandom(
                         config.getBool("checkVisibility")
                 );
             }
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -36,18 +36,9 @@ public record TargetGoalResetUniversalAnger(
                 return null;
             }
 
-            try {
             return new TargetGoalResetUniversalAnger(
                     config.getBool("triggerOthers")
             );
-            } catch (Exception e) {
-                /*
-                Exceptions could be caused by configs having values of a wrong type,
-                invalid enum parameters, etc. Serializers shouldn't throw exceptions,
-                so we encapsulate them as null.
-                 */
-                return null;
-            }
         }
 
         @NotNull

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.events;
 
+import com.willfp.eco.core.packet.PacketListener;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,4 +26,11 @@ public interface EventManager {
      * Unregister all listeners associated with the plugin.
      */
     void unregisterAllListeners();
+
+    /**
+     * Register a packet listener.
+     *
+     * @param listener The listener.
+     */
+    void registerPacketListener(@NotNull PacketListener listener);
 }

eco-api/src/main/java/com/willfp/eco/core/gui/menu/Menu.java

@@ -63,11 +63,29 @@ public interface Menu {
      * @param player The player
      * @param menu   The menu.
      * @return The slot.
+     * @deprecated Menu shouldn't be a parameter.
      */
-    default Slot getSlot(int row,
-                         int column,
-                         @NotNull Player player,
-                         @NotNull Menu menu) {
+    @Deprecated(since = "6.46.0", forRemoval = true)
+    default Slot getSlot(final int row,
+                         final int column,
+                         @NotNull final Player player,
+                         @NotNull final Menu menu) {
+        return this.getSlot(row, column, player);
+    }
+
+    /**
+     * Get a slot at a given row and column.
+     * <p>
+     * Defaults to static slot if no reactive slot exists.
+     *
+     * @param row    The row.
+     * @param column The column.
+     * @param player The player
+     * @return The slot.
+     */
+    default Slot getSlot(final int row,
+                         final int column,
+                         @NotNull final Player player) {
         return this.getSlot(row, column);
     }
 
@@ -110,15 +128,32 @@ public interface Menu {
     }
 
     /**
-     * Add state for a player.
+     * Set state for a player.
      *
      * @param player The player.
      * @param key    The key.
      * @param value  The state.
      */
-    void addState(@NotNull Player player,
+    default void setState(@NotNull Player player,
                           @NotNull String key,
-                  @Nullable Object value);
+                          @Nullable Object value) {
+        // Blank method for backwards compatibility.
+    }
+
+    /**
+     * Add state for a player.
+     *
+     * @param player The player.
+     * @param key    The key.
+     * @param value  The state.
+     * @deprecated Poorly named, use setState instead.
+     */
+    @Deprecated(since = "6.44.0", forRemoval = true)
+    default void addState(@NotNull Player player,
+                          @NotNull String key,
+                          @Nullable Object value) {
+        this.setState(player, key, value);
+    }
 
     /**
      * Remove state for a player.
@@ -221,7 +256,7 @@ public interface Menu {
                                   @NotNull final NamespacedKey key,
                                   @NotNull final PersistentDataType<T, Z> type,
                                   @NotNull final Z value) {
-        this.addState(player, key.toString(), value);
+        this.setState(player, key.toString(), value);
     }
 
     /**

eco-api/src/main/java/com/willfp/eco/core/gui/menu/MenuBuilder.java

@@ -107,7 +107,7 @@ public interface MenuBuilder extends PageBuilder {
      * @return The builder.
      */
     default MenuBuilder addPage(@NotNull final Page page) {
-        return this.addComponent(MenuLayer.TOP, 1, 1, page);
+        return this.addComponent(MenuLayer.UPPER, 1, 1, page);
     }
 
     /**
@@ -139,7 +139,7 @@ public interface MenuBuilder extends PageBuilder {
      * @return The builder.
      */
     default MenuBuilder maxPages(@NotNull final Function<Player, Integer> pages) {
-        return onOpen((player, menu) -> menu.addState(player, Page.MAX_PAGE_KEY, pages.apply(player)));
+        return this.onRender((player, menu) -> menu.setState(player, Page.MAX_PAGE_KEY, pages.apply(player)));
     }
 
     /**
@@ -195,6 +195,16 @@ public interface MenuBuilder extends PageBuilder {
         return this;
     }
 
+    /**
+     * Add an action to run on build.
+     *
+     * @param action The action.
+     * @return The builder.
+     */
+    default MenuBuilder onBuild(@NotNull Consumer<Menu> action) {
+        return this;
+    }
+
     /**
      * Build the menu.
      *

eco-api/src/main/java/com/willfp/eco/core/gui/menu/events/CaptiveItemChangeEvent.java

@@ -0,0 +1,22 @@
+package com.willfp.eco.core.gui.menu.events;
+
+import com.willfp.eco.core.gui.menu.MenuEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Represents a captive item change.
+ *
+ * @param row    The row.
+ * @param column The column.
+ * @param before The previous item in the slot.
+ * @param after  The new item in the slot.
+ */
+public record CaptiveItemChangeEvent(
+        int row,
+        int column,
+        @Nullable ItemStack before,
+        @Nullable ItemStack after
+) implements MenuEvent {
+
+}

eco-api/src/main/java/com/willfp/eco/core/gui/page/Page.java

@@ -9,8 +9,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 /**
  * A page is a component representing another menu.
  * This allows full component support in pagination.
@@ -85,7 +83,7 @@ public final class Page implements GUIComponent {
             delegate = Eco.get().blendMenuState(page, menu);
         }
 
-        return page.getSlot(row, column, player, delegate);
+        return page.getSlot(row, column, player);
     }
 
     @Override

eco-api/src/main/java/com/willfp/eco/core/gui/page/PageChanger.java

@@ -48,7 +48,7 @@ public final class PageChanger implements GUIComponent {
                         return;
                     }
 
-                    menu.addState(player, Page.PAGE_KEY, newPage);
+                    menu.setState(player, Page.PAGE_KEY, newPage);
                     menu.callEvent(player, new PageChangeEvent(
                             newPage,
                             page
@@ -79,7 +79,7 @@ public final class PageChanger implements GUIComponent {
             return null;
         }
 
-        if (page >= maxPage - 1 && this.direction == Direction.FORWARDS) {
+        if (page >= maxPage && this.direction == Direction.FORWARDS) {
             return null;
         }
 

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

@@ -1,12 +1,14 @@
 package com.willfp.eco.core.gui.slot;
 
 import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.core.gui.slot.functional.SlotHandler;
 import com.willfp.eco.core.items.Items;
 import com.willfp.eco.util.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -37,7 +39,25 @@ public class ConfigSlot extends CustomSlot {
     public ConfigSlot(@NotNull final Config config) {
         this.config = config;
 
-        SlotBuilder builder = Slot.builder(Items.lookup(config.getString("item")));
+        ItemStack item = Items.lookup(config.getString("item")).getItem();
+
+        SlotBuilder builder = Slot.builder((player, menu) -> {
+            if (!config.has("lore")) {
+                return item;
+            } else {
+                FastItemStack fast = FastItemStack.wrap(item.clone());
+                List<String> newLore = new ArrayList<>(fast.getLore());
+                newLore.addAll(
+                        StringUtils.formatList(
+                                config.getStrings("lore"),
+                                player,
+                                StringUtils.FormatOption.WITH_PLACEHOLDERS
+                        )
+                );
+                fast.setLore(newLore);
+                return fast.unwrap();
+            }
+        });
 
         for (ClickType clickType : ClickType.values()) {
             builder.onClick(

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

@@ -4,6 +4,7 @@ import com.willfp.eco.core.gui.menu.Menu;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base class for custom slot implementations.
@@ -31,7 +32,7 @@ public abstract class CustomSlot implements Slot {
     }
 
     @Override
-    public ItemStack getItemStack(@NotNull final Player player) {
+    public final @NotNull ItemStack getItemStack(@NotNull final Player player) {
         if (delegate == null) {
             throw new IllegalStateException("Custom Slot was not initialized!");
         }
@@ -40,7 +41,7 @@ public abstract class CustomSlot implements Slot {
     }
 
     @Override
-    public boolean isCaptive(@NotNull final Player player,
+    public final boolean isCaptive(@NotNull final Player player,
                                    @NotNull final Menu menu) {
         if (delegate == null) {
             throw new IllegalStateException("Custom Slot was not initialized!");
@@ -50,7 +51,18 @@ public abstract class CustomSlot implements Slot {
     }
 
     @Override
-    public boolean isCaptiveFromEmpty() {
+    public final boolean isAllowedCaptive(@NotNull final Player player,
+                                          @NotNull final Menu menu,
+                                          @Nullable final ItemStack itemStack) {
+        if (delegate == null) {
+            throw new IllegalStateException("Custom Slot was not initialized!");
+        }
+
+        return delegate.isAllowedCaptive(player, menu, itemStack);
+    }
+
+    @Override
+    public final boolean isCaptiveFromEmpty() {
         if (delegate == null) {
             throw new IllegalStateException("Custom Slot was not initialized!");
         }
@@ -59,7 +71,7 @@ public abstract class CustomSlot implements Slot {
     }
 
     @Override
-    public final Slot getActionableSlot(@NotNull final Player player,
+    public final @NotNull Slot getActionableSlot(@NotNull final Player player,
                                                  @NotNull final Menu menu) {
         return delegate;
     }

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

@@ -5,6 +5,7 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base class for custom slot implementations.
@@ -29,18 +30,25 @@ public abstract class ReactiveSlot implements Slot {
                                  @NotNull final Menu menu);
 
     @Override
-    public ItemStack getItemStack(@NotNull final Player player) {
-        return new ItemStack(Material.STONE);
+    public @NotNull ItemStack getItemStack(@NotNull final Player player) {
+        return new ItemStack(Material.AIR);
     }
 
     @Override
-    public boolean isCaptive(@NotNull final Player player,
+    public final boolean isCaptive(@NotNull final Player player,
                                    @NotNull final Menu menu) {
         return getSlot(player, menu).isCaptive(player, menu);
     }
 
     @Override
-    public final Slot getActionableSlot(@NotNull final Player player,
+    public final boolean isAllowedCaptive(@NotNull final Player player,
+                                          @NotNull final Menu menu,
+                                          @Nullable final ItemStack itemStack) {
+        return getSlot(player, menu).isAllowedCaptive(player, menu, itemStack);
+    }
+
+    @Override
+    public final @NotNull Slot getActionableSlot(@NotNull final Player player,
                                                  @NotNull final Menu menu) {
         return getSlot(player, menu);
     }

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

@@ -9,6 +9,7 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Function;
 
@@ -30,6 +31,7 @@ public interface Slot extends GUIComponent {
      * @param player The player.
      * @return The ItemStack.
      */
+    @NotNull
     ItemStack getItemStack(@NotNull Player player);
 
     /**
@@ -44,6 +46,20 @@ public interface Slot extends GUIComponent {
         return false;
     }
 
+    /**
+     * If the slot allows a certain item to be placed in it.
+     *
+     * @param player    The player.
+     * @param menu      The menu.
+     * @param itemStack The item; use null if the item is unknown.
+     * @return If captive.
+     */
+    default boolean isAllowedCaptive(@NotNull final Player player,
+                                     @NotNull final Menu menu,
+                                     @Nullable final ItemStack itemStack) {
+        return this.isCaptive(player, menu);
+    }
+
     /**
      * Get the actionable slot to be shown.
      * <p>
@@ -60,6 +76,7 @@ public interface Slot extends GUIComponent {
      * @param menu   The menu.
      * @return The slot.
      */
+    @NotNull
     default Slot getActionableSlot(@NotNull final Player player,
                                    @NotNull final Menu menu) {
         return this;
@@ -125,7 +142,9 @@ public interface Slot extends GUIComponent {
      *
      * @param provider The provider.
      * @return The builder.
+     * @deprecated This method was written incorrectly, should have been a Player + Menu function.
      */
+    @Deprecated(since = "6.45.0", forRemoval = true)
     static SlotBuilder builder(@NotNull final Function<Player, ItemStack> provider) {
         return Eco.get().createSlotBuilder((player, menu) -> provider.apply(player));
     }

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.gui.slot;
 
+import com.willfp.eco.core.gui.slot.functional.CaptiveFilter;
 import com.willfp.eco.core.gui.slot.functional.SlotHandler;
 import com.willfp.eco.core.gui.slot.functional.SlotModifier;
 import com.willfp.eco.core.gui.slot.functional.SlotUpdater;
@@ -143,7 +144,17 @@ public interface SlotBuilder {
      * @param predicate The predicate. Returns true when the slot should not be captive.
      * @return The builder.
      */
-    SlotBuilder notCaptiveFor(@NotNull Predicate<Player> predicate);
+    SlotBuilder notCaptiveFor(@NotNull final Predicate<Player> predicate);
+
+    /**
+     * Set a whitelist for allowed captive items.
+     *
+     * @param filter The filter.
+     * @return The builder.
+     */
+    default SlotBuilder setCaptiveFilter(@NotNull final CaptiveFilter filter) {
+        return this;
+    }
 
     /**
      * Set the ItemStack updater.

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

@@ -0,0 +1,25 @@
+package com.willfp.eco.core.gui.slot.functional;
+
+import com.willfp.eco.core.gui.menu.Menu;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface to test if a captive slot is allowed to contain an item given a player and a menu.
+ */
+@FunctionalInterface
+public interface CaptiveFilter {
+    /**
+     * Get if allowed.
+     *
+     * @param player    The player.
+     * @param menu      The menu.
+     * @param itemStack The item.
+     * @return If captive.
+     */
+    boolean isAllowed(@NotNull Player player,
+                      @NotNull Menu menu,
+                      @Nullable ItemStack itemStack);
+}

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

@@ -0,0 +1,18 @@
+package com.willfp.eco.core.integrations.guidetection;
+
+import com.willfp.eco.core.integrations.Integration;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Wrapper class for GUI integrations.
+ */
+public interface GUIDetectionIntegration extends Integration {
+    /**
+     * Determine if a player is in a GUI.
+     *
+     * @param player The player.
+     * @return If the player is in a GUI.
+     */
+    boolean hasGUIOpen(@NotNull final Player player);
+}

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

@@ -0,0 +1,52 @@
+package com.willfp.eco.core.integrations.guidetection;
+
+import com.willfp.eco.util.MenuUtils;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Class to handle GUI detection.
+ */
+public final class GUIDetectionManager {
+    /**
+     * A set of all registered integrations.
+     */
+    private static final Set<GUIDetectionIntegration> REGISTERED = new HashSet<>();
+
+    /**
+     * Register a new integration.
+     *
+     * @param integration The integration to register.
+     */
+    public static void register(@NotNull final GUIDetectionIntegration integration) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
+        REGISTERED.add(integration);
+    }
+
+    /**
+     * Get if a player is in a GUI.
+     *
+     * @param player The player.
+     * @return If the player has a GUI open.
+     */
+    public static boolean hasGUIOpen(@NotNull final Player player) {
+        if (MenuUtils.getOpenMenu(player) != null) {
+            return true;
+        }
+
+        for (GUIDetectionIntegration integration : REGISTERED) {
+            if (integration.hasGUIOpen(player)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private GUIDetectionManager() {
+        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

@@ -33,10 +33,15 @@ public final class McmmoManager {
      * @return The bonus drop count.
      */
     public static int getBonusDropCount(@NotNull final Block block) {
+        int finalValue = 0;
         for (McmmoIntegration mcmmoIntegration : REGISTERED) {
-            return mcmmoIntegration.getBonusDropCount(block);
+            finalValue += mcmmoIntegration.getBonusDropCount(block);
+            
+
+
+            
         }
-        return 0;
+        return finalValue;
     }
 
     /**
@@ -47,7 +52,10 @@ public final class McmmoManager {
      */
     public static boolean isFake(@NotNull final Event event) {
         for (McmmoIntegration mcmmoIntegration : REGISTERED) {
-            return mcmmoIntegration.isFake(event);
+            if (mcmmoIntegration.isFake(event)) {
+                return true;
+            }
+
         }
         return false;
     }

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

@@ -1,13 +1,16 @@
 package com.willfp.eco.core.integrations.placeholder;
 
+import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.placeholder.AdditionalPlayer;
+import com.willfp.eco.core.placeholder.DynamicPlaceholder;
 import com.willfp.eco.core.placeholder.InjectablePlaceholder;
 import com.willfp.eco.core.placeholder.Placeholder;
 import com.willfp.eco.core.placeholder.PlaceholderInjectable;
+import com.willfp.eco.core.placeholder.PlayerDynamicPlaceholder;
 import com.willfp.eco.core.placeholder.PlayerPlaceholder;
 import com.willfp.eco.core.placeholder.PlayerStaticPlaceholder;
 import com.willfp.eco.core.placeholder.PlayerlessPlaceholder;
@@ -24,6 +27,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
@@ -37,13 +41,20 @@ public final class PlaceholderManager {
     /**
      * All registered placeholders.
      */
-    private static final Map<EcoPlugin, Map<String, Placeholder>> REGISTERED_PLACEHOLDERS = new HashMap<>();
+    private static final Map<EcoPlugin, Map<Pattern, Placeholder>> REGISTERED_PLACEHOLDERS = new HashMap<>();
 
     /**
      * All registered placeholder integrations.
      */
     private static final Set<PlaceholderIntegration> REGISTERED_INTEGRATIONS = new HashSet<>();
 
+    /**
+     * Placeholder Lookup Cache.
+     */
+    private static final Cache<PlaceholderLookup, Optional<Placeholder>> PLACEHOLDER_LOOKUP_CACHE = Caffeine.newBuilder()
+            .expireAfterWrite(1, TimeUnit.SECONDS)
+            .build();
+
     /**
      * Placeholder Cache.
      */
@@ -51,10 +62,22 @@ public final class PlaceholderManager {
             .expireAfterWrite(50, TimeUnit.MILLISECONDS)
             .build(key -> key.entry.getValue(key.player));
 
+    /**
+     * Dynamic Placeholder Cache.
+     */
+    private static final LoadingCache<DynamicEntryWithPlayer, String> DYNAMIC_PLACEHOLDER_CACHE = Caffeine.newBuilder()
+            .expireAfterWrite(50, TimeUnit.MILLISECONDS)
+            .build(key -> key.entry.getValue(key.args, key.player));
+
+    /**
+     * The default PlaceholderAPI pattern; brought in for compatibility.
+     */
+    private static final Pattern PATTERN = Pattern.compile("%([^% ]+)%");
+
     /**
      * Empty injectable object.
      */
-    private static final PlaceholderInjectable EMPTY_INJECTABLE = new PlaceholderInjectable() {
+    public static final PlaceholderInjectable EMPTY_INJECTABLE = new PlaceholderInjectable() {
         @Override
         public void clearInjectedPlaceholders() {
             // Do nothing.
@@ -67,11 +90,6 @@ public final class PlaceholderManager {
         }
     };
 
-    /**
-     * The default PlaceholderAPI pattern; brought in for compatibility.
-     */
-    private static final Pattern PATTERN = Pattern.compile("[%]([^%]+)[%]");
-
     /**
      * Register a new placeholder integration.
      *
@@ -88,14 +106,17 @@ public final class PlaceholderManager {
      * @param placeholder The placeholder to register.
      */
     public static void registerPlaceholder(@NotNull final Placeholder placeholder) {
-        if (placeholder instanceof StaticPlaceholder) {
+        if (placeholder instanceof StaticPlaceholder || placeholder instanceof PlayerStaticPlaceholder) {
             throw new IllegalArgumentException("Static placeholders cannot be registered!");
         }
 
         EcoPlugin plugin = placeholder.getPlugin() == null ? Eco.get().getEcoPlugin() : placeholder.getPlugin();
-        Map<String, Placeholder> pluginPlaceholders = REGISTERED_PLACEHOLDERS
+
+        Map<Pattern, Placeholder> pluginPlaceholders = REGISTERED_PLACEHOLDERS
                 .getOrDefault(plugin, new HashMap<>());
-        pluginPlaceholders.put(placeholder.getIdentifier(), placeholder);
+
+        pluginPlaceholders.put(placeholder.getPattern(), placeholder);
+
         REGISTERED_PLACEHOLDERS.put(plugin, pluginPlaceholders);
     }
 
@@ -136,21 +157,47 @@ public final class PlaceholderManager {
     public static String getResult(@Nullable final Player player,
                                    @NotNull final String identifier,
                                    @Nullable final EcoPlugin plugin) {
+        // This is really janky, and it sucks, but it works so?
+        // Compensating for regex being slow so that's why we get it.
+        Placeholder placeholder = PLACEHOLDER_LOOKUP_CACHE.get(
+                new PlaceholderLookup(identifier, plugin),
+                (it) -> {
                     EcoPlugin owner = plugin == null ? Eco.get().getEcoPlugin() : plugin;
-        Placeholder placeholder = REGISTERED_PLACEHOLDERS.getOrDefault(owner, new HashMap<>()).get(identifier.toLowerCase());
 
-        if (placeholder == null && plugin != null) {
-            Placeholder alternate = REGISTERED_PLACEHOLDERS.getOrDefault(Eco.get().getEcoPlugin(), new HashMap<>())
-                    .get(identifier.toLowerCase());
-            if (alternate != null) {
-                placeholder = alternate;
+                    // I hate the streams API.
+                    Optional<Placeholder> found = REGISTERED_PLACEHOLDERS
+                            .getOrDefault(owner, new HashMap<>())
+                            .entrySet()
+                            .stream().filter(entry -> entry.getKey().matcher(identifier).matches())
+                            .map(Map.Entry::getValue)
+                            .findFirst();
+
+                    if (found.isEmpty() && plugin != null) {
+                        // Here we go again! Something about legacy support? I don't remember.
+                        // I won't touch it though, I'm scared of the placeholder system.
+                        found = REGISTERED_PLACEHOLDERS
+                                .getOrDefault(Eco.get().getEcoPlugin(), new HashMap<>())
+                                .entrySet()
+                                .stream().filter(entry -> entry.getKey().matcher(identifier).matches())
+                                .map(Map.Entry::getValue)
+                                .findFirst();
                     }
+
+                    return found;
                 }
+        ).orElse(null);
 
         if (placeholder == null) {
             return "";
         }
 
+        /*
+        This code here is *really* not very good. It's mega externalized logic hacked
+        together and made worse by the addition of dynamic placeholders. But it works,
+        and it means I don't have to rewrite the whole placeholder system. So it's
+        good enough for me.
+         */
+
         if (placeholder instanceof PlayerPlaceholder playerPlaceholder) {
             if (player == null) {
                 return "";
@@ -159,6 +206,14 @@ public final class PlaceholderManager {
             }
         } else if (placeholder instanceof PlayerlessPlaceholder playerlessPlaceholder) {
             return playerlessPlaceholder.getValue();
+        } else if (placeholder instanceof PlayerDynamicPlaceholder playerDynamicPlaceholder) {
+            if (player == null) {
+                return "";
+            } else {
+                return DYNAMIC_PLACEHOLDER_CACHE.get(new DynamicEntryWithPlayer(playerDynamicPlaceholder, identifier, player));
+            }
+        } else if (placeholder instanceof DynamicPlaceholder dynamicPlaceholder) {
+            return dynamicPlaceholder.getValue(identifier);
         } else {
             return "";
         }
@@ -245,8 +300,10 @@ public final class PlaceholderManager {
         for (PlaceholderIntegration integration : REGISTERED_INTEGRATIONS) {
             processed = integration.translate(processed, player);
         }
+
         for (InjectablePlaceholder injection : context.getPlaceholderInjections()) {
             // Do I know this is a bad way of doing this? Yes.
+            // I know it's deprecated, but it's fast.
             if (injection instanceof StaticPlaceholder placeholder) {
                 processed = processed.replace("%" + placeholder.getIdentifier() + "%", placeholder.getValue());
             } else if (injection instanceof PlayerStaticPlaceholder placeholder && player != null) {
@@ -280,11 +337,22 @@ public final class PlaceholderManager {
         return new ArrayList<>(found);
     }
 
+    private record PlaceholderLookup(@NotNull String identifier,
+                                     @Nullable EcoPlugin plugin) {
+
+    }
+
     private record EntryWithPlayer(@NotNull PlayerPlaceholder entry,
                                    @NotNull Player player) {
 
     }
 
+    private record DynamicEntryWithPlayer(@NotNull PlayerDynamicPlaceholder entry,
+                                          @NotNull String args,
+                                          @NotNull Player player) {
+
+    }
+
     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/ShopIntegration.java

@@ -1,6 +1,8 @@
 package com.willfp.eco.core.integrations.shop;
 
 import com.willfp.eco.core.integrations.Integration;
+import com.willfp.eco.core.price.Price;
+import com.willfp.eco.core.price.impl.PriceFree;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
@@ -29,12 +31,41 @@ public interface ShopIntegration extends Integration {
         return null;
     }
 
+    /**
+     * Get if an item is sellable for a player.
+     *
+     * @param itemStack The item.
+     * @param player    The player.
+     * @return If sellable.
+     */
+    default boolean isSellable(@NotNull final ItemStack itemStack,
+                               @NotNull final Player player) {
+        return false;
+    }
+
+    /**
+     * Get the value of one of an item for a player.
+     * <p>
+     * For example, if you pass in a stack, it will only return the value of <b>one</b> item, not the full stack.
+     *
+     * @param itemStack The item.
+     * @param player    The player.
+     * @return The price.
+     */
+    @NotNull
+    default Price getUnitValue(@NotNull final ItemStack itemStack,
+                               @NotNull final Player player) {
+        return new PriceFree();
+    }
+
     /**
      * Get the price of an item.
      *
      * @param itemStack The item.
      * @return The price.
+     * @deprecated Use getValue instead.
      */
+    @Deprecated(since = "6.47.0", forRemoval = true)
     default double getPrice(@NotNull final ItemStack itemStack) {
         // Do nothing unless overridden.
         return 0.0;
@@ -46,9 +77,11 @@ public interface ShopIntegration extends Integration {
      * @param itemStack The item.
      * @param player    The player.
      * @return The price.
+     * @deprecated Use getValue instead.
      */
+    @Deprecated(since = "6.47.0", forRemoval = true)
     default double getPrice(@NotNull final ItemStack itemStack,
                             @NotNull final Player player) {
-        return getPrice(itemStack);
+        return getUnitValue(itemStack, player).getValue(player);
     }
 }

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

@@ -1,10 +1,9 @@
 package com.willfp.eco.core.integrations.shop;
 
-import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.price.Price;
+import com.willfp.eco.core.price.impl.PriceFree;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -39,12 +38,57 @@ public final class ShopManager {
         }
     }
 
+    /**
+     * Get if an item is sellable for a player.
+     *
+     * @param itemStack The item.
+     * @param player    The player.
+     * @return If sellable.
+     */
+    public static boolean isSellable(@Nullable final ItemStack itemStack,
+                                     @NotNull final Player player) {
+        if (itemStack == null) {
+            return false;
+        }
+
+        for (ShopIntegration integration : REGISTERED) {
+            return integration.isSellable(itemStack, player);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the value of one of an item for a player.
+     * <p>
+     * For example, if you pass in a stack, it will only return the value of <b>one</b> item, not the full stack.
+     *
+     * @param itemStack The item.
+     * @param player    The player.
+     * @return The price.
+     */
+    @NotNull
+    public static Price getUnitValue(@Nullable final ItemStack itemStack,
+                                     @NotNull final Player player) {
+        if (itemStack == null) {
+            return new PriceFree();
+        }
+
+        for (ShopIntegration integration : REGISTERED) {
+            return integration.getUnitValue(itemStack, player);
+        }
+
+        return new PriceFree();
+    }
+
     /**
      * Get the price of an item.
      *
      * @param itemStack The item.
      * @return The price.
+     * @deprecated Use getValue instead. This will always return 0 as prices depend on players.
      */
+    @Deprecated(since = "6.47.0", forRemoval = true)
     public static double getItemPrice(@Nullable final ItemStack itemStack) {
         return getItemPrice(itemStack, null);
     }
@@ -55,19 +99,17 @@ public final class ShopManager {
      * @param itemStack The item.
      * @param player    The player.
      * @return The price.
+     * @deprecated Use getValue instead. Null players / null items will always return 0.
      */
+    @Deprecated(since = "6.47.0", forRemoval = true)
     public static double getItemPrice(@Nullable final ItemStack itemStack,
                                       @Nullable final Player player) {
-        if (itemStack == null) {
+        if (itemStack == null || player == null) {
             return 0.0;
         }
 
         for (ShopIntegration shopIntegration : REGISTERED) {
-            if (player == null) {
-                return shopIntegration.getPrice(itemStack);
-            } else {
-                return shopIntegration.getPrice(itemStack, player);
-            }
+            return shopIntegration.getUnitValue(itemStack, player).getValue(player, itemStack.getAmount());
         }
 
         return 0.0;

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

@@ -1,5 +1,7 @@
 package com.willfp.eco.core.integrations.shop;
 
+import com.willfp.eco.core.price.Price;
+import com.willfp.eco.core.price.impl.PriceEconomy;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
@@ -19,7 +21,12 @@ public class ShopSellEvent extends PlayerEvent {
     /**
      * The sell price.
      */
-    private double price;
+    private Price price;
+
+    /**
+     * The price multiplier.
+     */
+    private double multiplier;
 
     /**
      * The item to be sold.
@@ -33,31 +40,64 @@ public class ShopSellEvent extends PlayerEvent {
      * @param who   The player.
      * @param price The price.
      * @param item  The item.
+     * @deprecated Use the price system instead.
      */
+    @Deprecated(since = "6.47.0", forRemoval = true)
     public ShopSellEvent(@NotNull final Player who,
                          final double price,
                          @Nullable final ItemStack item) {
+        this(who, new PriceEconomy(price), item);
+    }
+
+    /**
+     * Create new shop sell event.
+     *
+     * @param who   The player.
+     * @param price The price.
+     * @param item  The item.
+     */
+    public ShopSellEvent(@NotNull final Player who,
+                         @NotNull final Price price,
+                         @Nullable final ItemStack item) {
+        this(who, price, item, 1.0);
+    }
+
+    /**
+     * Create new shop sell event.
+     *
+     * @param who        The player.
+     * @param price      The price.
+     * @param item       The item.
+     * @param multiplier The multiplier.
+     */
+    public ShopSellEvent(@NotNull final Player who,
+                         @NotNull final Price price,
+                         @Nullable final ItemStack item,
+                         final double multiplier) {
         super(who);
 
         this.price = price;
         this.item = item;
+
+        this.multiplier = multiplier;
     }
 
     /**
-     * Get the price.
+     * Get the value.
      *
-     * @return The price.
+     * @return The value.
      */
-    public double getPrice() {
+    @NotNull
+    public Price getValue() {
         return this.price;
     }
 
     /**
-     * Set the price.
+     * Set the value.
      *
-     * @param price The price.
+     * @param price The value.
      */
-    public void setPrice(final double price) {
+    public void setValue(@NotNull final Price price) {
         this.price = price;
     }
 
@@ -81,6 +121,46 @@ public class ShopSellEvent extends PlayerEvent {
         return item != null;
     }
 
+    /**
+     * Get the price multiplier.
+     *
+     * @return The multiplier.
+     */
+    public double getMultiplier() {
+        return multiplier;
+    }
+
+    /**
+     * Set the price multiplier.
+     *
+     * @param multiplier The multiplier.
+     */
+    public void setMultiplier(final double multiplier) {
+        this.multiplier = multiplier;
+    }
+
+    /**
+     * Get the price.
+     *
+     * @return The price.
+     * @deprecated Use the price system instead.
+     */
+    @Deprecated(since = "6.47.0", forRemoval = true)
+    public double getPrice() {
+        return this.getValue().getValue(player);
+    }
+
+    /**
+     * Set the price.
+     *
+     * @param price The price.
+     * @deprecated Use the price system instead.
+     */
+    @Deprecated(since = "6.47.0", forRemoval = true)
+    public void setPrice(final double price) {
+        this.setValue(new PriceEconomy(price));
+    }
+
     /**
      * Bukkit parity.
      *

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

@@ -25,6 +25,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -86,6 +87,11 @@ public final class Items {
      */
     private static final TestableItem EMPTY_TESTABLE_ITEM = new EmptyTestableItem();
 
+    /**
+     * Friendly material names (without underscores, etc.)
+     */
+    private static final Map<String, Material> FRIENDLY_MATERIAL_NAMES = new HashMap<>();
+
     /**
      * Register a new custom item.
      *
@@ -216,7 +222,7 @@ public final class Items {
             if (isWildcard) {
                 itemType = itemType.substring(1);
             }
-            Material material = Material.getMaterial(itemType.toUpperCase());
+            Material material = FRIENDLY_MATERIAL_NAMES.get(itemType.toLowerCase());
             if (material == null || material == Material.AIR) {
                 return new EmptyTestableItem();
             }
@@ -565,4 +571,25 @@ public final class Items {
     private Items() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }
+
+    static {
+        for (Material material : Material.values()) {
+            FRIENDLY_MATERIAL_NAMES.put(material.name().toLowerCase(), material);
+
+            String oneWord = material.name().toLowerCase().replace("_", "");
+            if (!FRIENDLY_MATERIAL_NAMES.containsKey(oneWord)) {
+                FRIENDLY_MATERIAL_NAMES.put(oneWord, material);
+            }
+
+            String plural = material.name().toLowerCase() + "s";
+            if (!FRIENDLY_MATERIAL_NAMES.containsKey(plural)) {
+                FRIENDLY_MATERIAL_NAMES.put(plural, material);
+            }
+
+            String oneWordPlural = oneWord + "s";
+            if (!FRIENDLY_MATERIAL_NAMES.containsKey(oneWordPlural)) {
+                FRIENDLY_MATERIAL_NAMES.put(oneWordPlural, material);
+            }
+        }
+    }
 }

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

@@ -14,7 +14,6 @@ import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
@@ -71,7 +70,7 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
 
     @Override
     public U setAmount(final int amount) {
-        Validate.isTrue(amount >= 1 && amount <= base.getMaxStackSize());
+        Validate.isTrue(amount >= 1);
         base.setAmount(amount);
         return (U) this;
     }

eco-api/src/main/java/com/willfp/eco/core/math/MathContext.java

@@ -0,0 +1,63 @@
+package com.willfp.eco.core.math;
+
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
+import com.willfp.eco.core.placeholder.AdditionalPlayer;
+import com.willfp.eco.core.placeholder.PlaceholderInjectable;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * Represents a context to do math in.
+ *
+ * @param injectableContext The PlaceholderInjectable context.
+ * @param player            The player.
+ * @param additionalPlayers The additional players.
+ */
+public record MathContext(
+        @NotNull PlaceholderInjectable injectableContext,
+        @Nullable Player player,
+        @NotNull Collection<AdditionalPlayer> additionalPlayers
+) {
+    /**
+     * Empty math context.
+     */
+    public static final MathContext EMPTY = new MathContext(
+            PlaceholderManager.EMPTY_INJECTABLE,
+            null,
+            Collections.emptyList()
+    );
+
+    /**
+     * Create MathContext of a PlaceholderInjectable context.
+     *
+     * @param injectableContext The PlaceholderInjectable context.
+     * @return The MathContext.
+     */
+    public static MathContext of(@NotNull final PlaceholderInjectable injectableContext) {
+        return new MathContext(
+                injectableContext,
+                null,
+                Collections.emptyList()
+        );
+    }
+
+    /**
+     * Copy a MathContext with a player.
+     *
+     * @param context The context.
+     * @param player  The player.
+     * @return The new MathContext.
+     */
+    public static MathContext copyWithPlayer(@NotNull final MathContext context,
+                                             @Nullable final Player player) {
+        return new MathContext(
+                context.injectableContext(),
+                player,
+                context.additionalPlayers()
+        );
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/packet/Packet.java

@@ -0,0 +1,21 @@
+package com.willfp.eco.core.packet;
+
+import com.willfp.eco.core.Eco;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a packet.
+ *
+ * @param handle The NMS handle.
+ */
+public record Packet(@NotNull Object handle) {
+    /**
+     * Send to a player.
+     *
+     * @param player The player.
+     */
+    void send(@NotNull final Player player) {
+        Eco.get().sendPacket(player, this);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/packet/PacketEvent.java

@@ -0,0 +1,67 @@
+package com.willfp.eco.core.packet;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a packet being sent or received.
+ */
+public class PacketEvent implements Cancellable {
+    /**
+     * The packet.
+     */
+    private final Packet packet;
+
+    /**
+     * The player.
+     */
+    private final Player player;
+
+    /**
+     * If the event should be cancelled.
+     */
+    private boolean cancelled = false;
+
+    /**
+     * Create a new packet event.
+     *
+     * @param packet The packet.
+     * @param player The player.
+     */
+    public PacketEvent(@NotNull final Packet packet,
+                       @NotNull final Player player) {
+        this.packet = packet;
+        this.player = player;
+    }
+
+    /**
+     * Get the packet.
+     *
+     * @return The packet.
+     */
+    @NotNull
+    public Packet getPacket() {
+        return packet;
+    }
+
+    /**
+     * Get the player.
+     *
+     * @return The player.
+     */
+    @NotNull
+    public Player getPlayer() {
+        return player;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/packet/PacketListener.java

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.packet;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Listens to packets.
+ */
+public interface PacketListener {
+    /**
+     * Called when a handle is sent.
+     *
+     * @param event The event.
+     */
+    default void onSend(@NotNull final PacketEvent event) {
+        // Override when needed.
+    }
+
+    /**
+     * Called when a handle is received.
+     *
+     * @param event The event.
+     */
+    default void onReceive(@NotNull final PacketEvent event) {
+        // Override when needed.
+    }
+
+    /**
+     * Get the priority of the listener.
+     *
+     * @return The priority.
+     */
+    default PacketPriority getPriority() {
+        return PacketPriority.NORMAL;
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/packet/PacketPriority.java

@@ -0,0 +1,31 @@
+package com.willfp.eco.core.packet;
+
+/**
+ * The priority (order) of packet listeners.
+ */
+public enum PacketPriority {
+    /**
+     * Ran first.
+     */
+    LOWEST,
+
+    /**
+     * Ran second.
+     */
+    LOW,
+
+    /**
+     * Ran third.
+     */
+    NORMAL,
+
+    /**
+     * Ran fourth.
+     */
+    HIGH,
+
+    /**
+     * Ran last.
+     */
+    HIGHEST
+}

eco-api/src/main/java/com/willfp/eco/core/particle/ParticleFactory.java

@@ -0,0 +1,28 @@
+package com.willfp.eco.core.particle;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * Create particles.
+ */
+public interface ParticleFactory {
+    /**
+     * Get the names (how the particle looks in lookup strings).
+     * <p>
+     * For example, for RGB particles this would be 'rgb', 'color', etc.
+     *
+     * @return The allowed names.
+     */
+    @NotNull List<String> getNames();
+
+    /**
+     * Create the particle
+     *
+     * @param key The key.
+     * @return The particle.
+     */
+    @Nullable SpawnableParticle create(@NotNull String key);
+}

eco-api/src/main/java/com/willfp/eco/core/particle/Particles.java

@@ -0,0 +1,83 @@
+package com.willfp.eco.core.particle;
+
+import com.willfp.eco.core.particle.impl.EmptyParticle;
+import com.willfp.eco.core.particle.impl.SimpleParticle;
+import com.willfp.eco.util.StringUtils;
+import org.bukkit.Particle;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Class to manage particles.
+ */
+public final class Particles {
+    /**
+     * All factories.
+     */
+    private static final Map<String, ParticleFactory> FACTORIES = new ConcurrentHashMap<>();
+
+    /**
+     * Register a new particle factory.
+     *
+     * @param factory The factory.
+     */
+    public static void registerParticleFactory(@NotNull final ParticleFactory factory) {
+        for (String name : factory.getNames()) {
+            FACTORIES.put(name.toLowerCase(), factory);
+        }
+    }
+
+    /**
+     * Lookup a particle from a string.
+     * <p>
+     * A particle string should look like {@code magic}, {@code rgb:00ff00}
+     *
+     * @param key The key.
+     * @return The particle, or an {@link EmptyParticle} if invalid.
+     */
+    @NotNull
+    public static SpawnableParticle lookup(@NotNull final String key) {
+        String[] args = StringUtils.parseTokens(key.toLowerCase());
+
+        if (args.length == 0) {
+            return new EmptyParticle();
+        }
+
+        SpawnableParticle spawnableParticle;
+
+        String[] split = args[0].split(":");
+
+        if (split.length == 1) {
+            try {
+                Particle particle = Particle.valueOf(args[0].toUpperCase());
+                spawnableParticle = new SimpleParticle(particle);
+            } catch (IllegalArgumentException e) {
+                spawnableParticle = new EmptyParticle();
+            }
+        } else if (split.length == 2) {
+            String name = split[0];
+            String factoryKey = split[1];
+
+            ParticleFactory factory = FACTORIES.get(name);
+            if (factory == null) {
+                spawnableParticle = new EmptyParticle();
+            } else {
+                spawnableParticle = factory.create(factoryKey);
+            }
+        } else {
+            return new EmptyParticle();
+        }
+
+        if (spawnableParticle == null || spawnableParticle instanceof EmptyParticle) {
+            return new EmptyParticle();
+        }
+
+        return spawnableParticle;
+    }
+
+    private Particles() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/particle/SpawnableParticle.java

@@ -0,0 +1,27 @@
+package com.willfp.eco.core.particle;
+
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A particle that can be spawned.
+ */
+public interface SpawnableParticle {
+    /**
+     * Spawn the particle at a location.
+     *
+     * @param location The location.
+     * @param amount   The amount to spawn.
+     */
+    void spawn(@NotNull Location location,
+               int amount);
+
+    /**
+     * Spawn the particle at a location.
+     *
+     * @param location The location.
+     */
+    default void spawn(@NotNull Location location) {
+        spawn(location, 1);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/particle/impl/EmptyParticle.java

@@ -0,0 +1,16 @@
+package com.willfp.eco.core.particle.impl;
+
+import com.willfp.eco.core.particle.SpawnableParticle;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Empty (invalid) particle that is spawned when an invalid key is provided.
+ */
+public final class EmptyParticle implements SpawnableParticle {
+    @Override
+    public void spawn(@NotNull final Location location,
+                      final int amount) {
+        // Do nothing.
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/particle/impl/SimpleParticle.java

@@ -0,0 +1,38 @@
+package com.willfp.eco.core.particle.impl;
+
+import com.willfp.eco.core.particle.SpawnableParticle;
+import org.bukkit.Location;
+import org.bukkit.Particle;
+import org.bukkit.World;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Empty (invalid) particle that is spawned when an invalid key is provided.
+ */
+public final class SimpleParticle implements SpawnableParticle {
+    /**
+     * The particle to be spawned.
+     */
+    private final Particle particle;
+
+    /**
+     * Create a new spawnable particle.
+     *
+     * @param particle The particle.
+     */
+    public SimpleParticle(@NotNull final Particle particle) {
+        this.particle = particle;
+    }
+
+    @Override
+    public void spawn(@NotNull final Location location,
+                      final int amount) {
+        World world = location.getWorld();
+
+        if (world == null) {
+            return;
+        }
+
+        world.spawnParticle(particle, location, amount, 0, 0, 0, 0, null);
+    }
+}

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

@@ -0,0 +1,102 @@
+package com.willfp.eco.core.placeholder;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+
+/**
+ * A placeholder that does not require a player and supports dynamic styles.
+ */
+public final class DynamicPlaceholder implements Placeholder {
+    /**
+     * The placeholder pattern.
+     */
+    private final Pattern pattern;
+
+    /**
+     * The function to retrieve the output of the placeholder.
+     */
+    private final Function<String, String> function;
+
+    /**
+     * The plugin for the placeholder.
+     */
+    private final EcoPlugin plugin;
+
+    /**
+     * Create a new dynamic placeholder.
+     *
+     * @param plugin   The plugin.
+     * @param pattern  The pattern.
+     * @param function The function to retrieve the value.
+     */
+    public DynamicPlaceholder(@NotNull final EcoPlugin plugin,
+                              @NotNull final Pattern pattern,
+                              @NotNull final Function<String, String> function) {
+        this.plugin = plugin;
+        this.pattern = pattern;
+        this.function = function;
+    }
+
+    /**
+     * Get the value of the placeholder.
+     *
+     * @param args The args.
+     * @return The value.
+     */
+    @NotNull
+    public String getValue(@NotNull final String args) {
+        return function.apply(args);
+    }
+
+    /**
+     * Register the placeholder.
+     *
+     * @return The placeholder.
+     */
+    public DynamicPlaceholder register() {
+        PlaceholderManager.registerPlaceholder(this);
+        return this;
+    }
+
+    @Override
+    public @NotNull EcoPlugin getPlugin() {
+        return this.plugin;
+    }
+
+    @Override
+    @Deprecated
+    public @NotNull String getIdentifier() {
+        return "dynamic";
+    }
+
+    @NotNull
+    @Override
+    public Pattern getPattern() {
+        return this.pattern;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        if (!(o instanceof DynamicPlaceholder that)) {
+            return false;
+        }
+
+        return Objects.equals(this.getPattern(), that.getPattern())
+                && Objects.equals(this.getPlugin(), that.getPlugin());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getIdentifier(), this.getPlugin());
+    }
+}

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

@@ -2,13 +2,14 @@ package com.willfp.eco.core.placeholder;
 
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Placeholders that can be injected into {@link PlaceholderInjectable} objects.
  */
 public sealed interface InjectablePlaceholder extends Placeholder permits PlayerStaticPlaceholder, StaticPlaceholder {
     @Override
-    default EcoPlugin getPlugin() {
+    default @NotNull EcoPlugin getPlugin() {
         return Eco.get().getEcoPlugin();
     }
 }

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

@@ -1,16 +1,22 @@
 package com.willfp.eco.core.placeholder;
 
 import com.willfp.eco.core.EcoPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.regex.Pattern;
 
 /**
  * A placeholder represents a string that can hold a value.
  */
-public sealed interface Placeholder permits PlayerPlaceholder, PlayerlessPlaceholder, InjectablePlaceholder {
+public sealed interface Placeholder permits PlayerPlaceholder, PlayerlessPlaceholder,
+        DynamicPlaceholder, PlayerDynamicPlaceholder, InjectablePlaceholder {
     /**
      * Get the plugin that holds the placeholder.
      *
      * @return The plugin.
      */
+    @Nullable
     EcoPlugin getPlugin();
 
     /**
@@ -18,5 +24,16 @@ public sealed interface Placeholder permits PlayerPlaceholder, PlayerlessPlaceho
      *
      * @return The identifier.
      */
+    @NotNull
     String getIdentifier();
+
+    /**
+     * Get the pattern for the placeholder.
+     *
+     * @return The pattern.
+     */
+    @NotNull
+    default Pattern getPattern() {
+        return Pattern.compile(this.getIdentifier());
+    }
 }

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

@@ -0,0 +1,105 @@
+package com.willfp.eco.core.placeholder;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.function.BiFunction;
+import java.util.regex.Pattern;
+
+/**
+ * A placeholder that does not require a player and supports dynamic styles.
+ */
+public final class PlayerDynamicPlaceholder implements Placeholder {
+    /**
+     * The placeholder pattern.
+     */
+    private final Pattern pattern;
+
+    /**
+     * The function to retrieve the output of the placeholder.
+     */
+    private final BiFunction<String, Player, String> function;
+
+    /**
+     * The plugin for the placeholder.
+     */
+    private final EcoPlugin plugin;
+
+    /**
+     * Create a new dynamic placeholder.
+     *
+     * @param plugin   The plugin.
+     * @param pattern  The pattern.
+     * @param function The function to retrieve the value.
+     */
+    public PlayerDynamicPlaceholder(@NotNull final EcoPlugin plugin,
+                                    @NotNull final Pattern pattern,
+                                    @NotNull final BiFunction<String, Player, String> function) {
+        this.plugin = plugin;
+        this.pattern = pattern;
+        this.function = function;
+    }
+
+    /**
+     * Get the value of the placeholder.
+     *
+     * @param args   The args.
+     * @param player The player.
+     * @return The value.
+     */
+    @NotNull
+    public String getValue(@NotNull final String args,
+                           @NotNull final Player player) {
+        return function.apply(args, player);
+    }
+
+    /**
+     * Register the placeholder.
+     *
+     * @return The placeholder.
+     */
+    public PlayerDynamicPlaceholder register() {
+        PlaceholderManager.registerPlaceholder(this);
+        return this;
+    }
+
+    @Override
+    public @NotNull EcoPlugin getPlugin() {
+        return this.plugin;
+    }
+
+    @Override
+    @Deprecated
+    public @NotNull String getIdentifier() {
+        return "dynamic";
+    }
+
+    @NotNull
+    @Override
+    public Pattern getPattern() {
+        return this.pattern;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        if (!(o instanceof PlayerDynamicPlaceholder that)) {
+            return false;
+        }
+
+        return Objects.equals(this.getPattern(), that.getPattern())
+                && Objects.equals(this.getPlugin(), that.getPlugin());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getIdentifier(), this.getPlugin());
+    }
+}

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

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.function.Function;
+import java.util.regex.Pattern;
 
 /**
  * A placeholder that requires a player.
@@ -18,6 +19,11 @@ public final class PlayerPlaceholder implements Placeholder {
      */
     private final String identifier;
 
+    /**
+     * The placeholder pattern.
+     */
+    private final Pattern pattern;
+
     /**
      * The function to retrieve the output of the placeholder given a player.
      */
@@ -40,6 +46,7 @@ public final class PlayerPlaceholder implements Placeholder {
                              @NotNull final Function<Player, String> function) {
         this.plugin = plugin;
         this.identifier = identifier;
+        this.pattern = Pattern.compile(identifier);
         this.function = function;
     }
 
@@ -49,6 +56,7 @@ public final class PlayerPlaceholder implements Placeholder {
      * @param player The player.
      * @return The value.
      */
+    @NotNull
     public String getValue(@NotNull final Player player) {
         return function.apply(player);
     }
@@ -64,15 +72,21 @@ public final class PlayerPlaceholder implements Placeholder {
     }
 
     @Override
-    public EcoPlugin getPlugin() {
+    public @NotNull EcoPlugin getPlugin() {
         return this.plugin;
     }
 
     @Override
-    public String getIdentifier() {
+    public @NotNull String getIdentifier() {
         return this.identifier;
     }
 
+    @NotNull
+    @Override
+    public Pattern getPattern() {
+        return this.pattern;
+    }
+
     @Override
     public boolean equals(@Nullable final Object o) {
         if (this == o) {

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

@@ -6,6 +6,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.function.Function;
+import java.util.regex.Pattern;
 
 /**
  * A placeholder that cannot be registered, and exists purely in injection.
@@ -16,6 +17,11 @@ public final class PlayerStaticPlaceholder implements InjectablePlaceholder {
      */
     private final String identifier;
 
+    /**
+     * The placeholder pattern.
+     */
+    private final Pattern pattern;
+
     /**
      * The function to retrieve the output of the placeholder.
      */
@@ -30,6 +36,7 @@ public final class PlayerStaticPlaceholder implements InjectablePlaceholder {
     public PlayerStaticPlaceholder(@NotNull final String identifier,
                                    @NotNull final Function<Player, String> function) {
         this.identifier = identifier;
+        this.pattern = Pattern.compile(identifier);
         this.function = function;
     }
 
@@ -39,15 +46,22 @@ public final class PlayerStaticPlaceholder implements InjectablePlaceholder {
      * @param player The player.
      * @return The value.
      */
+    @NotNull
     public String getValue(@NotNull final Player player) {
         return function.apply(player);
     }
 
     @Override
-    public String getIdentifier() {
+    public @NotNull String getIdentifier() {
         return this.identifier;
     }
 
+    @NotNull
+    @Override
+    public Pattern getPattern() {
+        return this.pattern;
+    }
+
     @Override
     public boolean equals(@Nullable final Object o) {
         if (this == o) {

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

@@ -7,16 +7,22 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.regex.Pattern;
 
 /**
  * A placeholder that does not require a player.
  */
 public final class PlayerlessPlaceholder implements Placeholder {
     /**
-     * The name of the placeholder.
+     * The placeholder identifier.
      */
     private final String identifier;
 
+    /**
+     * The placeholder pattern.
+     */
+    private final Pattern pattern;
+
     /**
      * The function to retrieve the output of the placeholder.
      */
@@ -39,6 +45,7 @@ public final class PlayerlessPlaceholder implements Placeholder {
                                  @NotNull final Supplier<String> function) {
         this.plugin = plugin;
         this.identifier = identifier;
+        this.pattern = Pattern.compile(identifier);
         this.function = function;
     }
 
@@ -62,15 +69,21 @@ public final class PlayerlessPlaceholder implements Placeholder {
     }
 
     @Override
-    public EcoPlugin getPlugin() {
+    public @NotNull EcoPlugin getPlugin() {
         return this.plugin;
     }
 
     @Override
-    public String getIdentifier() {
+    public @NotNull String getIdentifier() {
         return this.identifier;
     }
 
+    @NotNull
+    @Override
+    public Pattern getPattern() {
+        return this.pattern;
+    }
+
     @Override
     public boolean equals(@Nullable final Object o) {
         if (this == o) {

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

@@ -5,6 +5,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.regex.Pattern;
 
 /**
  * A placeholder that cannot be registered, and exists purely in injection.
@@ -15,6 +16,11 @@ public final class StaticPlaceholder implements InjectablePlaceholder {
      */
     private final String identifier;
 
+    /**
+     * The placeholder pattern.
+     */
+    private final Pattern pattern;
+
     /**
      * The function to retrieve the output of the placeholder.
      */
@@ -29,6 +35,7 @@ public final class StaticPlaceholder implements InjectablePlaceholder {
     public StaticPlaceholder(@NotNull final String identifier,
                              @NotNull final Supplier<String> function) {
         this.identifier = identifier;
+        this.pattern = Pattern.compile(identifier);
         this.function = function;
     }
 
@@ -37,15 +44,22 @@ public final class StaticPlaceholder implements InjectablePlaceholder {
      *
      * @return The value.
      */
+    @NotNull
     public String getValue() {
         return function.get();
     }
 
     @Override
-    public String getIdentifier() {
+    public @NotNull String getIdentifier() {
         return this.identifier;
     }
 
+    @NotNull
+    @Override
+    public Pattern getPattern() {
+        return this.pattern;
+    }
+
     @Override
     public boolean equals(@Nullable final Object o) {
         if (this == o) {