Finished up ChatComponent

Bump ProtocolLib from 4.6.0-SNAPSHOT to 4.7.1-SNAPSHOT

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.gitignore

@@ -14,6 +14,7 @@ bin/
 # Gradle
 .gradle
 **/build/
+**/out/
 !eco-api/src/**/build/
 .gradletasknamecache
 !gradle-wrapper.jar

README.md

@@ -16,7 +16,7 @@
 # Information for development
 
 ## Javadoc
-The 6.0.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.0.0/javadoc/)
+The 6.8.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.8.0/javadoc/)
 
 ## Plugin Information
 
@@ -31,7 +31,6 @@ depend:
 eco is available from any of these places:
 
 - [GitHub](https://github.com/Auxilor/eco/releases)
-- [Spigot](https://www.spigotmc.org/resources/eco.87955/)
 - [Polymart](https://polymart.org/resource/eco.773)
 - [Build it locally](https://github.com/Auxilor/eco#build-locally).
 
@@ -72,7 +71,7 @@ Maven:
 </dependency>
 ```
 
-Replace `Tag` with a release tag for eco, eg `6.0.0`.
+Replace `Tag` with a release tag for eco, eg `6.8.0`.
 
 ## Build locally:
 
@@ -99,7 +98,7 @@ Here's a list of some (not all) of the features of eco:
     - ArmorEquipEvent
     - EntityDeathByEntityEvent
     - NaturalExpGainEvent
-- Plugin extensions (Plugins for plugins)
+- Plugin extensions (com.willfp.eco.internal.Plugins for plugins)
 - GUI System
 - Integration system for external plugins
     - Anticheat support
@@ -158,8 +157,12 @@ Here's a list of some (not all) of the features of eco:
 
 <h1 align="center">
   <br>
+    <a href="http://gamersupps.gg/discount/Auxilor?afmc=Auxilor" target="_blank">
+      <img src="https://i.imgur.com/uFDpBAC.png" alt="supps banner">
+    </a>
     <a href="https://dedimc.promo/Auxilor" target="_blank">
       <img src="https://i.imgur.com/zdDLhFA.png" alt="dedimc banner">
     </a>
   <br>
 </h1>
+

build.gradle

@@ -7,7 +7,11 @@ plugins {
 
 dependencies {
     implementation project(":eco-api")
-    implementation project(":eco-core").getSubprojects()
+    implementation project(":eco-core:core-plugin")
+    implementation project(":eco-core:core-proxy")
+    implementation project(":eco-core:core-backend")
+    implementation project(":eco-core:core-nms:v1_16_R3")
+    implementation project(path: ":eco-core:core-nms:v1_17_R1", configuration: 'mapped')
 }
 
 allprojects {
@@ -53,10 +57,14 @@ allprojects {
         compileOnly 'org.jetbrains:annotations:19.0.0'
 
         // Lombok
-        compileOnly 'org.projectlombok:lombok:1.18.20'
+        compileOnly 'org.projectlombok:lombok:1.18.22'
         annotationProcessor 'org.projectlombok:lombok:1.18.20'
         testCompileOnly 'org.projectlombok:lombok:1.18.20'
         testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
+
+        // Test
+        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
     }
 
     tasks.withType(JavaCompile) {
@@ -75,7 +83,8 @@ allprojects {
     }
 
     shadowJar {
-        relocate('org.bstats.bukkit', 'com.willfp.eco.shaded.bstats')
+        relocate('org.bstats', 'com.willfp.eco.shaded.bstats')
+        relocate('net.kyori.adventure.text.minimessage', 'com.willfp.eco.shaded.minimessage')
     }
 
     jar {
@@ -92,6 +101,18 @@ allprojects {
         withSourcesJar()
     }
 
+    test {
+        useJUnitPlatform()
+
+        // Always run tests, even when nothing changed.
+        dependsOn cleanTest
+
+        // Show test results.
+        testLogging {
+            events "passed", "skipped", "failed"
+        }
+    }
+
     compileJava.options.encoding = 'UTF-8'
     compileJava.dependsOn clean
 

config/checkstyle/checkstyle.xml

@@ -45,7 +45,7 @@
     -->
     <property name="severity" value="error"/>
 
-    <property name="fileExtensions" value="java, properties, xml"/>
+    <property name="fileExtensions" value="java, properties, xml, kt"/>
 
     <!-- Excludes all 'module-info.java' files              -->
     <!-- See https://checkstyle.org/config_filefilters.html -->
@@ -66,6 +66,7 @@
     <module name="FileLength"/>
     <module name="LineLength">
         <property name="fileExtensions" value="java"/>
+        <property name="fileExtensions" value="kt"/>
         <property name="max" value="200"/>
     </module>
 

eco-api/build.gradle

@@ -6,10 +6,17 @@ group 'com.willfp'
 version rootProject.version
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
+    // Adventure
+    compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
+    compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
+    compileOnly 'net.kyori:adventure-api:4.9.1'
+    compileOnly 'net.kyori:adventure-text-serializer-gson:4.9.2'
+    compileOnly 'net.kyori:adventure-text-serializer-legacy:4.8.1'
+
+    // Other
+    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
     compileOnly 'org.apache.maven:maven-artifact:3.0.3'
-    compileOnly 'org.bstats:bstats-bukkit:1.7'
-    compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.0-SNAPSHOT'
+    compileOnly 'com.comphenix.protocol:ProtocolLib:4.7.1-SNAPSHOT'
     compileOnly 'com.google.code.gson:gson:2.8.7'
 }
 
@@ -17,8 +24,6 @@ java {
     withJavadocJar()
 }
 
-compileJava.options.encoding = 'UTF-8'
-compileJava.dependsOn clean
 
 build.dependsOn publishToMavenLocal
 

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

@@ -20,7 +20,6 @@ import com.willfp.eco.core.web.UpdateChecker;
 import lombok.Getter;
 import org.apache.commons.lang.Validate;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.Listener;
@@ -52,9 +51,10 @@ import java.util.stream.Collectors;
  * <b>IMPORTANT: When reloading a plugin, all runnables / tasks will
  * be cancelled.</b>
  */
+@SuppressWarnings("unused")
 public abstract class EcoPlugin extends JavaPlugin {
     /**
-     * The spigot resource ID of the plugin.
+     * The polymart resource ID of the plugin.
      */
     @Getter
     private final int resourceId;
@@ -169,14 +169,14 @@ public abstract class EcoPlugin extends JavaPlugin {
     private final ProxyFactory proxyFactory;
 
     /**
-     * Create a new plugin without a specified color, proxy support, spigot, or bStats.
+     * Create a new plugin without a specified color, proxy support, polymart, or bStats.
      */
     protected EcoPlugin() {
         this("&f");
     }
 
     /**
-     * Create a new plugin without proxy support, spigot, or bStats.
+     * Create a new plugin without proxy support, polymart, or bStats.
      *
      * @param color The color.
      */
@@ -186,7 +186,7 @@ public abstract class EcoPlugin extends JavaPlugin {
 
 
     /**
-     * Create a new plugin unlinked to spigot and bStats.
+     * Create a new plugin unlinked to polymart and bStats.
      *
      * @param proxyPackage The package where proxy implementations are stored.
      * @param color        The color of the plugin (used in messages, using standard formatting)
@@ -199,7 +199,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     /**
      * Create a new plugin without proxy or extension support.
      *
-     * @param resourceId The spigot resource ID for the plugin.
+     * @param resourceId The polymart resource ID for the plugin.
      * @param bStatsId   The bStats resource ID for the plugin.
      * @param color      The color of the plugin (used in messages, using standard formatting)
      */
@@ -212,7 +212,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     /**
      * Create a new plugin without proxy support.
      *
-     * @param resourceId           The spigot resource ID for the plugin.
+     * @param resourceId           The polymart resource ID for the plugin.
      * @param bStatsId             The bStats resource ID for the plugin.
      * @param color                The color of the plugin (used in messages, using standard formatting)
      * @param supportingExtensions If the plugin supports extensions.
@@ -227,7 +227,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     /**
      * Create a new plugin without extension support.
      *
-     * @param resourceId   The spigot resource ID for the plugin.
+     * @param resourceId   The polymart resource ID for the plugin.
      * @param bStatsId     The bStats resource ID for the plugin.
      * @param proxyPackage The package where proxy implementations are stored.
      * @param color        The color of the plugin (used in messages, using standard formatting)
@@ -242,7 +242,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     /**
      * Create a new plugin.
      *
-     * @param resourceId           The spigot resource ID for the plugin.
+     * @param resourceId           The polymart resource ID for the plugin.
      * @param bStatsId             The bStats resource ID for the plugin.
      * @param proxyPackage         The package where proxy implementations are stored.
      * @param color                The color of the plugin (used in messages, using standard formatting)
@@ -305,10 +305,27 @@ public abstract class EcoPlugin extends JavaPlugin {
         this.logger = Eco.getHandler().createLogger(this);
         this.proxyFactory = this.proxyPackage.equalsIgnoreCase("") ? null : Eco.getHandler().createProxyFactory(this);
 
-        this.langYml = new LangYml(this);
-        this.configYml = new ConfigYml(this);
+        this.langYml = this.createLangYml();
+        this.configYml = this.createConfigYml();
 
         Eco.getHandler().addNewPlugin(this);
+
+        /*
+        The minimum eco version check was moved here because it's very common
+        to add a lot of code in the constructor of plugins; meaning that the plugin
+        can throw errors without it being obvious to the user that the reason is
+        because they have an outdated version of eco installed.
+         */
+
+        DefaultArtifactVersion runningVersion = new DefaultArtifactVersion(Eco.getHandler().getEcoPlugin().getDescription().getVersion());
+        DefaultArtifactVersion requiredVersion = new DefaultArtifactVersion(this.getMinimumEcoVersion());
+        if (!(runningVersion.compareTo(requiredVersion) > 0 || runningVersion.equals(requiredVersion))) {
+            this.getLogger().severe("You are running an outdated version of eco!");
+            this.getLogger().severe("You must be on at least" + this.getMinimumEcoVersion());
+            this.getLogger().severe("Download the newest version here:");
+            this.getLogger().severe("https://polymart.org/download/773/recent/JSpprMspkuyecf5y1wQ2Jn8OoLQSQ_IW");
+            Bukkit.getPluginManager().disablePlugin(this);
+        }
     }
 
     /**
@@ -336,29 +353,22 @@ public abstract class EcoPlugin extends JavaPlugin {
             });
         }
 
-        DefaultArtifactVersion runningVersion = new DefaultArtifactVersion(Eco.getHandler().getEcoPlugin().getDescription().getVersion());
-        DefaultArtifactVersion requiredVersion = new DefaultArtifactVersion(this.getMinimumEcoVersion());
-        if (!(runningVersion.compareTo(requiredVersion) > 0 || runningVersion.equals(requiredVersion))) {
-            this.getLogger().severe("You are running an outdated version of eco!");
-            this.getLogger().severe("You must be on at least" + this.getMinimumEcoVersion());
-            this.getLogger().severe("Download the newest version here:");
-            this.getLogger().severe("https://polymart.org/download/773/recent/JSpprMspkuyecf5y1wQ2Jn8OoLQSQ_IW");
-            Bukkit.getPluginManager().disablePlugin(this);
-        }
-
         if (this.getBStatsId() != 0) {
-            new Metrics(this, this.getBStatsId());
+            Eco.getHandler().registerBStats(this);
         }
 
-        Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(Plugin::getName).collect(Collectors.toSet());
+        Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins())
+                .map(Plugin::getName)
+                .map(String::toLowerCase)
+                .collect(Collectors.toSet());
 
-        if (enabledPlugins.contains("PlaceholderAPI")) {
+        if (enabledPlugins.contains("PlaceholderAPI".toLowerCase())) {
             this.loadedIntegrations.add("PlaceholderAPI");
             PlaceholderManager.addIntegration(Eco.getHandler().createPAPIIntegration(this));
         }
 
         this.loadIntegrationLoaders().forEach((integrationLoader -> {
-            if (enabledPlugins.contains(integrationLoader.getPluginName())) {
+            if (enabledPlugins.contains(integrationLoader.getPluginName().toLowerCase())) {
                 this.loadedIntegrations.add(integrationLoader.getPluginName());
                 integrationLoader.load();
             }
@@ -405,7 +415,6 @@ public abstract class EcoPlugin extends JavaPlugin {
 
         this.getEventManager().unregisterAllListeners();
         this.getScheduler().cancelAll();
-        this.getConfigHandler().saveAllConfigs();
 
         this.handleDisable();
 
@@ -464,7 +473,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     }
 
     /**
-     * Default code to be executed on plugin reload.
+     * Reload the plugin.
      */
     public final void reload() {
         this.getConfigHandler().updateConfigs();
@@ -476,6 +485,19 @@ public abstract class EcoPlugin extends JavaPlugin {
         this.handleReload();
     }
 
+    /**
+     * Reload the plugin and return the time taken to reload.
+     *
+     * @return The time.
+     */
+    public final long reloadWithTime() {
+        long startTime = System.currentTimeMillis();
+
+        this.reload();
+
+        return System.currentTimeMillis() - startTime;
+    }
+
     /**
      * The plugin-specific code to be executed on enable.
      * <p>
@@ -559,6 +581,28 @@ public abstract class EcoPlugin extends JavaPlugin {
      */
     protected abstract List<Listener> loadListeners();
 
+    /**
+     * Useful for custom LangYml implementations.
+     * <p>
+     * Override if needed.
+     *
+     * @return lang.yml.
+     */
+    protected LangYml createLangYml() {
+        return new LangYml(this);
+    }
+
+    /**
+     * Useful for custom ConfigYml implementations.
+     * <p>
+     * Override if needed.
+     *
+     * @return config.yml.
+     */
+    protected ConfigYml createConfigYml() {
+        return new ConfigYml(this);
+    }
+
     /**
      * Create the display module for the plugin.
      *
@@ -601,7 +645,7 @@ public abstract class EcoPlugin extends JavaPlugin {
      * @param <T>        The proxy type.
      * @return The proxy.
      */
-    public <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxyClass) {
+    public final <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxyClass) {
         Validate.notNull(proxyFactory, "Plugin does not support proxy!");
 
         return proxyFactory.getProxy(proxyClass);

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

@@ -8,12 +8,17 @@ import com.willfp.eco.core.extensions.ExtensionLoader;
 import com.willfp.eco.core.factory.MetadataValueFactory;
 import com.willfp.eco.core.factory.NamespacedKeyFactory;
 import com.willfp.eco.core.factory.RunnableFactory;
+import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.core.gui.GUIFactory;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderIntegration;
 import com.willfp.eco.core.proxy.Cleaner;
 import com.willfp.eco.core.proxy.ProxyFactory;
+import com.willfp.eco.core.requirement.RequirementFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.logging.Logger;
@@ -28,6 +33,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The scheduler.
      */
+    @NotNull
     Scheduler createScheduler(@NotNull EcoPlugin plugin);
 
     /**
@@ -36,6 +42,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The event manager.
      */
+    @NotNull
     EventManager createEventManager(@NotNull EcoPlugin plugin);
 
     /**
@@ -44,6 +51,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The factory.
      */
+    @NotNull
     NamespacedKeyFactory createNamespacedKeyFactory(@NotNull EcoPlugin plugin);
 
     /**
@@ -52,6 +60,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The factory.
      */
+    @NotNull
     MetadataValueFactory createMetadataValueFactory(@NotNull EcoPlugin plugin);
 
     /**
@@ -60,6 +69,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The factory.
      */
+    @NotNull
     RunnableFactory createRunnableFactory(@NotNull EcoPlugin plugin);
 
     /**
@@ -68,6 +78,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The factory.
      */
+    @NotNull
     ExtensionLoader createExtensionLoader(@NotNull EcoPlugin plugin);
 
     /**
@@ -76,6 +87,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The handler.
      */
+    @NotNull
     ConfigHandler createConfigHandler(@NotNull EcoPlugin plugin);
 
     /**
@@ -84,6 +96,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The logger.
      */
+    @NotNull
     Logger createLogger(@NotNull EcoPlugin plugin);
 
     /**
@@ -92,6 +105,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The integration.
      */
+    @NotNull
     PlaceholderIntegration createPAPIIntegration(@NotNull EcoPlugin plugin);
 
     /**
@@ -100,6 +114,7 @@ public interface Handler {
      * @param plugin The plugin.
      * @return The factory.
      */
+    @NotNull
     ProxyFactory createProxyFactory(@NotNull EcoPlugin plugin);
 
     /**
@@ -107,6 +122,7 @@ public interface Handler {
      *
      * @return The plugin.
      */
+    @NotNull
     EcoPlugin getEcoPlugin();
 
     /**
@@ -114,6 +130,7 @@ public interface Handler {
      *
      * @return The factory.
      */
+    @NotNull
     ConfigFactory getConfigFactory();
 
     /**
@@ -121,6 +138,7 @@ public interface Handler {
      *
      * @return The factory.
      */
+    @NotNull
     DropQueueFactory getDropQueueFactory();
 
     /**
@@ -128,6 +146,7 @@ public interface Handler {
      *
      * @return The factory.
      */
+    @NotNull
     GUIFactory getGUIFactory();
 
     /**
@@ -135,6 +154,7 @@ public interface Handler {
      *
      * @return The cleaner.
      */
+    @NotNull
     Cleaner getCleaner();
 
     /**
@@ -150,6 +170,7 @@ public interface Handler {
      * @param name The name.
      * @return The plugin.
      */
+    @Nullable
     EcoPlugin getPluginByName(@NotNull String name);
 
     /**
@@ -157,5 +178,38 @@ public interface Handler {
      *
      * @return A list of plugin names in lowercase.
      */
+    @NotNull
     List<String> getLoadedPlugins();
+
+    /**
+     * Create a FastItemStack.
+     *
+     * @param itemStack The base ItemStack.
+     * @return The FastItemStack.
+     */
+    @NotNull
+    FastItemStack createFastItemStack(@NotNull ItemStack itemStack);
+
+    /**
+     * Register bStats metrics.
+     *
+     * @param plugin The plugin.
+     */
+    void registerBStats(@NotNull EcoPlugin plugin);
+
+    /**
+     * Get the requirement factory.
+     *
+     * @return The factory.
+     */
+    @NotNull
+    RequirementFactory getRequirementFactory();
+
+    /**
+     * Get Adventure audiences.
+     *
+     * @return The audiences.
+     */
+    @Nullable
+    BukkitAudiences getAdventure();
 }

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

@@ -9,11 +9,12 @@ import org.jetbrains.annotations.NotNull;
  *
  * @param <T> The eco plugin type.
  */
-public abstract class PluginDependent<T extends EcoPlugin> {
+public abstract class PluginDependent<@NotNull T extends EcoPlugin> {
     /**
      * The {@link EcoPlugin} that is stored.
      */
     @Getter(AccessLevel.PROTECTED)
+    @NotNull
     private final T plugin;
 
     /**

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_VAULT = new Prerequisite(
+            () -> ClassUtils.exists("net.milkbowl.vault.economy.Economy"),
+            "Requires server to have vault"
+    );
+
     /**
      * Requires the server to be running 1.17.
      */

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

@@ -42,10 +42,24 @@ public interface CommandBase {
      */
     CommandHandler getHandler();
 
+    /**
+     * Set the handler.
+     *
+     * @param handler The handler.
+     */
+    void setHandler(@NotNull CommandHandler handler);
+
     /**
      * Get the tab completer.
      *
      * @return The tab completer.
      */
     TabCompleteHandler getTabCompleter();
+
+    /**
+     * Set the tab completer.
+     *
+     * @param handler The handler.
+     */
+    void setTabCompleter(@NotNull TabCompleteHandler handler);
 }

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

@@ -7,6 +7,7 @@ import com.willfp.eco.core.command.CommandHandler;
 import com.willfp.eco.core.command.TabCompleteHandler;
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
@@ -48,6 +49,20 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
     @Getter
     private final boolean playersOnly;
 
+    /**
+     * The actual code to be executed in the command.
+     */
+    @Getter
+    @Setter
+    private CommandHandler handler = (sender, args) -> { };
+
+    /**
+     * The tab completion code to be executed in the command.
+     */
+    @Getter
+    @Setter
+    private TabCompleteHandler tabCompleter = (sender, args) -> new ArrayList<>();
+
     /**
      * All subcommands for the command.
      */
@@ -164,14 +179,6 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
         return this.getTabCompleter().tabComplete(sender, Arrays.asList(args));
     }
 
-    @Override
-    public abstract CommandHandler getHandler();
-
-    @Override
-    public TabCompleteHandler getTabCompleter() {
-        return (sender, args) -> new ArrayList<>();
-    }
-
     /**
      * If a sender can execute the command.
      *

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

@@ -2,6 +2,7 @@ package com.willfp.eco.core.config.base;
 
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.config.yaml.YamlBaseConfig;
+import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -42,6 +43,18 @@ public class LangYml extends YamlBaseConfig {
      * @return The message with a prefix appended.
      */
     public String getMessage(@NotNull final String message) {
-        return getPrefix() + this.getString("messages." + message);
+        return getMessage(message, StringUtils.FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Get a chat message.
+     *
+     * @param message The key of the message.
+     * @param option  The format options.
+     * @return The message with a prefix appended.
+     */
+    public String getMessage(@NotNull final String message,
+                             @NotNull final StringUtils.FormatOption option) {
+        return getPrefix() + this.getString("messages." + message, option);
     }
 }

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.config.interfaces;
 
+import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -165,7 +166,9 @@ public interface Config extends Cloneable {
      * @return The found value, or an empty string if not found.
      */
     @NotNull
-    String getString(@NotNull String path);
+    default String getString(@NotNull String path) {
+        return getString(path, true);
+    }
 
     /**
      * Get a string from config.
@@ -175,8 +178,36 @@ public interface Config extends Cloneable {
      * @return The found value, or an empty string if not found.
      */
     @NotNull
+    default String getString(@NotNull String path,
+                             boolean format) {
+        return this.getString(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Get a string from config.
+     *
+     * @param path   The key to fetch the value from.
+     * @param option The format option.
+     * @return The found value, or an empty string if not found.
+     */
+    @NotNull
+    default String getString(@NotNull String path,
+                             @NotNull final StringUtils.FormatOption option) {
+        return this.getString(path, true, option);
+    }
+
+    /**
+     * Get a string from config.
+     *
+     * @param path   The key to fetch the value from.
+     * @param format If the string should be formatted.
+     * @param option The format option.
+     * @return The found value, or an empty string if not found.
+     */
+    @NotNull
     String getString(@NotNull String path,
-                     boolean format);
+                     boolean format,
+                     @NotNull StringUtils.FormatOption option);
 
     /**
      * Get a string from config.
@@ -185,7 +216,9 @@ public interface Config extends Cloneable {
      * @return The found value, or null if not found.
      */
     @Nullable
-    String getStringOrNull(@NotNull String path);
+    default String getStringOrNull(@NotNull String path) {
+        return getStringOrNull(path, true);
+    }
 
     /**
      * Get a string from config.
@@ -195,8 +228,36 @@ public interface Config extends Cloneable {
      * @return The found value, or null if not found.
      */
     @Nullable
+    default String getStringOrNull(@NotNull String path,
+                                   boolean format) {
+        return this.getStringOrNull(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Get a string from config.
+     *
+     * @param path   The key to fetch the value from.
+     * @param option The format option.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    default String getStringOrNull(@NotNull String path,
+                                   @NotNull StringUtils.FormatOption option) {
+        return this.getStringOrNull(path, true, option);
+    }
+
+    /**
+     * Get a string from config.
+     *
+     * @param path   The key to fetch the value from.
+     * @param format If the string should be formatted.
+     * @param option The format option.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
     String getStringOrNull(@NotNull String path,
-                           boolean format);
+                           boolean format,
+                           @NotNull StringUtils.FormatOption option);
 
     /**
      * Get a list of strings from config.
@@ -207,7 +268,9 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<String> getStrings(@NotNull String path);
+    default List<String> getStrings(@NotNull String path) {
+        return getStrings(path, true);
+    }
 
     /**
      * Get a list of strings from config.
@@ -217,8 +280,36 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
+    default List<String> getStrings(@NotNull String path,
+                                    boolean format) {
+        return this.getStrings(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Get a list of strings from config.
+     *
+     * @param path   The key to fetch the value from.
+     * @param option The format option.
+     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
+     */
+    @Nullable
+    default List<String> getStrings(@NotNull String path,
+                                    @NotNull StringUtils.FormatOption option) {
+        return getStrings(path, true, option);
+    }
+
+    /**
+     * Get a list of strings from config.
+     *
+     * @param path   The key to fetch the value from.
+     * @param format If the strings should be formatted.
+     * @param option The option.
+     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
+     */
+    @NotNull
     List<String> getStrings(@NotNull String path,
-                            boolean format);
+                            boolean format,
+                            @NotNull StringUtils.FormatOption option);
 
     /**
      * Get a list of strings from config.
@@ -227,7 +318,9 @@ public interface Config extends Cloneable {
      * @return The found value, or null if not found.
      */
     @Nullable
-    List<String> getStringsOrNull(@NotNull String path);
+    default List<String> getStringsOrNull(@NotNull String path) {
+        return getStringsOrNull(path, true);
+    }
 
     /**
      * Get a list of strings from config.
@@ -237,8 +330,36 @@ public interface Config extends Cloneable {
      * @return The found value, or null if not found.
      */
     @Nullable
+    default List<String> getStringsOrNull(@NotNull String path,
+                                          boolean format) {
+        return getStringsOrNull(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Get a list of strings from config.
+     *
+     * @param path   The key to fetch the value from.
+     * @param option The format option.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    default List<String> getStringsOrNull(@NotNull String path,
+                                          @NotNull StringUtils.FormatOption option) {
+        return getStringsOrNull(path, true, option);
+    }
+
+    /**
+     * Get a list of strings from config.
+     *
+     * @param path   The key to fetch the value from.
+     * @param format If the strings should be formatted.
+     * @param option The format option.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
     List<String> getStringsOrNull(@NotNull String path,
-                                  boolean format);
+                                  boolean format,
+                                  @NotNull StringUtils.FormatOption option);
 
     /**
      * Get a decimal from config.

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

@@ -29,6 +29,27 @@ public interface JSONConfig extends Config {
     @Nullable
     List<JSONConfig> getSubsectionsOrNull(@NotNull String path);
 
+
+    /**
+     * Get subsection from config.
+     *
+     * @param path The key to check.
+     * @return The subsection. Throws NPE if not found.
+     */
+    @Override
+    @NotNull
+    JSONConfig getSubsection(@NotNull String path);
+
+    /**
+     * Get subsection from config.
+     *
+     * @param path The key to check.
+     * @return The subsection, or null if not found.
+     */
+    @Override
+    @Nullable
+    JSONConfig getSubsectionOrNull(@NotNull String path);
+
     @Override
     JSONConfig clone();
 }

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

@@ -0,0 +1,54 @@
+package com.willfp.eco.core.config.json;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.config.json.wrapper.LoadableJSONConfigWrapper;
+import com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Config implementation for configs present in the plugin's base directory (eg config.json).
+ * <p>
+ * Automatically updates.
+ */
+public abstract class JSONBaseConfig extends LoadableJSONConfigWrapper {
+    /**
+     * @param configName      The name of the config
+     * @param removeUnused    Whether keys not present in the default config should be removed on update.
+     * @param plugin          The plugin.
+     * @param updateBlacklist Substring of keys to not add/remove keys for.
+     */
+    protected JSONBaseConfig(@NotNull final String configName,
+                             final boolean removeUnused,
+                             @NotNull final EcoPlugin plugin,
+                             @NotNull final String... updateBlacklist) {
+        super(
+                Eco.getHandler().getConfigFactory().createUpdatableJSONConfig(
+                        configName,
+                        plugin,
+                        "",
+                        plugin.getClass(),
+                        removeUnused, updateBlacklist
+                )
+        );
+    }
+
+    /**
+     * @param configName   The name of the config
+     * @param removeUnused Whether keys not present in the default config should be removed on update.
+     * @param plugin       The plugin.
+     */
+    protected JSONBaseConfig(@NotNull final String configName,
+                             final boolean removeUnused,
+                             @NotNull final EcoPlugin plugin) {
+        super(
+                Eco.getHandler().getConfigFactory().createUpdatableJSONConfig(
+                        configName,
+                        plugin,
+                        "",
+                        plugin.getClass(),
+                        removeUnused
+                )
+        );
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.willfp.eco.core.config.json;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.config.json.wrapper.LoadableJSONConfigWrapper;
+import com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Config implementation for configs present in one of two places:
+ * <ul>
+ *     <li>Plugin base directory (eg config.yml, lang.yml)</li>
+ *     <li>Other extension's configs</li>
+ * </ul>
+ * <p>
+ * Automatically updates.
+ */
+public abstract class JSONExtendableConfig extends LoadableJSONConfigWrapper {
+    /**
+     * @param configName       The name of the config
+     * @param removeUnused     Whether keys not present in the default config should be removed on update.
+     * @param plugin           The plugin.
+     * @param updateBlacklist  Substring of keys to not add/remove keys for.
+     * @param subDirectoryPath The subdirectory path.
+     * @param source           The class that owns the resource.
+     */
+    protected JSONExtendableConfig(@NotNull final String configName,
+                                   final boolean removeUnused,
+                                   @NotNull final EcoPlugin plugin,
+                                   @NotNull final Class<?> source,
+                                   @NotNull final String subDirectoryPath,
+                                   @NotNull final String... updateBlacklist) {
+        super(
+                Eco.getHandler().getConfigFactory().createUpdatableJSONConfig(
+                        configName,
+                        plugin,
+                        subDirectoryPath,
+                        source,
+                        removeUnused,
+                        updateBlacklist
+                )
+        );
+    }
+}

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

@@ -31,6 +31,16 @@ public abstract class JSONConfigWrapper extends ConfigWrapper<JSONConfig> implem
         return this.getHandle().getSubsectionsOrNull(path);
     }
 
+    @Override
+    public @NotNull JSONConfig getSubsection(@NotNull final String path) {
+        return this.getHandle().getSubsection(path);
+    }
+
+    @Override
+    public @Nullable JSONConfig getSubsectionOrNull(@NotNull final String path) {
+        return this.getHandle().getSubsectionOrNull(path);
+    }
+
     @Override
     public JSONConfig clone() {
         return this.getHandle().clone();

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

@@ -30,6 +30,24 @@ public interface ConfigFactory {
                                      boolean removeUnused,
                                      @NotNull String... updateBlacklist);
 
+    /**
+     * Updatable config.
+     *
+     * @param configName       The name of the config
+     * @param plugin           The plugin.
+     * @param subDirectoryPath The subdirectory path.
+     * @param source           The class that owns the resource.
+     * @param removeUnused     Whether keys not present in the default config should be removed on update.
+     * @param updateBlacklist  Substring of keys to not add/remove keys for.
+     * @return The config implementation.
+     */
+    JSONConfig createUpdatableJSONConfig(@NotNull String configName,
+                                         @NotNull EcoPlugin plugin,
+                                         @NotNull String subDirectoryPath,
+                                         @NotNull Class<?> source,
+                                         boolean removeUnused,
+                                         @NotNull String... updateBlacklist);
+
     /**
      * JSON loadable config.
      *

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

@@ -1,6 +1,7 @@
 package com.willfp.eco.core.config.wrapper;
 
 import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.util.StringUtils;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -125,48 +126,33 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getBoolsOrNull(path);
     }
 
-    @Override
-    public @NotNull String getString(@NotNull final String path) {
-        return handle.getString(path);
-    }
 
     @Override
     public @NotNull String getString(@NotNull final String path,
-                                     final boolean format) {
-        return handle.getString(path, format);
-    }
-
-    @Override
-    public @Nullable String getStringOrNull(@NotNull final String path) {
-        return handle.getStringOrNull(path);
+                                     final boolean format,
+                                     @NotNull final StringUtils.FormatOption option) {
+        return handle.getString(path, format, option);
     }
 
     @Override
     public @Nullable String getStringOrNull(@NotNull final String path,
-                                            final boolean format) {
-        return handle.getStringOrNull(path, format);
-    }
-
-    @Override
-    public @NotNull List<String> getStrings(@NotNull final String path) {
-        return handle.getStrings(path);
+                                            final boolean format,
+                                            @NotNull final StringUtils.FormatOption option) {
+        return handle.getStringOrNull(path, format, option);
     }
 
     @Override
     public @NotNull List<String> getStrings(@NotNull final String path,
-                                            final boolean format) {
-        return handle.getStrings(path, format);
-    }
-
-    @Override
-    public @Nullable List<String> getStringsOrNull(@NotNull final String path) {
-        return handle.getStringsOrNull(path);
+                                            final boolean format,
+                                            @NotNull final StringUtils.FormatOption option) {
+        return handle.getStrings(path, format, option);
     }
 
     @Override
     public @Nullable List<String> getStringsOrNull(@NotNull final String path,
-                                                   final boolean format) {
-        return handle.getStringsOrNull(path, format);
+                                                   final boolean format,
+                                                   @NotNull final StringUtils.FormatOption option) {
+        return handle.getStringsOrNull(path, format, option);
     }
 
     @Override

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

@@ -1,19 +1,11 @@
 package com.willfp.eco.core.display;
 
 import lombok.experimental.UtilityClass;
-import org.apache.commons.lang.Validate;
-import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Utility class to manage client-side item display.
@@ -26,29 +18,9 @@ public class Display {
     public static final String PREFIX = "§z";
 
     /**
-     * All registered display modules.
+     * The display handler.
      */
-    private static final Map<DisplayPriority, List<DisplayModule>> MODULES = new HashMap<>();
-
-    /**
-     * NamespacedKey for finalizing.
-     */
-    private static NamespacedKey finalizeKey = null;
-
-    /**
-     * Register display module.
-     *
-     * @param module The module.
-     */
-    public void registerDisplayModule(@NotNull final DisplayModule module) {
-        List<DisplayModule> modules = MODULES.get(module.getPriority());
-
-        modules.removeIf(module1 -> module1.getPluginName().equalsIgnoreCase(module.getPluginName()));
-
-        modules.add(module);
-
-        MODULES.put(module.getPriority(), modules);
-    }
+    public static DisplayHandler handler = null;
 
     /**
      * Display on ItemStacks.
@@ -57,36 +29,19 @@ public class Display {
      * @return The ItemStack.
      */
     public ItemStack display(@NotNull final ItemStack itemStack) {
-        if (!itemStack.hasItemMeta()) {
-            return itemStack; // return early if there's no customization of the item
+        return display(itemStack, null);
     }
 
-        Map<String, Object[]> pluginVarArgs = new HashMap<>();
-
-        for (DisplayPriority priority : DisplayPriority.values()) {
-            List<DisplayModule> modules = MODULES.get(priority);
-            for (DisplayModule module : modules) {
-                pluginVarArgs.put(module.getPluginName(), module.generateVarArgs(itemStack));
-            }
-        }
-
-        revert(itemStack);
-
-        ItemMeta meta = itemStack.getItemMeta();
-
-        if (meta == null) {
-            return itemStack;
-        }
-
-        for (DisplayPriority priority : DisplayPriority.values()) {
-            List<DisplayModule> modules = MODULES.get(priority);
-            for (DisplayModule module : modules) {
-                Object[] varargs = pluginVarArgs.get(module.getPluginName());
-                module.display(itemStack, varargs);
-            }
-        }
-
-        return itemStack;
+    /**
+     * Display on ItemStacks.
+     *
+     * @param itemStack The item.
+     * @param player    The player.
+     * @return The ItemStack.
+     */
+    public ItemStack display(@NotNull final ItemStack itemStack,
+                             @Nullable final Player player) {
+        return handler.display(itemStack, player);
     }
 
     /**
@@ -96,7 +51,19 @@ public class Display {
      * @return The ItemStack.
      */
     public ItemStack displayAndFinalize(@NotNull final ItemStack itemStack) {
-        return finalize(display(itemStack));
+        return finalize(display(itemStack, null));
+    }
+
+    /**
+     * Display on ItemStacks and then finalize.
+     *
+     * @param itemStack The item.
+     * @param player    The player.
+     * @return The ItemStack.
+     */
+    public ItemStack displayAndFinalize(@NotNull final ItemStack itemStack,
+                                        @Nullable final Player player) {
+        return finalize(display(itemStack, player));
     }
 
     /**
@@ -106,35 +73,7 @@ public class Display {
      * @return The ItemStack.
      */
     public ItemStack revert(@NotNull final ItemStack itemStack) {
-        if (Display.isFinalized(itemStack)) {
-            unfinalize(itemStack);
-        }
-
-        if (!itemStack.hasItemMeta()) {
-            return itemStack;
-        }
-
-        ItemMeta meta = itemStack.getItemMeta();
-
-        if (meta == null) {
-            return itemStack;
-        }
-
-        List<String> lore = meta.getLore();
-
-        if (lore != null && lore.removeIf(line -> line.startsWith(Display.PREFIX))) { // only apply lore modification if needed
-            meta.setLore(lore);
-            itemStack.setItemMeta(meta);
-        }
-
-        for (DisplayPriority priority : DisplayPriority.values()) {
-            List<DisplayModule> modules = MODULES.get(priority);
-            for (DisplayModule module : modules) {
-                module.revert(itemStack);
-            }
-        }
-
-        return itemStack;
+        return handler.revert(itemStack);
     }
 
     /**
@@ -144,21 +83,7 @@ public class Display {
      * @return The ItemStack.
      */
     public ItemStack finalize(@NotNull final ItemStack itemStack) {
-        Validate.notNull(finalizeKey, "Key cannot be null!");
-
-        if (itemStack.getType().getMaxStackSize() > 1) {
-            return itemStack;
-        }
-
-        ItemMeta meta = itemStack.getItemMeta();
-        if (meta == null) {
-            return itemStack;
-        }
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        container.set(finalizeKey, PersistentDataType.INTEGER, 1);
-        itemStack.setItemMeta(meta);
-        return itemStack;
+        return handler.finalize(itemStack);
     }
 
     /**
@@ -168,18 +93,7 @@ public class Display {
      * @return The ItemStack.
      */
     public ItemStack unfinalize(@NotNull final ItemStack itemStack) {
-        Validate.notNull(finalizeKey, "Key cannot be null!");
-
-        ItemMeta meta = itemStack.getItemMeta();
-
-        if (meta == null) {
-            return itemStack;
-        }
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        container.remove(finalizeKey);
-        itemStack.setItemMeta(meta);
-        return itemStack;
+        return handler.unfinalize(itemStack);
     }
 
     /**
@@ -189,31 +103,61 @@ public class Display {
      * @return If finalized.
      */
     public boolean isFinalized(@NotNull final ItemStack itemStack) {
-        Validate.notNull(finalizeKey, "Key cannot be null!");
-
-        ItemMeta meta = itemStack.getItemMeta();
-
-        if (meta == null) {
-            return false;
-        }
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        return container.has(finalizeKey, PersistentDataType.INTEGER);
+        return handler.isFinalized(itemStack);
     }
 
     /**
-     * Set key to be used for finalization.
+     * Register a new display module.
      *
-     * @param finalizeKey The key.
+     * @param module The module.
      */
-    @ApiStatus.Internal
-    public static void setFinalizeKey(@NotNull final NamespacedKey finalizeKey) {
-        Display.finalizeKey = finalizeKey;
+    public void registerDisplayModule(@NotNull final DisplayModule module) {
+        handler.registerDisplayModule(module);
     }
 
-    static {
-        for (DisplayPriority priority : DisplayPriority.values()) {
-            MODULES.put(priority, new ArrayList<>());
+    /**
+     * Initialize the display system.
+     *
+     * @param handler The handler.
+     */
+    @ApiStatus.Internal
+    public static void init(@NotNull final DisplayHandler handler) {
+        if (Display.handler != null) {
+            throw new IllegalArgumentException("Already Initialized!");
+        }
+        Display.handler = handler;
+    }
+
+    /**
+     * Extremely janky method - also internal, so don't use it. <b>This method is
+     * NOT part of the API and may be removed at any time!</b>
+     * <p>
+     * This calls a display module with the specified parameters, now
+     * you might ask why I need a static java method when the DisplayHandler
+     * implementation could just call it itself? Well, kotlin doesn't really
+     * like dealing with vararg ambiguity, and so while kotlin can't figure out
+     * what is and isn't a vararg when I call display with a player, java can.
+     * <p>
+     * Because of this, I need to have this part of the code in java.
+     *
+     * <b>Don't call this method as part of your plugins!</b>
+     * <p>
+     * No, seriously - don't. This skips a bunch of checks and you'll almost
+     * definitely break something.
+     *
+     * @param module    The display module.
+     * @param itemStack The ItemStack.
+     * @param player    The player.
+     * @param args      The args.
+     */
+    @ApiStatus.Internal
+    public static void callDisplayModule(@NotNull final DisplayModule module,
+                                         @NotNull final ItemStack itemStack,
+                                         @Nullable final Player player,
+                                         @NotNull final Object... args) {
+        module.display(itemStack, args);
+        if (player != null) {
+            module.display(itemStack, player, args);
         }
     }
 }

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

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

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

@@ -3,8 +3,10 @@ package com.willfp.eco.core.display;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.PluginDependent;
 import lombok.Getter;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Class for all plugin-specific client-side item display modules.
@@ -34,7 +36,20 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      * @param itemStack The item.
      * @param args      Optional args for display.
      */
-    protected void display(@NotNull final ItemStack itemStack,
+    public void display(@NotNull final ItemStack itemStack,
+                        @NotNull final Object... args) {
+        // Technically optional.
+    }
+
+    /**
+     * Display an item.
+     *
+     * @param itemStack The item.
+     * @param player    The player.
+     * @param args      Optional args for display.
+     */
+    public void display(@NotNull final ItemStack itemStack,
+                        @Nullable final Player player,
                         @NotNull final Object... args) {
         // Technically optional.
     }
@@ -44,7 +59,7 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      *
      * @param itemStack The item.
      */
-    protected void revert(@NotNull final ItemStack itemStack) {
+    public void revert(@NotNull final ItemStack itemStack) {
         // Technically optional.
     }
 
@@ -54,7 +69,7 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      * @param itemStack The itemStack.
      * @return The plugin-specific varargs.
      */
-    protected Object[] generateVarArgs(@NotNull final ItemStack itemStack) {
+    public Object[] generateVarArgs(@NotNull final ItemStack itemStack) {
         return new Object[0];
     }
 

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

@@ -0,0 +1,70 @@
+package com.willfp.eco.core.events;
+
+import lombok.Getter;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * The armor change event <b>does</b> contain information about the event.
+ * <p>
+ * Unlike {@link ArmorEquipEvent}, it is called the next tick and contains previous and current armor contents.
+ */
+public class ArmorChangeEvent extends PlayerEvent {
+    /**
+     * Bukkit parity.
+     */
+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * The armor contents before. 0 is helmet, 3 is boots.
+     */
+    @Getter
+    private final List<ItemStack> before;
+
+    /**
+     * The armor contents after. 0 is helmet, 3 is boots.
+     */
+    @Getter
+    private final List<ItemStack> after;
+
+    /**
+     * Create a new ArmorChangeEvent.
+     *
+     * @param player The player.
+     * @param before The armor contents before.
+     * @param after The armor contents after.
+     */
+    public ArmorChangeEvent(@NotNull final Player player,
+                            @NotNull final List<ItemStack> before,
+                            @NotNull final List<ItemStack> after) {
+        super(player);
+        this.before = before;
+        this.after = after;
+    }
+
+    /**
+     * Gets a list of handlers handling this event.
+     *
+     * @return A list of handlers handling this event.
+     */
+
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Bukkit parity.
+     *
+     * @return The handler list.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+}

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

@@ -13,8 +13,13 @@ import org.jetbrains.annotations.NotNull;
  * <p>
  * The event is called before the player's inventory actually updates,
  * so you can check a tick later to see the new contents.
+ *
+ * @see ArmorChangeEvent
  */
 public class ArmorEquipEvent extends PlayerEvent {
+    /**
+     * Bukkit parity.
+     */
     private static final HandlerList HANDLERS = new HandlerList();
 
     /**

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

@@ -0,0 +1,113 @@
+package com.willfp.eco.core.fast;
+
+import com.willfp.eco.core.Eco;
+import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemFlag;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * FastItemStack contains methods to modify and read items faster than in default bukkit.
+ */
+public interface FastItemStack {
+    /**
+     * Get all enchantments on an item.
+     *
+     * @param checkStored If stored NBT should also be checked.
+     * @return A map of all enchantments.
+     */
+    Map<Enchantment, Integer> getEnchantmentsOnItem(boolean checkStored);
+
+    /**
+     * Get the level of an enchantment on an item.
+     *
+     * @param enchantment The enchantment.
+     * @param checkStored If the stored NBT should also be checked.
+     * @return The enchantment level, or 0 if not found.
+     */
+    int getLevelOnItem(@NotNull Enchantment enchantment,
+                       boolean checkStored);
+
+    /**
+     * Set the item lore.
+     *
+     * @param lore The lore.
+     */
+    void setLore(@Nullable List<String> lore);
+
+    /**
+     * Get the item lore.
+     *
+     * @return The lore.
+     */
+    List<String> getLore();
+
+
+    /**
+     * Set the rework penalty.
+     *
+     * @param cost The rework penalty to set.
+     */
+    void setRepairCost(int cost);
+
+    /**
+     * Get the rework penalty.
+     * .
+     *
+     * @return The rework penalty found on the item.
+     */
+    int getRepairCost();
+
+    /**
+     * Add ItemFlags.
+     *
+     * @param hideFlags The flags.
+     */
+    void addItemFlags(ItemFlag... hideFlags);
+
+    /**
+     * Remove ItemFlags.
+     *
+     * @param hideFlags The flags.
+     */
+    void removeItemFlags(ItemFlag... hideFlags);
+
+    /**
+     * Get the ItemFlags.
+     *
+     * @return The flags.
+     */
+    Set<ItemFlag> getItemFlags();
+
+    /**
+     * Test the item for a flag.
+     *
+     * @param flag The flag.
+     * @return If the flag is present.
+     */
+    boolean hasItemFlag(ItemFlag flag);
+
+    /**
+     * Get the Bukkit ItemStack again.
+     *
+     * @return The ItemStack.
+     */
+    ItemStack unwrap();
+
+    /**
+     * Wrap an ItemStack to create a FastItemStack.
+     *
+     * @param itemStack The ItemStack.
+     * @return The FastItemStack.
+     */
+    static FastItemStack wrap(final ItemStack itemStack) {
+        return Eco.getHandler().createFastItemStack(Objects.requireNonNullElseGet(itemStack, () -> new ItemStack(Material.AIR)));
+    }
+}

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

@@ -2,12 +2,10 @@ package com.willfp.eco.core.gui;
 
 import com.willfp.eco.core.gui.menu.MenuBuilder;
 import com.willfp.eco.core.gui.slot.SlotBuilder;
-import org.bukkit.entity.Player;
+import com.willfp.eco.core.gui.slot.functional.SlotProvider;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.function.Function;
-
 /**
  * Internal component used by {@link com.willfp.eco.core.gui.menu.Menu#builder(int)}
  * and {@link com.willfp.eco.core.gui.slot.Slot#builder(ItemStack)}.
@@ -19,7 +17,7 @@ public interface GUIFactory {
      * @param provider The provider.
      * @return The builder.
      */
-    SlotBuilder createSlotBuilder(@NotNull Function<Player, ItemStack> provider);
+    SlotBuilder createSlotBuilder(@NotNull SlotProvider provider);
 
     /**
      * Create menu builder.

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

@@ -0,0 +1,19 @@
+package com.willfp.eco.core.gui.menu;
+
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface to run on menu close.
+ */
+@FunctionalInterface
+public interface CloseHandler {
+    /**
+     * Performs this operation on the given arguments.
+     *
+     * @param event The close event.
+     * @param menu  The menu.
+     */
+    void handle(@NotNull InventoryCloseEvent event,
+                @NotNull Menu menu);
+}

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

@@ -2,9 +2,16 @@ package com.willfp.eco.core.gui.menu;
 
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.gui.slot.Slot;
+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.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * GUI version of {@link Inventory}.
@@ -44,6 +51,51 @@ public interface Menu {
      */
     Inventory open(@NotNull Player player);
 
+    /**
+     * Get captive items.
+     *
+     * @param player The player.
+     * @return The items.
+     */
+    List<ItemStack> getCaptiveItems(@NotNull Player player);
+
+    /**
+     * Write data.
+     *
+     * @param player The player.
+     * @param key    The key.
+     * @param type   The type.
+     * @param value  The value.
+     * @param <T>    The type.
+     * @param <Z>    The type.
+     */
+    <T, Z> void writeData(@NotNull Player player,
+                          @NotNull NamespacedKey key,
+                          @NotNull PersistentDataType<T, Z> type,
+                          @NotNull Z value);
+
+    /**
+     * Read data.
+     *
+     * @param player The player.
+     * @param key    The key.
+     * @param type   The type.
+     * @param <T>    The type.
+     * @param <Z>    The type.
+     * @return The data.
+     */
+    @Nullable <T, Z> T readData(@NotNull Player player,
+                                @NotNull NamespacedKey key,
+                                @NotNull PersistentDataType<T, Z> type);
+
+    /**
+     * Get all data keys for a player.
+     *
+     * @param player The player.
+     * @return The keys.
+     */
+    Set<NamespacedKey> getKeys(@NotNull Player player);
+
     /**
      * Create a builder with a given amount of rows.
      *

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

@@ -31,6 +31,14 @@ public interface MenuBuilder {
                         int column,
                         @NotNull Slot slot);
 
+    /**
+     * Run function to modify the builder.
+     *
+     * @param modifier The modifier.
+     * @return The builder.
+     */
+    MenuBuilder modfiy(@NotNull Consumer<MenuBuilder> modifier);
+
     /**
      * Set the menu mask.
      *
@@ -45,7 +53,18 @@ public interface MenuBuilder {
      * @param action The handler.
      * @return The builder.
      */
-    MenuBuilder onClose(@NotNull Consumer<InventoryCloseEvent> action);
+    default MenuBuilder onClose(@NotNull Consumer<InventoryCloseEvent> action) {
+        onClose((event, menu) -> action.accept(event));
+        return this;
+    }
+
+    /**
+     * Set the menu close handler.
+     *
+     * @param action The handler.
+     * @return The builder.
+     */
+    MenuBuilder onClose(@NotNull CloseHandler action);
 
     /**
      * Build the menu.

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

@@ -7,6 +7,7 @@ import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -39,13 +40,25 @@ public class FillerMask {
      */
     public FillerMask(@NotNull final Material material,
                       @NotNull final String... pattern) {
-        if (material == Material.AIR) {
-            throw new IllegalArgumentException("Material cannot be air!");
+        this(new MaskMaterials(material), pattern);
+    }
+
+    /**
+     * Create a new filler mask.
+     *
+     * @param materials The mask materials.
+     * @param pattern  The pattern.
+     */
+    public FillerMask(@NotNull final MaskMaterials materials,
+                      @NotNull final String... pattern) {
+        if (Arrays.stream(materials.materials()).anyMatch(material -> material == Material.AIR)) {
+            throw new IllegalArgumentException("Materials cannot be air!");
         }
 
         mask = ListUtils.create2DList(6, 9);
 
-        ItemStack itemStack = new ItemStackBuilder(material)
+        for (int i = 0; i < materials.materials().length; i++) {
+            ItemStack itemStack = new ItemStackBuilder(materials.materials()[i])
                     .setDisplayName("&r")
                     .build();
 
@@ -59,10 +72,8 @@ public class FillerMask {
                 for (char c : patternRow.toCharArray()) {
                     if (c == '0') {
                         mask.get(row).set(column, null);
-                } else if (c == '1') {
+                    } else if (c == Character.forDigit(i + 1, 10)) {
                         mask.get(row).set(column, new FillerSlot(itemStack));
-                } else {
-                    throw new IllegalArgumentException("Invalid character in pattern! (Must only be 0 and 1)");
                     }
 
                     column++;
@@ -70,4 +81,5 @@ public class FillerMask {
                 row++;
             }
         }
+    }
 }

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

@@ -30,4 +30,9 @@ public class FillerSlot implements Slot {
     public ItemStack getItemStack(@NotNull final Player player) {
         return itemStack;
     }
+
+    @Override
+    public boolean isCaptive() {
+        return false;
+    }
 }

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

@@ -0,0 +1,14 @@
+package com.willfp.eco.core.gui.slot;
+
+import org.bukkit.Material;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Mask materials store a set of materials which can be accessed by
+ * a filler mask.
+ *
+ * @param materials The materials.
+ */
+public record MaskMaterials(@NotNull Material... materials) {
+
+}

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

@@ -1,6 +1,8 @@
 package com.willfp.eco.core.gui.slot;
 
 import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.gui.slot.functional.SlotProvider;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -19,6 +21,22 @@ public interface Slot {
      */
     ItemStack getItemStack(@NotNull Player player);
 
+    /**
+     * If the slot is captive. (Can items be placed in it).
+     *
+     * @return If captive.
+     */
+    boolean isCaptive();
+
+    /**
+     * Create a builder for an ItemStack.
+     *
+     * @return The builder.
+     */
+    static SlotBuilder builder() {
+        return Eco.getHandler().getGUIFactory().createSlotBuilder((player, menu) -> new ItemStack(Material.AIR));
+    }
+
     /**
      * Create a builder for an ItemStack.
      *
@@ -26,7 +44,7 @@ public interface Slot {
      * @return The builder.
      */
     static SlotBuilder builder(@NotNull final ItemStack itemStack) {
-        return Eco.getHandler().getGUIFactory().createSlotBuilder(player -> itemStack);
+        return Eco.getHandler().getGUIFactory().createSlotBuilder((player, menu) -> itemStack);
     }
 
     /**
@@ -36,6 +54,16 @@ public interface Slot {
      * @return The builder.
      */
     static SlotBuilder builder(@NotNull final Function<Player, ItemStack> provider) {
+        return Eco.getHandler().getGUIFactory().createSlotBuilder((player, menu) -> provider.apply(player));
+    }
+
+    /**
+     * Create a builder for a player-specific ItemStack.
+     *
+     * @param provider The provider.
+     * @return The builder.
+     */
+    static SlotBuilder builder(@NotNull final SlotProvider provider) {
         return Eco.getHandler().getGUIFactory().createSlotBuilder(provider);
     }
 }

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

@@ -1,5 +1,7 @@
 package com.willfp.eco.core.gui.slot;
 
+import com.willfp.eco.core.gui.slot.functional.SlotHandler;
+import com.willfp.eco.core.gui.slot.functional.SlotModifier;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.jetbrains.annotations.NotNull;
 
@@ -15,7 +17,17 @@ public interface SlotBuilder {
      * @param action The handler.
      * @return The builder.
      */
-    SlotBuilder onLeftClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action);
+    default SlotBuilder onLeftClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action) {
+        return onLeftClick((event, slot, menu) -> action.accept(event, slot));
+    }
+
+    /**
+     * Set click handler.
+     *
+     * @param handler The handler.
+     * @return The builder.
+     */
+    SlotBuilder onLeftClick(@NotNull SlotHandler handler);
 
     /**
      * Set click handler.
@@ -23,7 +35,17 @@ public interface SlotBuilder {
      * @param action The handler.
      * @return The builder.
      */
-    SlotBuilder onRightClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action);
+    default SlotBuilder onRightClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action) {
+        return onRightClick((event, slot, menu) -> action.accept(event, slot));
+    }
+
+    /**
+     * Set click handler.
+     *
+     * @param handler The handler.
+     * @return The builder.
+     */
+    SlotBuilder onRightClick(@NotNull SlotHandler handler);
 
     /**
      * Set click handler.
@@ -31,7 +53,17 @@ public interface SlotBuilder {
      * @param action The handler.
      * @return The builder.
      */
-    SlotBuilder onShiftLeftClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action);
+    default SlotBuilder onShiftLeftClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action) {
+        return onShiftLeftClick((event, slot, menu) -> action.accept(event, slot));
+    }
+
+    /**
+     * Set click handler.
+     *
+     * @param handler The handler.
+     * @return The builder.
+     */
+    SlotBuilder onShiftLeftClick(@NotNull SlotHandler handler);
 
     /**
      * Set click handler.
@@ -39,7 +71,17 @@ public interface SlotBuilder {
      * @param action The handler.
      * @return The builder.
      */
-    SlotBuilder onShiftRightClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action);
+    default SlotBuilder onShiftRightClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action) {
+        return onShiftRightClick((event, slot, menu) -> action.accept(event, slot));
+    }
+
+    /**
+     * Set click handler.
+     *
+     * @param handler The handler.
+     * @return The builder.
+     */
+    SlotBuilder onShiftRightClick(@NotNull SlotHandler handler);
 
     /**
      * Set click handler.
@@ -47,7 +89,32 @@ public interface SlotBuilder {
      * @param action The handler.
      * @return The builder.
      */
-    SlotBuilder onMiddleClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action);
+    default SlotBuilder onMiddleClick(@NotNull BiConsumer<InventoryClickEvent, Slot> action) {
+        return onMiddleClick((event, slot, menu) -> action.accept(event, slot));
+    }
+
+    /**
+     * Set click handler.
+     *
+     * @param handler The handler.
+     * @return The builder.
+     */
+    SlotBuilder onMiddleClick(@NotNull SlotHandler handler);
+
+    /**
+     * Modify the ItemStack.
+     *
+     * @param modifier The modifier.
+     * @return The builder.
+     */
+    SlotBuilder setModifier(@NotNull SlotModifier modifier);
+
+    /**
+     * Set slot to be a captive slot.
+     *
+     * @return The builder.
+     */
+    SlotBuilder setCaptive();
 
     /**
      * Build the slot.

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

@@ -0,0 +1,23 @@
+package com.willfp.eco.core.gui.slot.functional;
+
+import com.willfp.eco.core.gui.menu.Menu;
+import com.willfp.eco.core.gui.slot.Slot;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface to run on slot click.
+ */
+@FunctionalInterface
+public interface SlotHandler {
+    /**
+     * Performs this operation on the given arguments.
+     *
+     * @param event The click event.
+     * @param slot  The slot
+     * @param menu  The menu.
+     */
+    void handle(@NotNull InventoryClickEvent event,
+                @NotNull Slot slot,
+                @NotNull Menu menu);
+}

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

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

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

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

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

@@ -29,6 +29,16 @@ public class AntigriefManager {
         registered.add(antigrief);
     }
 
+    /**
+     * Unregister an AntiGrief/Land Management integration.
+     *
+     * @param antigrief The integration to unregister.
+     */
+    public void unregister(@NotNull final AntigriefWrapper antigrief) {
+        registered.removeIf(it -> it.getPluginName().equalsIgnoreCase(antigrief.getPluginName()));
+        registered.remove(antigrief);
+    }
+
     /**
      * Can player break block.
      *

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

@@ -1,9 +1,11 @@
 package com.willfp.eco.core.integrations.customitems;
 
+import com.willfp.eco.core.integrations.Integration;
+
 /**
  * Wrapper class for custom item integrations.
  */
-public interface CustomItemsWrapper {
+public interface CustomItemsWrapper extends Integration {
     /**
      * Register all the custom items for a specific plugin into eco.
      *

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

@@ -16,7 +16,7 @@ public class McmmoManager {
     /**
      * A set of all registered integrations.
      */
-    private final Set<McmmoWrapper> regsistered = new HashSet<>();
+    private final Set<McmmoWrapper> registered = new HashSet<>();
 
     /**
      * Register a new integration.
@@ -24,7 +24,7 @@ public class McmmoManager {
      * @param integration The integration to register.
      */
     public void register(@NotNull final McmmoWrapper integration) {
-        regsistered.add(integration);
+        registered.add(integration);
     }
 
     /**
@@ -34,7 +34,7 @@ public class McmmoManager {
      * @return The bonus drop count.
      */
     public int getBonusDropCount(@NotNull final Block block) {
-        for (McmmoWrapper mcmmoWrapper : regsistered) {
+        for (McmmoWrapper mcmmoWrapper : registered) {
             return mcmmoWrapper.getBonusDropCount(block);
         }
         return 0;
@@ -47,7 +47,7 @@ public class McmmoManager {
      * @return If the event is fake.
      */
     public boolean isFake(@NotNull final Event event) {
-        for (McmmoWrapper mcmmoWrapper : regsistered) {
+        for (McmmoWrapper mcmmoWrapper : registered) {
             return mcmmoWrapper.isFake(event);
         }
         return false;

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

@@ -77,4 +77,11 @@ public class PlaceholderEntry {
     public boolean requiresPlayer() {
         return requiresPlayer;
     }
+
+    /**
+     * Register the placeholder.
+     */
+    public void register() {
+        PlaceholderManager.registerPlaceholder(this);
+    }
 }

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

@@ -5,7 +5,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
@@ -18,7 +20,7 @@ public class PlaceholderManager {
     /**
      * All registered placeholders.
      */
-    private static final Set<PlaceholderEntry> REGISTERED_PLACEHOLDERS = new HashSet<>();
+    private static final Map<String, PlaceholderEntry> REGISTERED_PLACEHOLDERS = new HashMap<>();
 
     /**
      * All registered placeholder integrations.
@@ -41,8 +43,8 @@ public class PlaceholderManager {
      * @param expansion The {@link PlaceholderEntry} to register.
      */
     public static void registerPlaceholder(@NotNull final PlaceholderEntry expansion) {
-        REGISTERED_PLACEHOLDERS.removeIf(placeholderEntry -> placeholderEntry.getIdentifier().equalsIgnoreCase(expansion.getIdentifier()));
-        REGISTERED_PLACEHOLDERS.add(expansion);
+        REGISTERED_PLACEHOLDERS.remove(expansion.getIdentifier());
+        REGISTERED_PLACEHOLDERS.put(expansion.getIdentifier(), expansion);
     }
 
     /**
@@ -54,14 +56,15 @@ public class PlaceholderManager {
      */
     public static String getResult(@Nullable final Player player,
                                    @NotNull final String identifier) {
-        Optional<PlaceholderEntry> matching = REGISTERED_PLACEHOLDERS.stream().filter(expansion -> expansion.getIdentifier().equalsIgnoreCase(identifier)).findFirst();
-        if (matching.isEmpty()) {
-            return null;
+        PlaceholderEntry entry = REGISTERED_PLACEHOLDERS.get(identifier.toLowerCase());
+        if (entry == null) {
+            return "";
         }
-        PlaceholderEntry entry = matching.get();
+
         if (player == null && entry.requiresPlayer()) {
             return "";
         }
+
         return entry.getResult(player);
     }
 
@@ -74,8 +77,10 @@ public class PlaceholderManager {
      */
     public static String translatePlaceholders(@NotNull final String text,
                                                @Nullable final Player player) {
-        AtomicReference<String> translatedReference = new AtomicReference<>(text);
-        REGISTERED_INTEGRATIONS.forEach(placeholderIntegration -> translatedReference.set(placeholderIntegration.translate(translatedReference.get(), player)));
-        return translatedReference.get();
+        String processed = text;
+        for (PlaceholderIntegration integration : REGISTERED_INTEGRATIONS) {
+            processed = integration.translate(processed, player);
+        }
+        return processed;
     }
 }

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

@@ -0,0 +1,36 @@
+package com.willfp.eco.core.integrations.shop;
+
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Class to handle shop integrations.
+ */
+@UtilityClass
+public class ShopManager {
+    /**
+     * A set of all registered integrations.
+     */
+    private final Set<ShopWrapper> registered = new HashSet<>();
+
+    /**
+     * Register a new integration.
+     *
+     * @param integration The integration to register.
+     */
+    public void register(@NotNull final ShopWrapper integration) {
+        registered.add(integration);
+    }
+
+    /**
+     * Register eco item provider for shop plugins.
+     */
+    public void registerEcoProvider() {
+        for (ShopWrapper shopWrapper : registered) {
+            shopWrapper.registerEcoProvider();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.willfp.eco.core.integrations.shop;
+
+import com.willfp.eco.core.integrations.Integration;
+
+/**
+ * Wrapper class for shop integrations.
+ */
+public interface ShopWrapper extends Integration {
+    /**
+     * Register eco item provider for shop plugins.
+     */
+    void registerEcoProvider();
+}

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

@@ -1,6 +1,9 @@
 package com.willfp.eco.core.items;
 
+import com.willfp.eco.core.Eco;
 import lombok.Getter;
+import org.apache.commons.lang.Validate;
+import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -27,7 +30,7 @@ public class CustomItem implements TestableItem {
     /**
      * The test for ItemStacks to pass.
      */
-    private final Predicate<ItemStack> test;
+    private final Predicate<@NotNull ItemStack> test;
 
     /**
      * Example Item: what the user should see.
@@ -42,15 +45,25 @@ public class CustomItem implements TestableItem {
      * @param item The example ItemStacks.
      */
     public CustomItem(@NotNull final NamespacedKey key,
-                      @NotNull final Predicate<ItemStack> test,
+                      @NotNull final Predicate<@NotNull ItemStack> test,
                       @NotNull final ItemStack item) {
         this.key = key;
         this.test = test;
         this.item = item;
+
+        Eco.getHandler().getEcoPlugin().getScheduler().runLater(() -> {
+            if (!matches(getItem())) {
+                Bukkit.getLogger().severe("Item with key " + key + " is invalid!");
+            }
+        }, 1);
     }
 
     @Override
     public boolean matches(@Nullable final ItemStack itemStack) {
+        if (itemStack == null) {
+            return false;
+        }
+
         return test.test(itemStack);
     }
 

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

@@ -1,19 +1,29 @@
 package com.willfp.eco.core.items;
 
+import com.willfp.eco.core.items.args.LookupArgParser;
+import com.willfp.eco.core.items.provider.ItemProvider;
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
 import com.willfp.eco.core.recipe.parts.MaterialTestableItem;
+import com.willfp.eco.core.recipe.parts.ModifiedTestableItem;
 import com.willfp.eco.core.recipe.parts.TestableStack;
 import com.willfp.eco.util.NamespacedKeyUtils;
+import com.willfp.eco.util.NumberUtils;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * Class to manage all custom and vanilla items.
@@ -23,60 +33,210 @@ public final class Items {
     /**
      * All recipe parts.
      */
-    private static final Map<NamespacedKey, CustomItem> REGISTRY = new HashMap<>();
+    private static final Map<NamespacedKey, TestableItem> REGISTRY = new ConcurrentHashMap<>();
 
     /**
-     * Register a new recipe part.
+     * All item providers.
+     */
+    private static final Map<String, ItemProvider> PROVIDERS = new ConcurrentHashMap<>();
+
+    /**
+     * All recipe parts.
+     */
+    private static final List<LookupArgParser> ARG_PARSERS = new ArrayList<>();
+
+    /**
+     * Register a new custom item.
      *
-     * @param key  The key of the recipe part.
-     * @param part The recipe part.
+     * @param key  The key of the item.
+     * @param item The item.
      */
     public void registerCustomItem(@NotNull final NamespacedKey key,
-                                   @NotNull final CustomItem part) {
-        REGISTRY.put(key, part);
+                                   @NotNull final TestableItem item) {
+        REGISTRY.put(key, item);
     }
 
     /**
-     * Lookup item from string.
-     * <p>
-     * Used for recipes.
+     * Register a new item provider.
      *
-     * @param key The string to test.
-     * @return The found testable item, or an empty item if not found.
+     * @param provider The provider.
+     */
+    public void registerItemProvider(@NotNull final ItemProvider provider) {
+        PROVIDERS.put(provider.getNamespace(), provider);
+    }
+
+    /**
+     * Register a new arg parser.
+     *
+     * @param parser The parser.
+     */
+    public void registerArgParser(@NotNull final LookupArgParser parser) {
+        ARG_PARSERS.add(parser);
+    }
+
+    /**
+     * Remove an item.
+     *
+     * @param key The key of the recipe part.
+     */
+    public void removeCustomItem(@NotNull final NamespacedKey key) {
+        REGISTRY.remove(key);
+    }
+
+    /**
+     * This is the backbone of the entire eco item system.
+     * <p>
+     * You can lookup a TestableItem for any material, custom item,
+     * or item in general, and it will return it with any modifiers
+     * passed as parameters. This includes stack size (item amount)
+     * and enchantments that should be present on the item.
+     * <p>
+     * If you want to get an ItemStack instance from this, then just call
+     * {@link TestableItem#getItem()}.
+     * <p>
+     * The advantages of the testable item system are that there is the inbuilt
+     * {@link TestableItem#matches(ItemStack)} - this allows to check if any item
+     * is that testable item; which may sound negligible but actually it allows for
+     * much more power an flexibility. For example, you can have an item with an
+     * extra metadata tag, extra lore lines, different display name - and it
+     * will still work as long as the test passes. This is very important
+     * for custom crafting recipes where other plugins may add metadata
+     * values or the play may rename the item.
+     *
+     * @param key The lookup string.
+     * @return The testable item, or an {@link EmptyTestableItem}.
      */
     public TestableItem lookup(@NotNull final String key) {
-        String[] split = key.toLowerCase().split(":");
+        if (key.contains("?")) {
+            String[] options = key.split("\\?");
+            for (String option : options) {
+                TestableItem lookup = lookup(option);
+                if (!(lookup instanceof EmptyTestableItem)) {
+                    return lookup;
+                }
+            }
+
+            return new EmptyTestableItem();
+        }
+
+        String[] args = key.split(" ");
+        if (args.length == 0) {
+            return new EmptyTestableItem();
+        }
+
+        TestableItem item = null;
+
+        int stackAmount = 1;
+
+        String[] split = args[0].toLowerCase().split(":");
 
         if (split.length == 1) {
-            Material material = Material.getMaterial(key.toUpperCase());
+            Material material = Material.getMaterial(args[0].toUpperCase());
             if (material == null || material == Material.AIR) {
                 return new EmptyTestableItem();
             }
-            return new MaterialTestableItem(material);
+            item = new MaterialTestableItem(material);
         }
 
         if (split.length == 2) {
-            CustomItem part = REGISTRY.get(NamespacedKeyUtils.create(split[0], split[1]));
+            String namespace = split[0];
+            String keyID = split[1];
+            NamespacedKey namespacedKey = NamespacedKeyUtils.create(namespace, keyID);
 
+            TestableItem part = REGISTRY.get(namespacedKey);
+
+            if (part == null && PROVIDERS.containsKey(namespace)) {
+                ItemProvider provider = PROVIDERS.get(namespace);
+                item = provider.provideForKey(keyID);
+                if (item instanceof EmptyTestableItem || item == null) {
+                    return new EmptyTestableItem();
+                }
+                registerCustomItem(namespacedKey, item);
+            }
+
+            /*
+            Legacy id:amount format
+            This has been superseded by id amount
+             */
             if (part == null) {
                 Material material = Material.getMaterial(split[0].toUpperCase());
                 if (material == null || material == Material.AIR) {
                     return new EmptyTestableItem();
                 }
-                return new TestableStack(new MaterialTestableItem(material), Integer.parseInt(split[1]));
+                item = new MaterialTestableItem(material);
+                stackAmount = Integer.parseInt(split[1]);
             } else {
-                return part;
+                item = part;
             }
         }
 
+        /*
+        Legacy namespace:id:amount format
+        This has been superseded by namespace:id amount
+         */
         if (split.length == 3) {
-            CustomItem part = REGISTRY.get(NamespacedKeyUtils.create(split[0], split[1]));
-            return part == null ? new EmptyTestableItem() : new TestableStack(part, Integer.parseInt(split[2]));
+            TestableItem part = REGISTRY.get(NamespacedKeyUtils.create(split[0], split[1]));
+            if (part == null) {
+                return new EmptyTestableItem();
+            }
+            item = part;
+            stackAmount = Integer.parseInt(split[2]);
         }
 
+        boolean usingNewStackFormat = false;
+
+        if (args.length >= 2) {
+            try {
+                stackAmount = Integer.parseInt(args[1]);
+                usingNewStackFormat = true;
+            } catch (NumberFormatException ignored) {
+            }
+        }
+
+        // Marked as redundant but i am covering all bases here
+        if (item == null || item instanceof EmptyTestableItem) {
             return new EmptyTestableItem();
         }
 
+        ItemStack example = item.getItem();
+        ItemMeta meta = example.getItemMeta();
+        assert meta != null;
+
+        String[] modifierArgs = Arrays.copyOfRange(args, usingNewStackFormat ? 2 : 1, args.length);
+
+        List<Predicate<ItemStack>> predicates = new ArrayList<>();
+
+        for (LookupArgParser argParser : ARG_PARSERS) {
+            Predicate<ItemStack> predicate = argParser.parseArguments(modifierArgs, meta);
+            if (predicate != null) {
+                predicates.add(argParser.parseArguments(modifierArgs, meta));
+            }
+        }
+
+        example.setItemMeta(meta);
+        if (!predicates.isEmpty()) {
+            item = new ModifiedTestableItem(
+                    item,
+                    test -> {
+                        for (Predicate<ItemStack> predicate : predicates) {
+                            if (!predicate.test(test)) {
+                                return false;
+                            }
+                        }
+
+                        return true;
+                    },
+                    example
+            );
+        }
+
+        if (stackAmount <= 1) {
+            return item;
+        } else {
+            return new TestableStack(item, stackAmount);
+        }
+    }
+
     /**
      * Get if itemStack is a custom item.
      *
@@ -84,7 +244,7 @@ public final class Items {
      * @return If is recipe.
      */
     public boolean isCustomItem(@NotNull final ItemStack itemStack) {
-        for (CustomItem item : REGISTRY.values()) {
+        for (TestableItem item : REGISTRY.values()) {
             if (item.matches(itemStack)) {
                 return true;
             }
@@ -92,12 +252,49 @@ public final class Items {
         return false;
     }
 
+    /**
+     * Get custom item from item.
+     *
+     * @param itemStack The item.
+     * @return The custom item, or null if not exists.
+     */
+    @Nullable
+    public CustomItem getCustomItem(@NotNull final ItemStack itemStack) {
+        for (TestableItem item : REGISTRY.values()) {
+            if (item.matches(itemStack)) {
+                return getOrWrap(item);
+            }
+        }
+        return null;
+    }
+
     /**
      * Get all registered custom items.
      *
      * @return A set of all items.
      */
     public Set<CustomItem> getCustomItems() {
-        return new HashSet<>(REGISTRY.values());
+        return REGISTRY.values().stream().map(Items::getOrWrap).collect(Collectors.toSet());
+    }
+
+    /**
+     * Return a CustomItem instance for a given TestableItem.
+     * <p>
+     * Used internally since 6.10.0 when the registration moved from {@link CustomItem}
+     * to {@link TestableItem} for added flexibility.
+     *
+     * @param item The item.
+     * @return The CustomItem.
+     */
+    public CustomItem getOrWrap(@NotNull final TestableItem item) {
+        if (item instanceof CustomItem) {
+            return (CustomItem) item;
+        } else {
+            return new CustomItem(
+                    NamespacedKeyUtils.createEcoKey("wrapped_" + NumberUtils.randInt(0, 100000)),
+                    item::matches,
+                    item.getItem()
+            );
+        }
     }
 }

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

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

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

@@ -0,0 +1,25 @@
+package com.willfp.eco.core.items.args;
+
+import com.willfp.eco.core.items.TestableItem;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
+
+/**
+ * An argument parser should generate the predicate as well
+ * as modify the ItemMeta for {@link TestableItem#getItem()}.
+ */
+public interface LookupArgParser {
+    /**
+     * Parse the arguments.
+     *
+     * @param args The arguments.
+     * @param meta The ItemMeta to modify.
+     * @return The predicate test to apply to the modified item.
+     */
+    @Nullable Predicate<ItemStack> parseArguments(@NotNull String[] args,
+                                                  @NotNull ItemMeta meta);
+}

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

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

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

@@ -0,0 +1,40 @@
+package com.willfp.eco.core.items.provider;
+
+import com.willfp.eco.core.items.TestableItem;
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Item providers are call-site registrations for items. In other words,
+ * they only register their items when a request is made. This is marginally
+ * slower, however it is required for certain plugins, and fixes bugs related to
+ * loading orders.
+ *
+ * @see TestableItem
+ */
+public abstract class ItemProvider {
+    /**
+     * The namespace.
+     */
+    @Getter
+    private final String namespace;
+
+    /**
+     * Create a new ItemProvider for a specific namespace.
+     *
+     * @param namespace The namespace.
+     */
+    protected ItemProvider(@NotNull final String namespace) {
+        this.namespace = namespace;
+    }
+
+    /**
+     * Provide a TestableItem for a given key.
+     *
+     * @param key The item ID.
+     * @return The TestableItem, or null if not found.
+     */
+    @Nullable
+    public abstract TestableItem provideForKey(@NotNull final String key);
+}

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

@@ -2,6 +2,7 @@ package com.willfp.eco.core.recipe.parts;
 
 import com.willfp.eco.core.items.TestableItem;
 import lombok.Getter;
+import org.apache.commons.lang.Validate;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -23,6 +24,8 @@ public class MaterialTestableItem implements TestableItem {
      * @param material The material.
      */
     public MaterialTestableItem(@NotNull final Material material) {
+        Validate.isTrue(material != Material.AIR, "You can't have air as the type!");
+
         this.material = material;
     }
 

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

@@ -0,0 +1,65 @@
+package com.willfp.eco.core.recipe.parts;
+
+import com.willfp.eco.core.items.TestableItem;
+import lombok.Getter;
+import org.apache.commons.lang.Validate;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
+
+/**
+ * Existing testable items with an extra filter.
+ *
+ * @see com.willfp.eco.core.items.CustomItem
+ */
+public class ModifiedTestableItem implements TestableItem {
+    /**
+     * The item.
+     */
+    @Getter
+    private final TestableItem handle;
+
+    /**
+     * The amount.
+     */
+    @Getter
+    private final Predicate<ItemStack> test;
+
+    /**
+     * The item for the modified test.
+     */
+    private final ItemStack example;
+
+    /**
+     * Create a new modified testable item.
+     *
+     * @param item    The item.
+     * @param test    The test.
+     * @param example The example.
+     */
+    public ModifiedTestableItem(@NotNull final TestableItem item,
+                                @NotNull final Predicate<ItemStack> test,
+                                @NotNull final ItemStack example) {
+        this.handle = item;
+        this.test = test;
+        this.example = example;
+    }
+
+    /**
+     * If the item matches the material.
+     *
+     * @param itemStack The item to test.
+     * @return If the item is of the specified material.
+     */
+    @Override
+    public boolean matches(@Nullable final ItemStack itemStack) {
+        return itemStack != null && handle.matches(itemStack) && test.test(itemStack);
+    }
+
+    @Override
+    public ItemStack getItem() {
+        return example;
+    }
+}

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

@@ -1,17 +1,12 @@
 package com.willfp.eco.core.recipe.parts;
 
-import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.items.TestableItem;
 import lombok.Getter;
 import org.apache.commons.lang.Validate;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Stacks of items.
  */
@@ -19,6 +14,7 @@ public class TestableStack implements TestableItem {
     /**
      * The item.
      */
+    @Getter
     private final TestableItem handle;
 
     /**
@@ -35,7 +31,8 @@ public class TestableStack implements TestableItem {
      */
     public TestableStack(@NotNull final TestableItem item,
                          final int amount) {
-        Validate.isTrue(!(item instanceof TestableStack));
+        Validate.isTrue(!(item instanceof TestableStack), "You can't stack a stack!");
+        Validate.isTrue(!(item instanceof EmptyTestableItem), "You can't stack air!");
 
         this.handle = item;
         this.amount = amount;
@@ -55,19 +52,7 @@ public class TestableStack implements TestableItem {
     @Override
     public ItemStack getItem() {
         ItemStack temp = handle.getItem().clone();
-        ItemMeta meta = temp.getItemMeta();
-        assert meta != null;
-
-        List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
-        assert lore != null;
-        lore.add("");
-        String add = Eco.getHandler().getEcoPlugin().getLangYml().getString("multiple-in-craft");
-        add = add.replace("%amount%", String.valueOf(amount));
-        lore.add(add);
-        meta.setLore(lore);
-        temp.setItemMeta(meta);
         temp.setAmount(amount);
-
         return temp;
     }
 }

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

@@ -1,16 +1,19 @@
 package com.willfp.eco.core.recipe.recipes;
 
+import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.PluginDependent;
 import com.willfp.eco.core.items.TestableItem;
 import com.willfp.eco.core.recipe.Recipes;
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
+import com.willfp.eco.core.recipe.parts.TestableStack;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.RecipeChoice;
 import org.bukkit.inventory.ShapedRecipe;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -79,6 +82,10 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
         ShapedRecipe shapedRecipe = new ShapedRecipe(this.getKey(), this.getOutput());
         shapedRecipe.shape("012", "345", "678");
         for (int i = 0; i < 9; i++) {
+            if (parts.get(i) instanceof EmptyTestableItem) {
+                continue;
+            }
+
             char character = String.valueOf(i).toCharArray()[0];
             shapedRecipe.setIngredient(character, parts.get(i).getItem().getType());
         }
@@ -86,8 +93,28 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
         ShapedRecipe displayedRecipe = new ShapedRecipe(this.getDisplayedKey(), this.getOutput());
         displayedRecipe.shape("012", "345", "678");
         for (int i = 0; i < 9; i++) {
+            if (parts.get(i) instanceof EmptyTestableItem) {
+                continue;
+            }
+
             char character = String.valueOf(i).toCharArray()[0];
-            displayedRecipe.setIngredient(character, new RecipeChoice.ExactChoice(parts.get(i).getItem()));
+            ItemStack item = parts.get(i).getItem();
+
+            if (parts.get(i) instanceof TestableStack) {
+                ItemMeta meta = item.getItemMeta();
+                assert meta != null;
+
+                List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
+                assert lore != null;
+                lore.add("");
+                String add = Eco.getHandler().getEcoPlugin().getLangYml().getString("multiple-in-craft");
+                add = add.replace("%amount%", String.valueOf(item.getAmount()));
+                lore.add(add);
+                meta.setLore(lore);
+                item.setItemMeta(meta);
+            }
+
+            displayedRecipe.setIngredient(character, new RecipeChoice.ExactChoice(item));
         }
 
         Bukkit.getServer().addRecipe(shapedRecipe);

eco-api/src/main/java/com/willfp/eco/core/requirement/Requirement.java

@@ -0,0 +1,28 @@
+package com.willfp.eco.core.requirement;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * A requirement is a defined goal that a player must meet.
+ */
+public abstract class Requirement {
+    /**
+     * Create a new requirement.
+     */
+    protected Requirement() {
+
+    }
+
+    /**
+     * Test if the player meets the requirement.
+     *
+     * @param player The player.
+     * @param args   The arguments.
+     * @return The requirement.
+     */
+    public abstract boolean doesPlayerMeet(@NotNull Player player,
+                                           @NotNull List<String> args);
+}

eco-api/src/main/java/com/willfp/eco/core/requirement/RequirementFactory.java

@@ -0,0 +1,17 @@
+package com.willfp.eco.core.requirement;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface for internal requirement factory implementations.
+ */
+public interface RequirementFactory {
+    /**
+     * Create a requirement.
+     *
+     * @param name The name.
+     * @return The requirement returned for the name.
+     * Will return a requirement that is always true if not found.
+     */
+    Requirement create(@NotNull String name);
+}

eco-api/src/main/java/com/willfp/eco/core/requirement/Requirements.java

@@ -0,0 +1,41 @@
+package com.willfp.eco.core.requirement;
+
+import com.willfp.eco.core.Eco;
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Contains methods and fields pertaining to requirements.
+ */
+@UtilityClass
+public class Requirements {
+    /**
+     * Requires a player to have a permission.
+     */
+    public static final Requirement HAS_PERMISSION = Eco.getHandler().getRequirementFactory().create("has-permission");
+
+    /**
+     * Placeholder equals value.
+     */
+    public static final Requirement PLACEHOLDER_EQUALS = Eco.getHandler().getRequirementFactory().create("placeholder-equals");
+
+    /**
+     * Numeric placeholder greater than value.
+     */
+    public static final Requirement PLACEHOLDER_GREATER_THAN = Eco.getHandler().getRequirementFactory().create("placeholder-greater-than");
+
+    /**
+     * Numeric placeholder less than value.
+     */
+    public static final Requirement PLACEHOLDER_LESS_THAN = Eco.getHandler().getRequirementFactory().create("placeholder-less-than");
+
+    /**
+     * Get Requirements matching ID.
+     *
+     * @param name The ID to search for.
+     * @return The matching Requirements.
+     */
+    public static Requirement getByID(@NotNull final String name) {
+        return Eco.getHandler().getRequirementFactory().create(name);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/tuples/Pair.java

@@ -38,4 +38,26 @@ public class Pair<A, B> {
         this.first = first;
         this.second = second;
     }
+
+    /**
+     * component1 exists to allow a pair to be destructured by kotlin.
+     * The default kotlin pair already has this, however there is no default
+     * pair in java so this exists for parity.
+     *
+     * @return First.
+     */
+    public A component1() {
+        return first;
+    }
+
+    /**
+     * component2 exists to allow a pair to be destructured by kotlin.
+     * The default kotlin pair already has this, however there is no default
+     * pair in java so this exists for parity.
+     *
+     * @return First.
+     */
+    public B component2() {
+        return second;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/tuples/Triplet.java

@@ -34,4 +34,15 @@ public class Triplet<A, B, C> extends Pair<A, B> {
 
         this.third = third;
     }
+
+    /**
+     * component3 exists to allow a pair to be destructured by kotlin.
+     * The default kotlin pair already has this, however there is no default
+     * pair in java so this exists for parity.
+     *
+     * @return First.
+     */
+    public C component3() {
+        return third;
+    }
 }

eco-api/src/main/java/com/willfp/eco/core/web/UpdateChecker.java

@@ -31,7 +31,9 @@ public class UpdateChecker extends PluginDependent<EcoPlugin> {
     public void getVersion(@NotNull final Consumer<? super String> consumer) {
         this.getPlugin().getScheduler().runAsync(() -> {
             try {
-                InputStream inputStream = new URL("https://api.spigotmc.org/legacy/update.php?resource=" + this.getPlugin().getResourceId()).openStream();
+                InputStream inputStream = new URL(
+                        "https://api.polymart.org/v1/getResourceInfoSimple?key=version&resource_id=" + this.getPlugin().getResourceId()
+                ).openStream();
                 Scanner scanner = new Scanner(inputStream);
 
                 if (scanner.hasNext()) {

eco-api/src/main/java/com/willfp/eco/util/ArrowUtils.java

@@ -19,7 +19,7 @@ public class ArrowUtils {
      * Get the bow from an arrow.
      *
      * @param arrow The arrow.
-     * @return The bow.
+     * @return The bow, or null if no bow.
      */
     @Nullable
     public ItemStack getBow(@NotNull final Arrow arrow) {
@@ -29,10 +29,10 @@ public class ArrowUtils {
             return null;
         }
 
-        if (!(values.get(0) instanceof ItemStack)) {
+        if (!(values.get(0).value() instanceof ItemStack)) {
             return null;
         }
 
-        return (ItemStack) values.get(0);
+        return (ItemStack) values.get(0).value();
     }
 }

eco-api/src/main/java/com/willfp/eco/util/BlockUtils.java

@@ -1,9 +1,10 @@
 package com.willfp.eco.util;
 
-import com.willfp.eco.core.tuples.Pair;
 import lombok.experimental.UtilityClass;
 import org.apache.commons.lang.Validate;
+import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
@@ -30,12 +31,10 @@ public class BlockUtils {
      */
     private BiConsumer<Player, Block> blockBreakConsumer = null;
 
-    private Pair<Block, Set<Block>> getNearbyBlocksRecursively(@NotNull final Block start,
+    private Set<Block> getNearbyBlocks(@NotNull final Block start,
                                        @NotNull final List<Material> allowedMaterials,
                                        @NotNull final Set<Block> blocks,
                                        final int limit) {
-        Block last = start;
-
         for (BlockFace face : BlockFace.values()) {
             Block block = start.getRelative(face);
             if (blocks.contains(block)) {
@@ -44,46 +43,15 @@ public class BlockUtils {
 
             if (allowedMaterials.contains(block.getType())) {
                 blocks.add(block);
-                last = block;
 
-                if (blocks.size() > limit) {
-                    return new Pair<>(last, blocks);
+                if (blocks.size() > limit || blocks.size() > 2500) {
+                    return blocks;
                 }
 
-                Pair<Block, Set<Block>> pair = getNearbyBlocksRecursively(last, allowedMaterials, blocks, limit);
-                assert pair.getSecond() != null;
-
-                blocks.addAll(pair.getSecond());
+                blocks.addAll(getNearbyBlocks(block, allowedMaterials, blocks, limit));
             }
         }
 
-        return new Pair<>(last, blocks);
-    }
-
-    private Set<Block> getNearbyBlocks(@NotNull final Block start,
-                                       @NotNull final List<Material> allowedMaterials,
-                                       @NotNull final Set<Block> blocks,
-                                       final int limit) {
-        /*
-        Prevent stack overflow.
-         */
-        int cycles = (int) Math.ceil(limit / 1024D);
-
-        int cap = limit;
-        Block iterStart = start;
-
-        for (int i = 0; i < cycles; i++) {
-            assert iterStart != null;
-
-            Pair<Block, Set<Block>> pair = getNearbyBlocksRecursively(iterStart, allowedMaterials, blocks, cap);
-            assert pair.getSecond() != null;
-            iterStart = pair.getFirst();
-
-            blocks.addAll(pair.getSecond());
-
-            cap -= 1024;
-        }
-
         return blocks;
     }
 
@@ -95,6 +63,7 @@ public class BlockUtils {
      * @param limit            The maximum size of vein to return.
      * @return A set of all {@link Block}s.
      */
+    @NotNull
     public Set<Block> getVein(@NotNull final Block start,
                               @NotNull final List<Material> allowedMaterials,
                               final int limit) {
@@ -112,6 +81,14 @@ public class BlockUtils {
         Validate.isTrue(initialized, "Must be initialized!");
         Validate.notNull(blockBreakConsumer, "Must be initialized!");
 
+        Location location = block.getLocation();
+        World world = location.getWorld();
+        assert world != null;
+
+        if (location.getY() < world.getMinHeight() || location.getY() > world.getMaxHeight()) {
+            return;
+        }
+
         blockBreakConsumer.accept(player, block);
     }
 

eco-api/src/main/java/com/willfp/eco/util/LightningUtils.java

@@ -2,6 +2,7 @@ package com.willfp.eco.util;
 
 import lombok.experimental.UtilityClass;
 import org.bukkit.Location;
+import org.bukkit.Sound;
 import org.bukkit.entity.LivingEntity;
 import org.jetbrains.annotations.NotNull;
 
@@ -10,18 +11,37 @@ import org.jetbrains.annotations.NotNull;
  */
 @UtilityClass
 public class LightningUtils {
+
     /**
      * Strike lightning on player without fire.
      *
      * @param victim The entity to smite.
      * @param damage The damage to deal.
+     * @param silent If the lightning sound should be played locally
+     */
+    public void strike(@NotNull final LivingEntity victim,
+                       final double damage,
+                       final boolean silent) {
+        Location loc = victim.getLocation();
+
+        if (silent) {
+            victim.getWorld().spigot().strikeLightningEffect(loc, true);
+            victim.getWorld().playSound(loc, Sound.ENTITY_LIGHTNING_BOLT_IMPACT, 1, 1);
+        } else {
+            victim.getWorld().strikeLightningEffect(loc);
+        }
+
+        victim.damage(damage);
+    }
+
+    /**
+     * Strike lightning on a victim without fire.
+     *
+     * @param victim The entity to smite.
+     * @param damage The damage to deal.
      */
     public void strike(@NotNull final LivingEntity victim,
                        final double damage) {
-        Location loc = victim.getLocation();
-
-        victim.getWorld().strikeLightningEffect(loc);
-
-        victim.damage(damage);
+        strike(victim, damage, false);
     }
 }

eco-api/src/main/java/com/willfp/eco/util/ListUtils.java

@@ -1,6 +1,8 @@
 package com.willfp.eco.util;
 
 import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,7 +20,8 @@ public class ListUtils {
      * @param <T>     The type of the object stored in the list.
      * @return The list, filled will null objects.
      */
-    public <T> List<List<T>> create2DList(final int rows,
+    @NotNull
+    public <@Nullable T> List<List<T>> create2DList(final int rows,
                                                     final int columns) {
         List<List<T>> list = new ArrayList<>(rows);
         while (list.size() < rows) {

eco-api/src/main/java/com/willfp/eco/util/MenuUtils.java

@@ -0,0 +1,24 @@
+package com.willfp.eco.util;
+
+import com.willfp.eco.core.tuples.Pair;
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Utilities / API methods for menus.
+ */
+@UtilityClass
+public class MenuUtils {
+    /**
+     * Convert 0-53 slot to row and column pair.
+     *
+     * @param slot The slot.
+     * @return The pair of row and columns.
+     */
+    @NotNull
+    public Pair<Integer, Integer> convertSlotToRowColumn(final int slot) {
+        int row = Math.floorDiv(slot, 9);
+        int column = slot - row * 9;
+        return new Pair<>(row + 1, column + 1);
+    }
+}

eco-api/src/main/java/com/willfp/eco/util/NamespacedKeyUtils.java

@@ -17,6 +17,7 @@ public class NamespacedKeyUtils {
      * @param string The string.
      * @return The key.
      */
+    @NotNull
     public NamespacedKey createEcoKey(@NotNull final String string) {
         return Objects.requireNonNull(NamespacedKey.fromString("eco:" + string));
     }
@@ -28,6 +29,7 @@ public class NamespacedKeyUtils {
      * @param key       The key.
      * @return The key.
      */
+    @NotNull
     public NamespacedKey create(@NotNull final String namespace,
                                 @NotNull final String key) {
         return Objects.requireNonNull(NamespacedKey.fromString(namespace + ":" + key));

eco-api/src/main/java/com/willfp/eco/util/NumberUtils.java

@@ -1,5 +1,6 @@
 package com.willfp.eco.util;
 
+import lombok.experimental.NonFinal;
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
 
@@ -109,6 +110,7 @@ public class NumberUtils {
      * @param number The number to convert.
      * @return The number, converted to a roman numeral.
      */
+    @NotNull
     public String toNumeral(final int number) {
         if (number >= 1 && number <= 4096) {
             int l = NUMERALS.floorKey(number);
@@ -131,7 +133,7 @@ public class NumberUtils {
         if (numeral.isEmpty()) {
             return 0;
         }
-        for (Map.Entry<Integer, String> entry : NUMERALS.entrySet()) {
+        for (Map.Entry<Integer, String> entry : NUMERALS.descendingMap().entrySet()) {
             if (numeral.startsWith(entry.getValue())) {
                 return entry.getKey() + fromNumeral(numeral.substring(entry.getValue().length()));
             }
@@ -199,6 +201,7 @@ public class NumberUtils {
      * @param toFormat The number to format.
      * @return Formatted.
      */
+    @NotNull
     public String format(final double toFormat) {
         DecimalFormat df = new DecimalFormat("0.00");
         String formatted = df.format(toFormat);

eco-api/src/main/java/com/willfp/eco/util/PlayerUtils.java

@@ -0,0 +1,66 @@
+package com.willfp.eco.util;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.Prerequisite;
+import lombok.experimental.UtilityClass;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Utilities / API methods for players.
+ */
+@UtilityClass
+public class PlayerUtils {
+    /**
+     * Get the audience from a player.
+     *
+     * @param player The player.
+     * @return The audience.
+     */
+    @NotNull
+    public Audience getAudience(@NotNull final Player player) {
+        BukkitAudiences adventure = Eco.getHandler().getAdventure();
+
+        if (Prerequisite.HAS_PAPER.isMet()) {
+            if (player instanceof Audience) {
+                return (Audience) player;
+            } else {
+                return Audience.empty();
+            }
+        } else {
+            if (adventure == null) {
+                return Audience.empty();
+            } else {
+                return adventure.player(player);
+            }
+        }
+    }
+
+    /**
+     * Get the audience from a command sender.
+     *
+     * @param sender The command sender.
+     * @return The audience.
+     */
+    @NotNull
+    public Audience getAudience(@NotNull final CommandSender sender) {
+        BukkitAudiences adventure = Eco.getHandler().getAdventure();
+
+        if (Prerequisite.HAS_PAPER.isMet()) {
+            if (sender instanceof Audience) {
+                return (Audience) sender;
+            } else {
+                return Audience.empty();
+            }
+        } else {
+            if (adventure == null) {
+                return Audience.empty();
+            } else {
+                return adventure.sender(sender);
+            }
+        }
+    }
+}

eco-api/src/main/java/com/willfp/eco/util/SkullUtils.java

@@ -5,8 +5,10 @@ import org.apache.commons.lang.Validate;
 import org.bukkit.inventory.meta.SkullMeta;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.BiConsumer;
+import java.util.function.Function;
 
 /**
  * Utilities / API methods for player heads.
@@ -23,6 +25,11 @@ public class SkullUtils {
      */
     private BiConsumer<SkullMeta, String> metaSetConsumer = null;
 
+    /**
+     * The meta get function.
+     */
+    private Function<SkullMeta, String> metaGetConsumer = null;
+
     /**
      * Set the texture of a skull from base64.
      *
@@ -37,16 +44,33 @@ public class SkullUtils {
         metaSetConsumer.accept(meta, base64);
     }
 
+    /**
+     * Get the texture of a skull - in base64.
+     *
+     * @param meta The meta to modify.
+     * @return The texture, potentially null.
+     */
+    @Nullable
+    public String getSkullTexture(@NotNull final SkullMeta meta) {
+        Validate.isTrue(initialized, "Must be initialized!");
+        Validate.notNull(metaGetConsumer, "Must be initialized!");
+
+        return metaGetConsumer.apply(meta);
+    }
+
     /**
      * Initialize the skull texture function.
      *
      * @param function  The function.
+     * @param function2 Get function.
      */
     @ApiStatus.Internal
-    public void initialize(@NotNull final BiConsumer<SkullMeta, String> function) {
+    public void initialize(@NotNull final BiConsumer<SkullMeta, String> function,
+                           @NotNull final Function<SkullMeta, String> function2) {
         Validate.isTrue(!initialized, "Already initialized!");
 
         metaSetConsumer = function;
+        metaGetConsumer = function2;
         initialized = true;
     }
 }

eco-api/src/main/java/com/willfp/eco/util/StringUtils.java

@@ -1,8 +1,15 @@
 package com.willfp.eco.util;
 
 import com.google.common.collect.ImmutableList;
+import com.willfp.eco.core.Prerequisite;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
 import lombok.experimental.UtilityClass;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.markdown.DiscordFlavor;
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -27,9 +34,11 @@ public class StringUtils {
      * Regexes for gradients.
      */
     private static final List<Pattern> GRADIENT_PATTERNS = new ImmutableList.Builder<Pattern>()
-            .add(Pattern.compile("<GRADIENT:([0-9A-Fa-f]{6})>(.*?)</GRADIENT:([0-9A-Fa-f]{6})>"))
-            .add(Pattern.compile("<gradient:([0-9A-Fa-f]{6})>(.*?)</gradient:([0-9A-Fa-f]{6})>"))
-            .add(Pattern.compile("<G:([0-9A-Fa-f]{6})>(.*?)</G:([0-9A-Fa-f]{6})>"))
+            .add(Pattern.compile("<GRADIENT:([0-9A-Fa-f]{6})>(.*?)</GRADIENT:([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
+            .add(Pattern.compile("<GRADIENT:#([0-9A-Fa-f]{6})>(.*?)</GRADIENT:#([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
+            .add(Pattern.compile("<G:([0-9A-Fa-f]{6})>(.*?)</G:([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
+            .add(Pattern.compile("<G:#([0-9A-Fa-f]{6})>(.*?)</G:#([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
+            .add(Pattern.compile("<G#([0-9A-Fa-f]{6})>(.*?)</G#([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
             .add(Pattern.compile("<#:([0-9A-Fa-f]{6})>(.*?)</#:([0-9A-Fa-f]{6})>"))
             .add(Pattern.compile("\\{#:([0-9A-Fa-f]{6})}(.*?)\\{/#:([0-9A-Fa-f]{6})}"))
             .build();
@@ -44,58 +53,215 @@ public class StringUtils {
             .build();
 
     /**
-     * Format a list of strings - converts Placeholders and Color codes.
+     * Legacy serializer.
+     */
+    private static final LegacyComponentSerializer LEGACY_COMPONENT_SERIALIZER = LegacyComponentSerializer.builder()
+            .character('\u00a7')
+            .useUnusualXRepeatedCharacterHexFormat()
+            .hexColors()
+            .build();
+
+    /**
+     * Format a list of strings.
+     * <p>
+     * Converts color codes and placeholders.
+     *
+     * @param list The messages to format.
+     * @return The message, formatted.
+     */
+    @NotNull
+    public List<String> formatList(@NotNull final List<String> list) {
+        return formatList(list, (Player) null);
+    }
+
+    /**
+     * Format a list of strings.
+     * <p>
+     * Coverts color codes and placeholders for a player.
      *
      * @param list   The messages to format.
      * @param player The player to translate placeholders with respect to.
      * @return The message, format.
      */
+    @NotNull
     public List<String> formatList(@NotNull final List<String> list,
                                    @Nullable final Player player) {
+        return formatList(list, player, FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Format a list of strings.
+     * <p>
+     * Converts color codes and placeholders if specified.
+     *
+     * @param list   The messages to format.
+     * @param option The format option.
+     * @return The message, formatted.
+     */
+    @NotNull
+    public List<String> formatList(@NotNull final List<String> list,
+                                   @NotNull final FormatOption option) {
+        return formatList(list, null, option);
+    }
+
+    /**
+     * Format a list of strings.
+     * <p>
+     * Coverts color codes and placeholders for a player if specified.
+     *
+     * @param list   The messages to format.
+     * @param player The player to translate placeholders with respect to.
+     * @param option The options.
+     * @return The message, format.
+     */
+    @NotNull
+    public List<String> formatList(@NotNull final List<String> list,
+                                   @Nullable final Player player,
+                                   @NotNull final FormatOption option) {
         List<String> translated = new ArrayList<>();
         for (String string : list) {
-            translated.add(format(string, player));
+            translated.add(format(string, player, option));
         }
 
         return translated;
     }
 
     /**
-     * Format a list of strings - converts Placeholders and Color codes.
-     *
-     * @param list The messages to format.
-     * @return The message, formatted.
-     */
-    public List<String> formatList(@NotNull final List<String> list) {
-        return formatList(list, null);
-    }
-
-    /**
-     * Format a string - converts Placeholders and Color codes.
-     *
-     * @param message The message to format.
-     * @param player  The player to translate placeholders with respect to.
-     * @return The message, formatted.
-     */
-    public String format(@NotNull final String message,
-                         @Nullable final Player player) {
-        String processedMessage = message;
-        processedMessage = translateGradients(processedMessage);
-        processedMessage = PlaceholderManager.translatePlaceholders(processedMessage, player);
-        processedMessage = translateHexColorCodes(processedMessage);
-        processedMessage = ChatColor.translateAlternateColorCodes('&', processedMessage);
-        return processedMessage;
-    }
-
-    /**
-     * Format a string without respect to a player.
+     * Format a string.
+     * <p>
+     * Converts color codes and placeholders.
      *
      * @param message The message to translate.
      * @return The message, formatted.
      * @see StringUtils#format(String, Player)
      */
+    @NotNull
     public String format(@NotNull final String message) {
-        return format(message, null);
+        return format(message, (Player) null);
+    }
+
+    /**
+     * Format a string.
+     * <p>
+     * Converts color codes and placeholders for a player.
+     *
+     * @param message The message to format.
+     * @param player  The player to translate placeholders with respect to.
+     * @return The message, formatted.
+     */
+    @NotNull
+    public String format(@NotNull final String message,
+                         @Nullable final Player player) {
+        return format(message, player, FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Format a string.
+     * <p>
+     * Converts color codes and placeholders if specified.
+     *
+     * @param message The message to translate.
+     * @param option  The format option.
+     * @return The message, formatted.
+     * @see StringUtils#format(String, Player)
+     */
+    @NotNull
+    public String format(@NotNull final String message,
+                         @NotNull final FormatOption option) {
+        return format(message, null, option);
+    }
+
+    /**
+     * Format a string to a component.
+     * <p>
+     * Converts color codes and placeholders.
+     *
+     * @param message The message to translate.
+     * @return The message, formatted, as a component.
+     * @see StringUtils#format(String, Player)
+     */
+    @NotNull
+    public Component formatToComponent(@NotNull final String message) {
+        return formatToComponent(message, (Player) null);
+    }
+
+    /**
+     * Format a string.
+     * <p>
+     * Converts color codes and placeholders for a player.
+     *
+     * @param message The message to format.
+     * @param player  The player to translate placeholders with respect to.
+     * @return The message, formatted.
+     */
+    @NotNull
+    public Component formatToComponent(@NotNull final String message,
+                                       @Nullable final Player player) {
+        return formatToComponent(message, player, FormatOption.WITH_PLACEHOLDERS);
+    }
+
+    /**
+     * Format a string to a component.
+     * <p>
+     * Converts color codes and placeholders if specified.
+     *
+     * @param message The message to translate.
+     * @param option  The format option.
+     * @return The message, formatted, as a component.
+     * @see StringUtils#format(String, Player)
+     */
+    @NotNull
+    public Component formatToComponent(@NotNull final String message,
+                                       @NotNull final FormatOption option) {
+        return formatToComponent(message, null, option);
+    }
+
+    /**
+     * Format a string to a component.
+     * <p>
+     * Coverts color codes and placeholders for a player if specified.
+     *
+     * @param message The message to format.
+     * @param player  The player to translate placeholders with respect to.
+     * @param option  The format options.
+     * @return The message, formatted, as a component.
+     */
+    @NotNull
+    public Component formatToComponent(@NotNull final String message,
+                                       @Nullable final Player player,
+                                       @NotNull final FormatOption option) {
+        return toComponent(format(message, player, option));
+    }
+
+    /**
+     * Format a string.
+     * <p>
+     * Coverts color codes and placeholders for a player if specified.
+     *
+     * @param message The message to format.
+     * @param player  The player to translate placeholders with respect to.
+     * @param option  The format options.
+     * @return The message, formatted.
+     */
+    @NotNull
+    public String format(@NotNull final String message,
+                         @Nullable final Player player,
+                         @NotNull final FormatOption option) {
+        String processedMessage = message;
+        if (option == FormatOption.WITH_PLACEHOLDERS) {
+            processedMessage = PlaceholderManager.translatePlaceholders(processedMessage, player);
+        }
+        processedMessage = translateGradients(processedMessage);
+        processedMessage = translateHexColorCodes(processedMessage);
+        processedMessage = ChatColor.translateAlternateColorCodes('&', processedMessage);
+        if (Prerequisite.HAS_PAPER.isMet()) {
+            processedMessage = translateMiniMessage(processedMessage);
+        }
+        return processedMessage;
+    }
+
+    private static String translateMiniMessage(@NotNull final String message) {
+        return LEGACY_COMPONENT_SERIALIZER.serialize(MiniMessage.withMarkdownFlavor(DiscordFlavor.get()).parse(message));
     }
 
     private static String translateHexColorCodes(@NotNull final String message) {
@@ -122,14 +288,6 @@ public class StringUtils {
         return matcher.appendTail(builder).toString();
     }
 
-    /**
-     * Colors a string with a gradient.
-     *
-     * @param string The string to color.
-     * @param start  The start color.
-     * @param end    The end color.
-     * @return The string, colored.
-     */
     private static String processGradients(@NotNull final String string,
                                            @NotNull final Color start,
                                            @NotNull final Color end) {
@@ -167,18 +325,13 @@ public class StringUtils {
         return stringBuilder.toString();
     }
 
-    /**
-     * Creates chatColors for gradients.
-     *
-     * @param start The start color.
-     * @param end   The end color.
-     * @param step  How many colors are returned.
-     * @return Array of chat colors.
-     */
     private static ChatColor[] getGradientColors(@NotNull final Color start,
                                                  @NotNull final Color end,
                                                  final int step) {
         ChatColor[] colors = new ChatColor[step];
+        if (step <= 1) {
+            return colors;
+        }
         int stepR = Math.abs(start.getRed() - end.getRed()) / (step - 1);
         int stepG = Math.abs(start.getGreen() - end.getGreen()) / (step - 1);
         int stepB = Math.abs(start.getBlue() - end.getBlue()) / (step - 1);
@@ -195,12 +348,6 @@ public class StringUtils {
         return colors;
     }
 
-    /**
-     * Add gradients to a string.
-     *
-     * @param string The string.
-     * @return The string, colorized.
-     */
     private static String translateGradients(@NotNull final String string) {
         String processedString = string;
         for (Pattern pattern : GRADIENT_PATTERNS) {
@@ -222,6 +369,7 @@ public class StringUtils {
      * @param object The object to convert to string.
      * @return The object stringified.
      */
+    @NotNull
     public String internalToString(@Nullable final Object object) {
         if (object == null) {
             return "null";
@@ -247,6 +395,7 @@ public class StringUtils {
      * @param prefix The substring to remove.
      * @return The string with the prefix removed.
      */
+    @NotNull
     public String removePrefix(@NotNull final String string,
                                @NotNull final String prefix) {
         if (string.startsWith(prefix)) {
@@ -254,4 +403,78 @@ public class StringUtils {
         }
         return string;
     }
+
+    /**
+     * Convert legacy string to JSON.
+     *
+     * @param legacy The legacy string.
+     * @return The JSON String.
+     */
+    @NotNull
+    public String legacyToJson(@Nullable final String legacy) {
+        String processed = legacy;
+        if (legacy == null) {
+            processed = "";
+        }
+        return GsonComponentSerializer.gson().serialize(
+                Component.empty().decoration(TextDecoration.ITALIC, false).append(
+                        LEGACY_COMPONENT_SERIALIZER.deserialize(processed)
+                )
+        );
+    }
+
+    /**
+     * Convert JSON string to legacy.
+     *
+     * @param json The JSON string.
+     * @return The legacy string.
+     */
+    @NotNull
+    public String jsonToLegacy(@NotNull final String json) {
+        return LEGACY_COMPONENT_SERIALIZER.serialize(
+                GsonComponentSerializer.gson().deserialize(json)
+        );
+    }
+
+    /**
+     * Convert legacy (bukkit) text to Component.
+     *
+     * @param legacy The legacy text.
+     * @return The component.
+     */
+    @NotNull
+    public Component toComponent(@Nullable final String legacy) {
+        String processed = legacy;
+        if (legacy == null) {
+            processed = "";
+        }
+
+        return LEGACY_COMPONENT_SERIALIZER.deserialize(processed);
+    }
+
+    /**
+     * Convert Component to legacy (bukkit) text.
+     *
+     * @param component The component.
+     * @return The legacy text.
+     */
+    @NotNull
+    public String toLegacy(@NotNull final Component component) {
+        return LEGACY_COMPONENT_SERIALIZER.serialize(component);
+    }
+
+    /**
+     * Options for formatting.
+     */
+    public enum FormatOption {
+        /**
+         * Completely formatted.
+         */
+        WITH_PLACEHOLDERS,
+
+        /**
+         * Completely formatted without placeholders.
+         */
+        WITHOUT_PLACEHOLDERS
+    }
 }

eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java

@@ -43,6 +43,7 @@ public class TeamUtils {
      * @param color The color to find the team for.
      * @return The team.
      */
+    @NotNull
     public Team fromChatColor(@NotNull final ChatColor color) {
         if (CHAT_COLOR_TEAMS.containsKey(color)) {
             return CHAT_COLOR_TEAMS.get(color);
@@ -70,6 +71,7 @@ public class TeamUtils {
      * @param material The material to find the team from.
      * @return The team.
      */
+    @NotNull
     public Team getMaterialColorTeam(@NotNull final Material material) {
         return fromChatColor(MATERIAL_COLORS.getOrDefault(material, ChatColor.WHITE));
     }

eco-api/src/main/java/com/willfp/eco/util/VectorUtils.java

@@ -44,6 +44,7 @@ public class VectorUtils {
      * @param vec The vector to simplify.
      * @return The vector, simplified.
      */
+    @NotNull
     public Vector simplifyVector(@NotNull final Vector vec) {
         double x = Math.abs(vec.getX());
         double y = Math.abs(vec.getY());
@@ -76,6 +77,7 @@ public class VectorUtils {
      * @param radius The radius.
      * @return An array of {@link Vector}s.
      */
+    @NotNull
     public Vector[] getCircle(final int radius) {
         Vector[] cached = CIRCLE_CACHE.get(radius);
         if (cached != null) {
@@ -112,6 +114,7 @@ public class VectorUtils {
      * @param radius The radius of the square.
      * @return An array of {@link Vector}s.
      */
+    @NotNull
     public Vector[] getSquare(final int radius) {
         List<Vector> vectors = new ArrayList<>();
 
@@ -136,6 +139,7 @@ public class VectorUtils {
      * @param radius The radius of the cube.
      * @return An array of {@link Vector}s.
      */
+    @NotNull
     public Vector[] getCube(final int radius) {
         List<Vector> vectors = new ArrayList<>();
 

eco-api/src/test/java/NumberUtilsTest.java

@@ -0,0 +1,24 @@
+import com.willfp.eco.util.NumberUtils;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class NumberUtilsTest {
+    @Test
+    public void testFormatDouble() {
+        Assertions.assertEquals("3", NumberUtils.format(3.0D));
+        Assertions.assertEquals("3.20", NumberUtils.format(3.2D));
+    }
+
+    @Test
+    public void testLog2() {
+        Assertions.assertEquals(1, NumberUtils.log2(2));
+    }
+
+    @Test
+    public void testNumerals() {
+        Assertions.assertEquals(4, NumberUtils.fromNumeral("IV"));
+        Assertions.assertEquals(9, NumberUtils.fromNumeral("IX"));
+        Assertions.assertEquals("XIV", NumberUtils.toNumeral(14));
+        Assertions.assertEquals("XXI", NumberUtils.toNumeral(21));
+    }
+}

eco-core/build.gradle

@@ -1,8 +1,29 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
+    }
+}
+
 group 'com.willfp'
 version rootProject.version
 
 subprojects {
+    apply plugin: "kotlin"
+
     dependencies {
         compileOnly project(":eco-api")
+        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.5.31'
+    }
+
+    compileKotlin {
+        kotlinOptions {
+            jvmTarget = "16"
+        }
+        targetCompatibility = JavaVersion.VERSION_16
+        sourceCompatibility = JavaVersion.VERSION_16
     }
 }

eco-core/core-backend/build.gradle

@@ -2,7 +2,9 @@ group 'com.willfp'
 version rootProject.version
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
-    compileOnly 'me.clip:placeholderapi:2.10.9'
+    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
+    compileOnly 'me.clip:placeholderapi:2.10.10'
     compileOnly 'org.reflections:reflections:0.9.12'
+    compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
+    compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
 }

eco-core/core-backend/src/main/java/com/willfp/eco/internal/EcoCleaner.java

@@ -1,31 +0,0 @@
-package com.willfp.eco.internal;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.proxy.Cleaner;
-import com.willfp.eco.internal.proxy.EcoProxyFactory;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.net.URLClassLoader;
-
-public class EcoCleaner implements Cleaner {
-    @Override
-    public void clean(@NotNull final EcoPlugin plugin) {
-        if (!plugin.getProxyPackage().equalsIgnoreCase("")) {
-            EcoProxyFactory factory = (EcoProxyFactory) plugin.getProxyFactory();
-            factory.clean();
-        }
-
-        Plugins.LOADED_ECO_PLUGINS.remove(plugin.getName().toLowerCase());
-
-        if (plugin.getClass().getClassLoader() instanceof URLClassLoader urlClassLoader) {
-            try {
-                urlClassLoader.close();
-            } catch (IOException e) {
-                // Do nothing.
-            }
-        }
-
-        System.gc();
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/Plugins.java

@@ -1,12 +0,0 @@
-package com.willfp.eco.internal;
-
-import com.willfp.eco.core.EcoPlugin;
-import lombok.experimental.UtilityClass;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@UtilityClass
-public class Plugins {
-    public static final Map<String, EcoPlugin> LOADED_ECO_PLUGINS = new HashMap<>();
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/EcoConfigFactory.java

@@ -1,70 +0,0 @@
-package com.willfp.eco.internal.config;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.interfaces.Config;
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.config.wrapper.ConfigFactory;
-import com.willfp.eco.internal.config.json.EcoJSONConfigSection;
-import com.willfp.eco.internal.config.json.EcoLoadableJSONConfig;
-import com.willfp.eco.internal.config.yaml.EcoLoadableYamlConfig;
-import com.willfp.eco.internal.config.yaml.EcoUpdatableYamlConfig;
-import com.willfp.eco.internal.config.yaml.EcoYamlConfigSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-
-public class EcoConfigFactory implements ConfigFactory {
-    @Override
-    public Config createUpdatableYamlConfig(@NotNull final String configName,
-                                            @NotNull final EcoPlugin plugin,
-                                            @NotNull final String subDirectoryPath,
-                                            @NotNull final Class<?> source,
-                                            final boolean removeUnused,
-                                            @NotNull final String... updateBlacklist) {
-        return new EcoUpdatableYamlConfig(
-                configName,
-                plugin,
-                subDirectoryPath,
-                source,
-                removeUnused,
-                updateBlacklist
-        );
-    }
-
-    @Override
-    public JSONConfig createLoadableJSONConfig(@NotNull final String configName,
-                                               @NotNull final EcoPlugin plugin,
-                                               @NotNull final String subDirectoryPath,
-                                               @NotNull final Class<?> source) {
-        return new EcoLoadableJSONConfig(
-                configName,
-                plugin,
-                subDirectoryPath,
-                source
-        );
-    }
-
-    @Override
-    public Config createLoadableYamlConfig(@NotNull final String configName,
-                                           @NotNull final EcoPlugin plugin,
-                                           @NotNull final String subDirectoryPath,
-                                           @NotNull final Class<?> source) {
-        return new EcoLoadableYamlConfig(
-                configName,
-                plugin,
-                subDirectoryPath,
-                source
-        );
-    }
-
-    @Override
-    public Config createYamlConfig(@NotNull final YamlConfiguration config) {
-        return new EcoYamlConfigSection(config);
-    }
-
-    @Override
-    public JSONConfig createJSONConfig(@NotNull final Map<String, Object> values) {
-        return new EcoJSONConfigSection(values);
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/EcoJSONConfigSection.java

@@ -1,11 +0,0 @@
-package com.willfp.eco.internal.config.json;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-
-public class EcoJSONConfigSection extends EcoJSONConfigWrapper {
-    public EcoJSONConfigSection(@NotNull final Map<String, Object> values) {
-        this.init(values);
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.java

@@ -1,370 +0,0 @@
-package com.willfp.eco.internal.config.json;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.willfp.eco.core.config.interfaces.Config;
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.util.StringUtils;
-import lombok.Getter;
-import org.apache.commons.lang.Validate;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-@SuppressWarnings({"unchecked", "unused"})
-public class EcoJSONConfigWrapper implements JSONConfig {
-    @Getter
-    private final Gson handle = new GsonBuilder().setPrettyPrinting().create();
-    
-    @Getter
-    private final Map<String, Object> values = new HashMap<>();
-
-    @Getter
-    private final Map<String, Object> cache = new HashMap<>();
-    
-    public EcoJSONConfigWrapper() {
-
-    }
-
-    public void init(@NotNull final Map<String, Object> values) {
-        this.values.clear();
-        this.values.putAll(values);
-    }
-
-    @Override
-    public final void clearCache() {
-        cache.clear();
-    }
-
-    @Override
-    public String toPlaintext() {
-        return this.getHandle().toJson(this.getValues());
-    }
-
-    @Override
-    public boolean has(@NotNull final String path) {
-        return getOfKnownType(path, Object.class) != null;
-    }
-
-    @Nullable
-    protected <T> T getOfKnownType(@NotNull final String path,
-                                   @NotNull final Class<T> clazz) {
-        return getOfKnownType(path, clazz, true);
-    }
-
-    @Nullable
-    protected <T> T getOfKnownType(@NotNull final String path,
-                                   @NotNull final Class<T> clazz,
-                                   final boolean isBase) {
-        String closestPath = path;
-
-        if (cache.containsKey(path) && isBase) {
-            return (T) cache.get(path);
-        }
-
-        if (path.contains(".")) {
-            String[] split = path.split("\\.");
-            closestPath = split[0];
-        }
-
-        if (values.get(closestPath) instanceof Map && !path.equals(closestPath)) {
-            EcoJSONConfigSection section = new EcoJSONConfigSection((Map<String, Object>) values.get(closestPath));
-            return section.getOfKnownType(path.substring(closestPath.length() + 1), clazz, false);
-        } else {
-            if (values.containsKey(closestPath)) {
-                return (T) values.get(closestPath);
-            } else {
-                return null;
-            }
-        }
-    }
-
-    @NotNull
-    @Override
-    public List<String> getKeys(final boolean deep) {
-        if (deep) {
-            return new ArrayList<>(getDeepKeys(new HashSet<>(), ""));
-        } else {
-            return new ArrayList<>(values.keySet());
-        }
-    }
-
-    protected Set<String> getDeepKeys(@NotNull final Set<String> list,
-                                      @NotNull final String root) {
-        for (String key : values.keySet()) {
-            list.add(root + key);
-
-            if (values.get(key) instanceof Map) {
-                EcoJSONConfigSection section = new EcoJSONConfigSection((Map<String, Object>) values.get(key));
-                list.addAll(section.getDeepKeys(list, root + key + "."));
-            }
-        }
-
-        return list;
-    }
-
-    @Override
-    @Nullable
-    public Object get(@NotNull final String path) {
-        return getOfKnownType(path, Object.class);
-    }
-
-    @Override
-    public void set(@NotNull final String path,
-                    @Nullable final Object object) {
-        setRecursively(path, object, true);
-        clearCache();
-    }
-
-    protected void setRecursively(@NotNull final String path,
-                                  @Nullable final Object object,
-                                  final boolean isBase) {
-        String closestPath = path;
-
-        if (path.contains(".")) {
-            String[] split = path.split("\\.");
-            closestPath = split[0];
-        }
-
-        if (values.get(closestPath) instanceof Map && !path.equals(closestPath)) {
-            EcoJSONConfigSection section = new EcoJSONConfigSection((Map<String, Object>) values.get(closestPath));
-            section.setRecursively(path.substring(closestPath.length() + 1), object, false);
-            values.put(closestPath, section.getValues());
-        } else {
-            Object obj = object;
-
-            if (object instanceof JSONConfig) {
-                obj = ((EcoJSONConfigWrapper) object).getValues();
-            }
-
-            values.put(path, obj);
-        }
-    }
-
-    @Override
-    @NotNull
-    public Config getSubsection(@NotNull final String path) {
-        Config subsection = getSubsectionOrNull(path);
-        Validate.notNull(subsection);
-        return subsection;
-    }
-
-    @Override
-    @Nullable
-    public Config getSubsectionOrNull(@NotNull final String path) {
-        if (values.containsKey(path)) {
-            Map<String, Object> subsection = (Map<String, Object>) values.get(path);
-            return new EcoJSONConfigSection(subsection);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @NotNull
-    public List<JSONConfig> getSubsections(@NotNull final String path) {
-        List<JSONConfig> subsections = getSubsectionsOrNull(path);
-        Validate.notNull(subsections);
-        return subsections;
-    }
-
-    @Override
-    @Nullable
-    public List<JSONConfig> getSubsectionsOrNull(@NotNull final String path) {
-        List<Map<String, Object>> maps = (List<Map<String, Object>>) getOfKnownType(path, Object.class);
-
-        if (maps == null) {
-            return null;
-        }
-
-        List<JSONConfig> configs = new ArrayList<>();
-
-        for (Map<String, Object> map : maps) {
-            configs.add(new EcoJSONConfigSection(map));
-        }
-
-        return configs;
-    }
-
-    @Override
-    public int getInt(@NotNull final String path) {
-        // ew
-        return Objects.requireNonNullElse(getOfKnownType(path, Double.class), 0D).intValue();
-    }
-
-    @Override
-    @Nullable
-    public Integer getIntOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getInt(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public int getInt(@NotNull final String path,
-                      final int def) {
-        return Objects.requireNonNullElse(getOfKnownType(path, Integer.class), def);
-    }
-
-    @Override
-    @NotNull
-    public List<Integer> getInts(@NotNull final String path) {
-        return (List<Integer>) Objects.requireNonNullElse(getOfKnownType(path, Object.class), new ArrayList<>());
-    }
-
-    @Override
-    @Nullable
-    public List<Integer> getIntsOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getInts(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public boolean getBool(@NotNull final String path) {
-        return Objects.requireNonNullElse(getOfKnownType(path, Boolean.class), false);
-    }
-
-    @Override
-    @Nullable
-    public Boolean getBoolOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getBool(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @NotNull
-    public List<Boolean> getBools(@NotNull final String path) {
-        return (List<Boolean>) Objects.requireNonNullElse(getOfKnownType(path, Object.class), new ArrayList<>());
-    }
-
-    @Override
-    @Nullable
-    public List<Boolean> getBoolsOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getBools(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @NotNull
-    public String getString(@NotNull final String path) {
-        return getString(path, true);
-    }
-
-    @Override
-    @NotNull
-    public String getString(@NotNull final String path,
-                            final boolean format) {
-        String string = Objects.requireNonNullElse(getOfKnownType(path, String.class), "");
-        return format ? StringUtils.format(string) : string;
-    }
-
-    @Override
-    @Nullable
-    public String getStringOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getString(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @Nullable
-    public String getStringOrNull(@NotNull final String path,
-                                  final boolean format) {
-        if (has(path)) {
-            return getString(path, format);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @NotNull
-    public List<String> getStrings(@NotNull final String path) {
-        return getStrings(path, true);
-    }
-
-    @Override
-    @NotNull
-    public List<String> getStrings(@NotNull final String path,
-                                   final boolean format) {
-        List<String> strings = (List<String>) Objects.requireNonNullElse(getOfKnownType(path, Object.class), new ArrayList<>());
-
-        return format ? StringUtils.formatList(strings) : strings;
-    }
-
-    @Override
-    @Nullable
-    public List<String> getStringsOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getStrings(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public @Nullable List<String> getStringsOrNull(@NotNull final String path,
-                                                   final boolean format) {
-        if (has(path)) {
-            return getStrings(path, format);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public double getDouble(@NotNull final String path) {
-        return Objects.requireNonNullElse(getOfKnownType(path, Double.class), 0D);
-    }
-
-    @Override
-    @Nullable
-    public Double getDoubleOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getDouble(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @NotNull
-    public List<Double> getDoubles(@NotNull final String path) {
-        return (List<Double>) Objects.requireNonNullElse(getOfKnownType(path, Object.class), new ArrayList<>());
-    }
-
-    @Override
-    @Nullable
-    public List<Double> getDoublesOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getDoubles(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public JSONConfig clone() {
-        return new EcoJSONConfigSection(new HashMap<>(this.getValues()));
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/EcoLoadableJSONConfig.java

@@ -1,119 +0,0 @@
-package com.willfp.eco.internal.config.json;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.interfaces.LoadableConfig;
-import lombok.AccessLevel;
-import lombok.Getter;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.StandardOpenOption;
-import java.util.HashMap;
-
-@SuppressWarnings({"unchecked", "unused"})
-public class EcoLoadableJSONConfig extends EcoJSONConfigWrapper implements LoadableConfig {
-    @Getter
-    private final File configFile;
-    
-    @Getter(AccessLevel.PROTECTED)
-    private final EcoPlugin plugin;
-    
-    @Getter
-    private final String name;
-
-    @Getter(AccessLevel.PROTECTED)
-    private final String subDirectoryPath;
-
-    @Getter(AccessLevel.PROTECTED)
-    private final Class<?> source;
-
-    public EcoLoadableJSONConfig(@NotNull final String configName,
-                                 @NotNull final EcoPlugin plugin,
-                                 @NotNull final String subDirectoryPath,
-                                 @NotNull final Class<?> source) {
-        this.plugin = plugin;
-        this.name = configName + ".json";
-        this.source = source;
-        this.subDirectoryPath = subDirectoryPath;
-
-        File directory = new File(this.getPlugin().getDataFolder(), subDirectoryPath);
-        if (!directory.exists()) {
-            directory.mkdirs();
-        }
-
-        if (!new File(directory, this.name).exists()) {
-            createFile();
-        }
-
-        this.configFile = new File(directory, this.name);
-
-        try {
-            init(this.configFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        plugin.getConfigHandler().addConfig(this);
-    }
-
-    @Override
-    public void createFile() {
-        String resourcePath = getResourcePath();
-        InputStream in = source.getResourceAsStream(resourcePath);
-
-        File outFile = new File(this.getPlugin().getDataFolder(), resourcePath);
-        int lastIndex = resourcePath.lastIndexOf('/');
-        File outDir = new File(this.getPlugin().getDataFolder(), resourcePath.substring(0, Math.max(lastIndex, 0)));
-
-        if (!outDir.exists()) {
-            outDir.mkdirs();
-        }
-
-        try {
-            if (!outFile.exists()) {
-                OutputStream out = new FileOutputStream(outFile);
-                byte[] buf = new byte[1024];
-                int len;
-                while ((len = in.read(buf)) > 0) {
-                    out.write(buf, 0, len);
-                }
-                out.close();
-                in.close();
-            }
-        } catch (IOException ignored) {
-        }
-    }
-
-    
-    @Override
-    public String getResourcePath() {
-        String resourcePath;
-
-        if (subDirectoryPath.isEmpty()) {
-            resourcePath = name;
-        } else {
-            resourcePath = subDirectoryPath + name;
-        }
-
-        return "/" + resourcePath;
-    }
-
-    
-    @Override
-    public void save() throws IOException {
-        configFile.delete();
-        Files.write(configFile.toPath(), this.toPlaintext().getBytes(), StandardOpenOption.CREATE, StandardOpenOption.WRITE);
-    }
-
-    
-    public void init(@NotNull final File file) throws FileNotFoundException {
-        super.init(this.getHandle().fromJson(new FileReader(file), HashMap.class));
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/updating/EcoConfigHandler.java

@@ -1,81 +0,0 @@
-package com.willfp.eco.internal.config.updating;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
-import com.willfp.eco.core.config.interfaces.LoadableConfig;
-import com.willfp.eco.core.config.updating.ConfigHandler;
-import com.willfp.eco.core.config.updating.ConfigUpdater;
-import com.willfp.eco.internal.config.updating.exceptions.InvalidUpdateMethodException;
-import com.willfp.eco.internal.config.yaml.EcoUpdatableYamlConfig;
-import org.jetbrains.annotations.NotNull;
-import org.reflections.Reflections;
-import org.reflections.scanners.MethodAnnotationsScanner;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EcoConfigHandler extends PluginDependent<EcoPlugin> implements ConfigHandler {
-    private final List<LoadableConfig> configs = new ArrayList<>();
-
-    private final Reflections reflections;
-
-    public EcoConfigHandler(@NotNull final EcoPlugin plugin) {
-        super(plugin);
-
-        this.reflections = new Reflections(
-                this.getPlugin().getClass().getClassLoader(),
-                new MethodAnnotationsScanner()
-        );
-    }
-
-    @Override
-    public void callUpdate() {
-        for (Method method : reflections.getMethodsAnnotatedWith(ConfigUpdater.class)) {
-            if (!Modifier.isStatic(method.getModifiers())) {
-                throw new InvalidUpdateMethodException("Update method must be static.");
-            }
-
-            try {
-                if (method.getParameterCount() == 0) {
-                    method.invoke(null);
-                } else if (method.getParameterCount() == 1) {
-                    method.invoke(null, this.getPlugin());
-                } else {
-                    throw new InvalidUpdateMethodException("Update method must have 0 parameters or a plugin parameter.");
-                }
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-                throw new InvalidUpdateMethodException("Update method generated an exception.");
-            }
-        }
-    }
-
-    @Override
-    public void saveAllConfigs() {
-        try {
-            for (LoadableConfig config : configs) {
-                config.save();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void addConfig(@NotNull final LoadableConfig config) {
-        configs.add(config);
-    }
-
-    @Override
-    public void updateConfigs() {
-        for (LoadableConfig config : configs) {
-            if (config instanceof EcoUpdatableYamlConfig updatableYamlConfig) {
-                updatableYamlConfig.update();
-            }
-        }
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/updating/exceptions/InvalidUpdateMethodException.java

@@ -1,9 +0,0 @@
-package com.willfp.eco.internal.config.updating.exceptions;
-
-import org.jetbrains.annotations.NotNull;
-
-public class InvalidUpdateMethodException extends RuntimeException {
-    public InvalidUpdateMethodException(@NotNull final String message) {
-        super(message);
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/EcoLoadableYamlConfig.java

@@ -1,107 +0,0 @@
-package com.willfp.eco.internal.config.yaml;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.interfaces.LoadableConfig;
-import com.willfp.eco.core.config.interfaces.WrappedYamlConfiguration;
-import lombok.AccessLevel;
-import lombok.Getter;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class EcoLoadableYamlConfig extends EcoYamlConfigWrapper<YamlConfiguration> implements WrappedYamlConfiguration, LoadableConfig {
-    @Getter
-    private final File configFile;
-    
-    @Getter(AccessLevel.PROTECTED)
-    private final EcoPlugin plugin;
-
-    @Getter
-    private final String name;
-    
-    @Getter(AccessLevel.PROTECTED)
-    private final String subDirectoryPath;
-
-    @Getter(AccessLevel.PROTECTED)
-    private final Class<?> source;
-
-    public EcoLoadableYamlConfig(@NotNull final String configName,
-                                 @NotNull final EcoPlugin plugin,
-                                 @NotNull final String subDirectoryPath,
-                                 @NotNull final Class<?> source) {
-        this.plugin = plugin;
-        this.name = configName + ".yml";
-        this.source = source;
-        this.subDirectoryPath = subDirectoryPath;
-
-        File directory = new File(this.getPlugin().getDataFolder(), subDirectoryPath);
-        if (!directory.exists()) {
-            directory.mkdirs();
-        }
-
-        if (!new File(directory, this.name).exists()) {
-            createFile();
-        }
-
-        this.configFile = new File(directory, this.name);
-        init(YamlConfiguration.loadConfiguration(configFile));
-    }
-
-    @Override
-    public void createFile() {
-        String resourcePath = getResourcePath();
-        InputStream in = source.getResourceAsStream(resourcePath);
-
-        File outFile = new File(this.getPlugin().getDataFolder(), resourcePath);
-        int lastIndex = resourcePath.lastIndexOf('/');
-        File outDir = new File(this.getPlugin().getDataFolder(), resourcePath.substring(0, Math.max(lastIndex, 0)));
-
-        if (!outDir.exists()) {
-            outDir.mkdirs();
-        }
-
-        try {
-            if (!outFile.exists()) {
-                OutputStream out = new FileOutputStream(outFile);
-                byte[] buf = new byte[1024];
-                int len;
-                while ((len = in.read(buf)) > 0) {
-                    out.write(buf, 0, len);
-                }
-                out.close();
-                in.close();
-            }
-        } catch (IOException ignored) {
-        }
-
-        plugin.getConfigHandler().addConfig(this);
-    }
-
-    @Override
-    public String getResourcePath() {
-        String resourcePath;
-
-        if (subDirectoryPath.isEmpty()) {
-            resourcePath = name;
-        } else {
-            resourcePath = subDirectoryPath + name;
-        }
-
-        return "/" + resourcePath;
-    }
-
-    @Override
-    public void save() throws IOException {
-        this.getHandle().save(this.getConfigFile());
-    }
-
-    @Override
-    public YamlConfiguration getBukkitHandle() {
-        return this.getHandle();
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/EcoUpdatableYamlConfig.java

@@ -1,89 +0,0 @@
-package com.willfp.eco.internal.config.yaml;
-
-import com.willfp.eco.core.EcoPlugin;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class EcoUpdatableYamlConfig extends EcoLoadableYamlConfig {
-    private final boolean removeUnused;
-
-    private final List<String> updateBlacklist;
-
-    public EcoUpdatableYamlConfig(@NotNull final String configName,
-                                  @NotNull final EcoPlugin plugin,
-                                  @NotNull final String subDirectoryPath,
-                                  @NotNull final Class<?> source,
-                                  final boolean removeUnused,
-                                  @NotNull final String... updateBlacklist) {
-        super(configName, plugin, subDirectoryPath, source);
-        this.removeUnused = removeUnused;
-        this.updateBlacklist = new ArrayList<>(Arrays.asList(updateBlacklist));
-        this.updateBlacklist.removeIf(String::isEmpty);
-
-        update();
-    }
-
-    public void update() {
-        super.clearCache();
-        try {
-            this.getHandle().load(this.getConfigFile());
-
-            YamlConfiguration newConfig = this.getConfigInJar();
-
-            if (newConfig.getKeys(true).equals(this.getHandle().getKeys(true))) {
-                return;
-            }
-
-            newConfig.getKeys(true).forEach((s -> {
-                if (!this.getHandle().getKeys(true).contains(s)) {
-                    if (updateBlacklist.stream().noneMatch(s::contains)) {
-                        this.getHandle().set(s, newConfig.get(s));
-                    }
-                }
-            }));
-
-            if (this.removeUnused) {
-                this.getHandle().getKeys(true).forEach((s -> {
-                    if (!newConfig.getKeys(true).contains(s)) {
-                        if (updateBlacklist.stream().noneMatch(s::contains)) {
-                            this.getHandle().set(s, null);
-                        }
-                    }
-                }));
-            }
-
-            this.getHandle().save(this.getConfigFile());
-        } catch (IOException | InvalidConfigurationException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public YamlConfiguration getConfigInJar() {
-        InputStream newIn = this.getSource().getResourceAsStream(getResourcePath());
-
-        if (newIn == null) {
-            throw new NullPointerException(this.getName() + " is null?");
-        }
-
-        BufferedReader reader = new BufferedReader(new InputStreamReader(newIn, StandardCharsets.UTF_8));
-        YamlConfiguration newConfig = new YamlConfiguration();
-
-        try {
-            newConfig.load(reader);
-        } catch (IOException | InvalidConfigurationException e) {
-            e.printStackTrace();
-        }
-
-        return newConfig;
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/EcoYamlConfigSection.java

@@ -1,10 +0,0 @@
-package com.willfp.eco.internal.config.yaml;
-
-import org.bukkit.configuration.ConfigurationSection;
-import org.jetbrains.annotations.NotNull;
-
-public class EcoYamlConfigSection extends EcoYamlConfigWrapper<ConfigurationSection> {
-    public EcoYamlConfigSection(@NotNull final ConfigurationSection section) {
-        this.init(section);
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/EcoYamlConfigWrapper.java

@@ -1,316 +0,0 @@
-package com.willfp.eco.internal.config.yaml;
-
-import com.willfp.eco.core.config.interfaces.Config;
-import com.willfp.eco.util.StringUtils;
-import lombok.Getter;
-import org.apache.commons.lang.Validate;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-@SuppressWarnings({"unchecked", "unused"})
-public class EcoYamlConfigWrapper<T extends ConfigurationSection> implements Config {
-    @Getter
-    private T handle = null;
-    
-    private final Map<String, Object> cache = new HashMap<>();
-    
-    public EcoYamlConfigWrapper() {
-
-    }
-
-    protected Config init(@NotNull final T config) {
-        this.handle = config;
-        return this;
-    }
-
-    @Override
-    public String toPlaintext() {
-        YamlConfiguration temp = new YamlConfiguration();
-        for (String key : handle.getKeys(true)) {
-            temp.set(key, handle.get(key));
-        }
-        return temp.saveToString();
-    }
-
-    @Override
-    public final void clearCache() {
-        cache.clear();
-    }
-
-    @Override
-    public boolean has(@NotNull final String path) {
-        return handle.contains(path);
-    }
-
-    @NotNull
-    @Override
-    public List<String> getKeys(final boolean deep) {
-        return new ArrayList<>(handle.getKeys(deep));
-    }
-
-    @Override
-    @Nullable
-    public Object get(@NotNull final String path) {
-        return handle.get(path);
-    }
-
-    @Override
-    public void set(@NotNull final String path,
-                    @Nullable final Object object) {
-        cache.remove(path);
-        handle.set(path, object);
-    }
-
-    @Override
-    @NotNull
-    public Config getSubsection(@NotNull final String path) {
-        Config subsection = getSubsectionOrNull(path);
-        Validate.notNull(subsection);
-        return subsection;
-    }
-
-    @Override
-    @Nullable
-    public Config getSubsectionOrNull(@NotNull final String path) {
-        if (cache.containsKey(path)) {
-            return (Config) cache.get(path);
-        } else {
-            ConfigurationSection raw = handle.getConfigurationSection(path);
-            if (raw == null) {
-                cache.put(path, null);
-            } else {
-                cache.put(path, new EcoYamlConfigSection(raw));
-            }
-            return getSubsectionOrNull(path);
-        }
-    }
-
-    @Override
-    public int getInt(@NotNull final String path) {
-        if (cache.containsKey(path)) {
-            return (int) cache.get(path);
-        } else {
-            cache.put(path, handle.getInt(path, 0));
-            return getInt(path);
-        }
-    }
-
-    @Override
-    @Nullable
-    public Integer getIntOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getInt(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public int getInt(@NotNull final String path,
-                      final int def) {
-        if (cache.containsKey(path)) {
-            return (int) cache.get(path);
-        } else {
-            cache.put(path, handle.getInt(path, def));
-            return getInt(path);
-        }
-    }
-
-    @Override
-    @NotNull
-    public List<Integer> getInts(@NotNull final String path) {
-        if (cache.containsKey(path)) {
-            return (List<Integer>) cache.get(path);
-        } else {
-            cache.put(path, has(path) ? new ArrayList<>(handle.getIntegerList(path)) : new ArrayList<>());
-            return getInts(path);
-        }
-    }
-
-    @Override
-    @Nullable
-    public List<Integer> getIntsOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getInts(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public boolean getBool(@NotNull final String path) {
-        if (cache.containsKey(path)) {
-            return (boolean) cache.get(path);
-        } else {
-            cache.put(path, handle.getBoolean(path));
-            return getBool(path);
-        }
-    }
-
-    @Override
-    @Nullable
-    public Boolean getBoolOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getBool(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @NotNull
-    public List<Boolean> getBools(@NotNull final String path) {
-        if (cache.containsKey(path)) {
-            return (List<Boolean>) cache.get(path);
-        } else {
-            cache.put(path, has(path) ? new ArrayList<>(handle.getBooleanList(path)) : new ArrayList<>());
-            return getBools(path);
-        }
-    }
-
-    @Override
-    @Nullable
-    public List<Boolean> getBoolsOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getBools(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @NotNull
-    public String getString(@NotNull final String path) {
-        if (cache.containsKey(path)) {
-            return (String) cache.get(path);
-        } else {
-            cache.put(path, StringUtils.format(Objects.requireNonNull(handle.getString(path, ""))));
-            return getString(path);
-        }
-    }
-
-    @Override
-    public @NotNull String getString(@NotNull final String path,
-                                     final boolean format) {
-        if (cache.containsKey(path)) {
-            return (String) cache.get(path);
-        } else {
-            String string = Objects.requireNonNull(handle.getString(path, ""));
-            cache.put(path, format ? StringUtils.format(string) : string);
-            return getString(path);
-        }
-    }
-
-    @Override
-    @Nullable
-    public String getStringOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getString(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public @Nullable String getStringOrNull(@NotNull final String path,
-                                            final boolean format) {
-        if (has(path)) {
-            return getString(path, format);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @NotNull
-    public List<String> getStrings(@NotNull final String path) {
-        return getStrings(path, true);
-    }
-
-    @Override
-    @NotNull
-    public List<String> getStrings(@NotNull final String path,
-                                   final boolean format) {
-        if (cache.containsKey(path)) {
-            return format ? StringUtils.formatList((List<String>) cache.get(path)) : (List<String>) cache.get(path);
-        } else {
-            cache.put(path, has(path) ? new ArrayList<>(handle.getStringList(path)) : new ArrayList<>());
-            return getStrings(path);
-        }
-    }
-
-    @Override
-    @Nullable
-    public List<String> getStringsOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getStrings(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public @Nullable List<String> getStringsOrNull(@NotNull final String path,
-                                                   final boolean format) {
-        if (has(path)) {
-            return getStrings(path, format);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public double getDouble(@NotNull final String path) {
-        if (cache.containsKey(path)) {
-            return (double) cache.get(path);
-        } else {
-            cache.put(path, handle.getDouble(path));
-            return getDouble(path);
-        }
-    }
-
-    @Override
-    @Nullable
-    public Double getDoubleOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getDouble(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @NotNull
-    public List<Double> getDoubles(@NotNull final String path) {
-        if (cache.containsKey(path)) {
-            return (List<Double>) cache.get(path);
-        } else {
-            cache.put(path, has(path) ? new ArrayList<>(handle.getDoubleList(path)) : new ArrayList<>());
-            return getDoubles(path);
-        }
-    }
-
-    @Override
-    @Nullable
-    public List<Double> getDoublesOrNull(@NotNull final String path) {
-        if (has(path)) {
-            return getDoubles(path);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public Config clone() {
-        return new EcoYamlConfigSection(YamlConfiguration.loadConfiguration(new StringReader(this.toPlaintext())));
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/drops/DropManager.java

@@ -1,18 +0,0 @@
-package com.willfp.eco.internal.drops;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.updating.ConfigUpdater;
-import lombok.Getter;
-import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
-
-@UtilityClass
-public final class DropManager {
-    @Getter
-    private DropQueueType type = DropQueueType.COLLATED;
-
-    @ConfigUpdater
-    public static void update(@NotNull final EcoPlugin plugin) {
-        type = plugin.getConfigYml().getBool("use-fast-collated-drops") ? DropQueueType.COLLATED : DropQueueType.STANDARD;
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/drops/DropQueueType.java

@@ -1,6 +0,0 @@
-package com.willfp.eco.internal.drops;
-
-public enum DropQueueType {
-    STANDARD,
-    COLLATED
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/drops/EcoDropQueueFactory.java

@@ -1,15 +0,0 @@
-package com.willfp.eco.internal.drops;
-
-import com.willfp.eco.core.drops.DropQueueFactory;
-import com.willfp.eco.core.drops.InternalDropQueue;
-import com.willfp.eco.internal.drops.impl.EcoDropQueue;
-import com.willfp.eco.internal.drops.impl.EcoFastCollatedDropQueue;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class EcoDropQueueFactory implements DropQueueFactory {
-    @Override
-    public InternalDropQueue create(@NotNull final Player player) {
-        return DropManager.getType() == DropQueueType.COLLATED ? new EcoFastCollatedDropQueue(player) : new EcoDropQueue(player);
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/drops/impl/EcoDropQueue.java

@@ -1,114 +0,0 @@
-package com.willfp.eco.internal.drops.impl;
-
-import com.willfp.eco.core.drops.InternalDropQueue;
-import com.willfp.eco.util.TelekinesisUtils;
-import lombok.AccessLevel;
-import lombok.Getter;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerExpChangeEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-public class EcoDropQueue implements InternalDropQueue {
-    @Getter(AccessLevel.PROTECTED)
-    private final List<ItemStack> items;
-    
-    @Getter(AccessLevel.PROTECTED)
-    private int xp;
-    
-    @Getter(AccessLevel.PROTECTED)
-    private final Player player;
-
-    @Getter(AccessLevel.PROTECTED)
-    private Location loc;
-    
-    @Getter(AccessLevel.PROTECTED)
-    private boolean hasTelekinesis = false;
-
-    public EcoDropQueue(@NotNull final Player player) {
-        this.items = new ArrayList<>();
-        this.xp = 0;
-        this.player = player;
-        this.loc = player.getLocation();
-    }
-
-    @Override
-    public InternalDropQueue addItem(@NotNull final ItemStack item) {
-        this.items.add(item);
-        return this;
-    }
-
-    @Override
-    public InternalDropQueue addItems(@NotNull final Collection<ItemStack> itemStacks) {
-        this.items.addAll(itemStacks);
-        return this;
-    }
-
-    @Override
-    public InternalDropQueue addXP(final int amount) {
-        this.xp += amount;
-        return this;
-    }
-
-    @Override
-    public InternalDropQueue setLocation(@NotNull final Location location) {
-        this.loc = location;
-        return this;
-    }
-
-    @Override
-    public InternalDropQueue forceTelekinesis() {
-        this.hasTelekinesis = true;
-        return this;
-    }
-
-    @Override
-    public void push() {
-        if (!hasTelekinesis) {
-            hasTelekinesis = TelekinesisUtils.testPlayer(player);
-        }
-
-        World world = loc.getWorld();
-        assert world != null;
-        loc = loc.add(0.5, 0.5, 0.5);
-
-        items.removeIf(itemStack -> itemStack.getType() == Material.AIR);
-        if (items.isEmpty()) {
-            return;
-        }
-
-        if (hasTelekinesis) {
-            HashMap<Integer, ItemStack> leftover = player.getInventory().addItem(items.toArray(new ItemStack[0]));
-            for (ItemStack drop : leftover.values()) {
-                world.dropItem(loc, drop).setVelocity(new Vector());
-            }
-            if (xp > 0) {
-                PlayerExpChangeEvent event = new PlayerExpChangeEvent(player, xp);
-                Bukkit.getPluginManager().callEvent(event);
-                ExperienceOrb orb = (ExperienceOrb) world.spawnEntity(player.getLocation().add(0, 0.2, 0), EntityType.EXPERIENCE_ORB);
-                orb.setVelocity(new Vector(0, 0, 0));
-                orb.setExperience(event.getAmount());
-            }
-        } else {
-            for (ItemStack drop : items) {
-                world.dropItem(loc, drop).setVelocity(new Vector());
-            }
-            if (xp > 0) {
-                ExperienceOrb orb = (ExperienceOrb) world.spawnEntity(loc, EntityType.EXPERIENCE_ORB);
-                orb.setExperience(xp);
-            }
-        }
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/drops/impl/EcoFastCollatedDropQueue.java

@@ -1,61 +0,0 @@
-package com.willfp.eco.internal.drops.impl;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class EcoFastCollatedDropQueue extends EcoDropQueue {
-    public static final Map<Player, CollatedDrops> COLLATED_MAP = new ConcurrentHashMap<>();
-
-    public EcoFastCollatedDropQueue(@NotNull final Player player) {
-        super(player);
-    }
-
-    @Override
-    public void push() {
-        CollatedDrops fetched = COLLATED_MAP.get(getPlayer());
-        CollatedDrops collatedDrops = fetched == null ? new CollatedDrops(getItems(), getLoc(), getXp()) : fetched.addDrops(getItems()).setLocation(getLoc()).addXp(getXp());
-        COLLATED_MAP.put(this.getPlayer(), collatedDrops);
-    }
-
-    @ToString
-    public static final class CollatedDrops {
-        @Getter
-        private final List<ItemStack> drops;
-
-        @Getter
-        @Setter
-        @Accessors(chain = true)
-        private Location location;
-
-        @Getter
-        private int xp;
-
-        private CollatedDrops(@NotNull final List<ItemStack> drops,
-                              @NotNull final Location location,
-                              final int xp) {
-            this.drops = drops;
-            this.location = location;
-            this.xp = xp;
-        }
-
-        public CollatedDrops addDrops(@NotNull final List<ItemStack> toAdd) {
-            drops.addAll(toAdd);
-            return this;
-        }
-
-        public CollatedDrops addXp(final int xp) {
-            this.xp += xp;
-            return this;
-        }
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/events/EcoEventManager.java

@@ -1,32 +0,0 @@
-package com.willfp.eco.internal.events;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
-import com.willfp.eco.core.events.EventManager;
-import org.bukkit.Bukkit;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-public class EcoEventManager extends PluginDependent<EcoPlugin> implements EventManager {
-    @ApiStatus.Internal
-    public EcoEventManager(@NotNull final EcoPlugin plugin) {
-        super(plugin);
-    }
-
-    @Override
-    public void registerListener(@NotNull final Listener listener) {
-        Bukkit.getPluginManager().registerEvents(listener, this.getPlugin());
-    }
-
-    @Override
-    public void unregisterListener(@NotNull final Listener listener) {
-        HandlerList.unregisterAll(listener);
-    }
-
-    @Override
-    public void unregisterAllListeners() {
-        HandlerList.unregisterAll(this.getPlugin());
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java

@@ -1,121 +0,0 @@
-package com.willfp.eco.internal.extensions;
-
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
-import com.willfp.eco.core.extensions.Extension;
-import com.willfp.eco.core.extensions.ExtensionLoader;
-import com.willfp.eco.core.extensions.ExtensionMetadata;
-import com.willfp.eco.core.extensions.MalformedExtensionException;
-import org.apache.commons.lang.Validate;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-public class EcoExtensionLoader extends PluginDependent<EcoPlugin> implements ExtensionLoader {
-    private final Set<Extension> extensions = new HashSet<>();
-
-    public EcoExtensionLoader(@NotNull final EcoPlugin plugin) {
-        super(plugin);
-    }
-
-    @Override
-    public void loadExtensions() {
-        File dir = new File(this.getPlugin().getDataFolder(), "/extensions");
-        if (!dir.exists()) {
-            dir.mkdirs();
-        }
-
-        File[] extensionJars = dir.listFiles();
-
-        if (extensionJars == null) {
-            return;
-        }
-
-        for (File extensionJar : extensionJars) {
-            if (!extensionJar.isFile()) {
-                continue;
-            }
-
-            try {
-                loadExtension(extensionJar);
-            } catch (MalformedExtensionException e) {
-                this.getPlugin().getLogger().severe(extensionJar.getName() + " caused MalformedExtensionException: " + e.getMessage());
-            }
-        }
-    }
-
-    private void loadExtension(@NotNull final File extensionJar) {
-        URL url = null;
-        try {
-            url = extensionJar.toURI().toURL();
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-
-        ClassLoader cl = new URLClassLoader(new URL[]{url}, this.getPlugin().getClass().getClassLoader());
-
-        InputStream ymlIn = cl.getResourceAsStream("extension.yml");
-
-        if (ymlIn == null) {
-            throw new MalformedExtensionException("No extension.yml found in " + extensionJar.getName());
-        }
-
-        YamlConfiguration extensionYml = YamlConfiguration.loadConfiguration(new InputStreamReader(ymlIn));
-
-        Set<String> keys = extensionYml.getKeys(false);
-        ArrayList<String> required = new ArrayList<>(Arrays.asList("main", "name", "version"));
-        required.removeAll(keys);
-        if (!required.isEmpty()) {
-            throw new MalformedExtensionException("Invalid extension.yml found in " + extensionJar.getName() + " - Missing: " + String.join(", ", required));
-        }
-
-        String mainClass = extensionYml.getString("main");
-        String name = extensionYml.getString("name");
-        String version = extensionYml.getString("version");
-        String author = extensionYml.getString("author");
-        Validate.notNull(name, "Name is missing!");
-        Validate.notNull(version, "Version is missing!");
-        Validate.notNull(author, "Author is missing!");
-
-        ExtensionMetadata metadata = new ExtensionMetadata(version, name, author);
-
-        Class<?> cls;
-        Object object = null;
-        try {
-            cls = cl.loadClass(mainClass);
-            object = cls.getConstructor(EcoPlugin.class).newInstance(this.getPlugin());
-        } catch (ReflectiveOperationException e) {
-            e.printStackTrace();
-        }
-
-        if (!(object instanceof Extension extension)) {
-            throw new MalformedExtensionException(extensionJar.getName() + " is invalid");
-        }
-
-        extension.setMetadata(metadata);
-        extension.enable();
-        extensions.add(extension);
-    }
-
-    @Override
-    public void unloadExtensions() {
-        extensions.forEach(Extension::disable);
-        extensions.clear();
-    }
-
-    @Override
-    public Set<Extension> getLoadedExtensions() {
-        return extensions;
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/factory/EcoMetadataValueFactory.java

@@ -1,18 +0,0 @@
-package com.willfp.eco.internal.factory;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
-import com.willfp.eco.core.factory.MetadataValueFactory;
-import org.bukkit.metadata.FixedMetadataValue;
-import org.jetbrains.annotations.NotNull;
-
-public class EcoMetadataValueFactory extends PluginDependent<EcoPlugin> implements MetadataValueFactory {
-    public EcoMetadataValueFactory(@NotNull final EcoPlugin plugin) {
-        super(plugin);
-    }
-
-    @Override
-    public FixedMetadataValue create(@NotNull final Object value) {
-        return new FixedMetadataValue(this.getPlugin(), value);
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/factory/EcoNamespacedKeyFactory.java

@@ -1,18 +0,0 @@
-package com.willfp.eco.internal.factory;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
-import com.willfp.eco.core.factory.NamespacedKeyFactory;
-import org.bukkit.NamespacedKey;
-import org.jetbrains.annotations.NotNull;
-
-public class EcoNamespacedKeyFactory extends PluginDependent<EcoPlugin> implements NamespacedKeyFactory {
-    public EcoNamespacedKeyFactory(@NotNull final EcoPlugin plugin) {
-        super(plugin);
-    }
-
-    @Override
-    public NamespacedKey create(@NotNull final String key) {
-        return new NamespacedKey(this.getPlugin(), key);
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/factory/EcoRunnableFactory.java

@@ -1,26 +0,0 @@
-package com.willfp.eco.internal.factory;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
-import com.willfp.eco.core.factory.RunnableFactory;
-import com.willfp.eco.core.scheduling.RunnableTask;
-import com.willfp.eco.internal.scheduling.EcoRunnableTask;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.function.Consumer;
-
-public class EcoRunnableFactory extends PluginDependent<EcoPlugin> implements RunnableFactory {
-    public EcoRunnableFactory(@NotNull final EcoPlugin plugin) {
-        super(plugin);
-    }
-
-    @Override
-    public RunnableTask create(@NotNull final Consumer<RunnableTask> consumer) {
-        return new EcoRunnableTask(this.getPlugin()) {
-            @Override
-            public void run() {
-                consumer.accept(this);
-            }
-        };
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/EcoGUIFactory.java

@@ -1,24 +0,0 @@
-package com.willfp.eco.internal.gui;
-
-import com.willfp.eco.core.gui.GUIFactory;
-import com.willfp.eco.core.gui.menu.MenuBuilder;
-import com.willfp.eco.core.gui.slot.SlotBuilder;
-import com.willfp.eco.internal.gui.menu.EcoMenuBuilder;
-import com.willfp.eco.internal.gui.slot.EcoSlotBuilder;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.function.Function;
-
-public class EcoGUIFactory implements GUIFactory {
-    @Override
-    public SlotBuilder createSlotBuilder(@NotNull final Function<Player, ItemStack> provider) {
-        return new EcoSlotBuilder(provider);
-    }
-
-    @Override
-    public MenuBuilder createMenuBuilder(final int rows) {
-        return new EcoMenuBuilder(rows);
-    }
-}

eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/menu/EcoMenu.java

@@ -1,98 +0,0 @@
-package com.willfp.eco.internal.gui.menu;
-
-import com.willfp.eco.core.gui.menu.Menu;
-import com.willfp.eco.core.gui.slot.FillerSlot;
-import com.willfp.eco.core.gui.slot.Slot;
-import com.willfp.eco.internal.gui.slot.EcoFillerSlot;
-import com.willfp.eco.util.StringUtils;
-import lombok.Getter;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-import java.util.function.Consumer;
-
-public class EcoMenu implements Menu {
-    @Getter
-    private final int rows;
-
-    private final List<List<Slot>> slots;
-
-    @Getter
-    private final String title;
-
-    private final Consumer<InventoryCloseEvent> onClose;
-
-    public EcoMenu(final int rows,
-                   @NotNull final List<List<Slot>> slots,
-                   @NotNull final String title,
-                   @NotNull final Consumer<InventoryCloseEvent> onClose) {
-        this.rows = rows;
-        this.slots = slots;
-        this.title = title;
-        this.onClose = onClose;
-    }
-
-    @Override
-    public Slot getSlot(final int row,
-                        final int column) {
-        if (row < 1 || row > this.rows) {
-            throw new IllegalArgumentException("Invalid row number!");
-        }
-
-        if (column < 1 || column > 9) {
-            throw new IllegalArgumentException("Invalid column number!");
-        }
-
-        Slot slot = slots.get(row - 1).get(column - 1);
-        if (slot instanceof FillerSlot fillerSlot) {
-            slots.get(row - 1).set(
-                    column - 1,
-                    new EcoFillerSlot(fillerSlot.getItemStack())
-            );
-
-            return getSlot(row, column);
-        }
-
-        return slots.get(row - 1).get(column - 1);
-    }
-
-    @Override
-    public Inventory open(@NotNull final Player player) {
-        Inventory inventory = Bukkit.createInventory(null, rows * 9, title);
-        int i = 0;
-        for (List<Slot> row : slots) {
-            for (Slot item : row) {
-                if (i == rows * 9) {
-                    break;
-                }
-                ItemStack slotItem = item.getItemStack(player);
-                ItemMeta meta = slotItem.getItemMeta();
-                if (meta != null) {
-                    List<String> lore = meta.getLore();
-                    if (lore != null) {
-                        lore.replaceAll(s -> StringUtils.format(s, player));
-                        meta.setLore(lore);
-                    }
-                    slotItem.setItemMeta(meta);
-                }
-                inventory.setItem(i, slotItem);
-                i++;
-            }
-        }
-
-
-        player.openInventory(inventory);
-        MenuHandler.registerMenu(inventory, this);
-        return inventory;
-    }
-
-    public void handleClose(@NotNull final InventoryCloseEvent event) {
-        onClose.accept(event);
-    }
-}