Re-Added PluginDependent to HandledCommand

# Conflicts:
#	eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java
#	eco-api/src/main/java/com/willfp/eco/internal/items/AbstractItemStackBuilder.java
#	eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'maven-publish'
     id 'java'
 }
@@ -18,7 +18,6 @@ allprojects {
 
     repositories {
         mavenCentral()
-        jcenter()
         mavenLocal()
         maven { url 'https://jitpack.io' }
 
@@ -54,10 +53,10 @@ allprojects {
         compileOnly 'org.jetbrains:annotations:19.0.0'
 
         // Lombok
-        compileOnly 'org.projectlombok:lombok:1.18.16'
+        compileOnly 'org.projectlombok:lombok:1.18.20'
-        annotationProcessor 'org.projectlombok:lombok:1.18.16'
+        annotationProcessor 'org.projectlombok:lombok:1.18.20'
-        testCompileOnly 'org.projectlombok:lombok:1.18.16'
+        testCompileOnly 'org.projectlombok:lombok:1.18.20'
-        testAnnotationProcessor 'org.projectlombok:lombok:1.18.16'
+        testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
     }
 
     tasks.withType(JavaCompile) {
@@ -87,6 +86,11 @@ allprojects {
         onlyIf { !sourceSets.main.allSource.files.isEmpty() }
     }
 
+    java {
+        sourceCompatibility = JavaVersion.VERSION_16
+        targetCompatibility = JavaVersion.VERSION_16
+    }
+
     compileJava.options.encoding = 'UTF-8'
     compileJava.dependsOn clean
 
@@ -96,4 +100,3 @@ allprojects {
 group = 'com.willfp'
 archivesBaseName = project.name
 version = findProperty("version")
-java.sourceCompatibility = JavaVersion.VERSION_1_8

config/checkstyle/suppression.xml

@@ -8,6 +8,8 @@
     <!-- Internals don't need javadoc. -->
     <suppress files="[\\/]internal[\\/]" checks="MissingJavadocMethod"/>
     <suppress files="[\\/]internal[\\/]" checks="JavadocVariable"/>
+    <suppress files="[\\/]eco[\\/]spigot[\\/]" checks="MissingJavadocMethod"/>
+    <suppress files="[\\/]eco[\\/]spigot[\\/]" checks="JavadocVariable"/>
 
     <!-- Modified version of library -->
     <suppress files="ArmorEquipEvent.java" checks="JavadocVariable"/>

eco-api/build.gradle

@@ -1,12 +1,17 @@
+plugins {
+    id 'com.github.johnrengelman.shadow'
+}
+
 group 'com.willfp'
 version rootProject.version
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.17-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 'me.clip:placeholderapi:2.10.9'
+    compileOnly 'com.google.code.gson:gson:2.8.7'
 }
 
 compileJava.options.encoding = 'UTF-8'
@@ -18,7 +23,6 @@ publishing {
     publications {
         shadow(MavenPublication) {
             from components.java
-            artifact shadowJar
             artifactId 'eco'
         }
     }

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

@@ -78,6 +78,32 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
         // Empty rather than abstract as implementations don't need both
     }
 
+    /**
+     * The code that should be executed once the packet has been received.
+     *
+     * @param packet The packet.
+     * @param player The player.
+     * @param event  The event.
+     */
+    public void onReceive(@NotNull final PacketContainer packet,
+                          @NotNull final Player player,
+                          @NotNull final PacketEvent event) {
+        // Empty rather than abstract as implementations don't need both
+    }
+
+    /**
+     * THe code that should be executed once the packet has been sent.
+     *
+     * @param packet The packet.
+     * @param player The player.
+     * @param event  The event.
+     */
+    public void onSend(@NotNull final PacketContainer packet,
+                       @NotNull final Player player,
+                       @NotNull final PacketEvent event) {
+        // Empty rather than abstract as implementations don't need both
+    }
+
     /**
      * Boilerplate to assert that the packet is of the specified type.
      *
@@ -94,6 +120,7 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
         }
 
         onReceive(event.getPacket(), event.getPlayer());
+        onReceive(event.getPacket(), event.getPlayer(), event);
     }
 
     /**
@@ -112,6 +139,12 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
         }
 
         onSend(event.getPacket(), event.getPlayer());
+        onSend(event.getPacket(), event.getPlayer(), event);
+    }
+
+    @Override
+    public final EcoPlugin getPlugin() {
+        return (EcoPlugin) super.getPlugin();
     }
 
     /**

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

@@ -1,9 +1,10 @@
 package com.willfp.eco.core;
 
 import com.willfp.eco.core.command.AbstractCommand;
+import com.willfp.eco.core.command.impl.PluginCommand;
+import com.willfp.eco.core.config.ConfigHandler;
 import com.willfp.eco.core.config.base.ConfigYml;
 import com.willfp.eco.core.config.base.LangYml;
-import com.willfp.eco.internal.config.updating.ConfigHandler;
 import com.willfp.eco.core.display.Display;
 import com.willfp.eco.core.display.DisplayModule;
 import com.willfp.eco.core.events.EventManager;
@@ -14,8 +15,10 @@ import com.willfp.eco.core.factory.RunnableFactory;
 import com.willfp.eco.core.integrations.IntegrationLoader;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
 import com.willfp.eco.core.scheduling.Scheduler;
+import com.willfp.eco.internal.Internals;
 import com.willfp.eco.internal.UpdateChecker;
 import com.willfp.eco.internal.arrows.ArrowDataListener;
+import com.willfp.eco.internal.config.updating.EcoConfigHandler;
 import com.willfp.eco.internal.events.EcoEventManager;
 import com.willfp.eco.internal.extensions.EcoExtensionLoader;
 import com.willfp.eco.internal.factory.EcoMetadataValueFactory;
@@ -25,9 +28,11 @@ import com.willfp.eco.internal.integrations.PlaceholderIntegrationPAPI;
 import com.willfp.eco.internal.logging.EcoLogger;
 import com.willfp.eco.internal.scheduling.EcoScheduler;
 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;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -42,6 +47,7 @@ import java.util.Set;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+@SuppressWarnings({"deprecation", "DeprecatedIsStillUsed"})
 public abstract class EcoPlugin extends JavaPlugin {
     /**
      * Loaded eco plugins.
@@ -50,8 +56,11 @@ public abstract class EcoPlugin extends JavaPlugin {
 
     /**
      * The name of the plugin.
+     *
+     * @deprecated Pointless, use getName instead.
      */
     @Getter
+    @Deprecated
     private final String pluginName;
 
     /**
@@ -162,6 +171,100 @@ public abstract class EcoPlugin extends JavaPlugin {
     @Getter
     private boolean outdated = false;
 
+    /**
+     * If the plugin supports extensions.
+     */
+    @Getter
+    private final boolean supportingExtensions;
+
+    /**
+     * Create a new plugin without a specified color, proxy support, spigot, or bStats.
+     */
+    protected EcoPlugin() {
+        this("&f");
+    }
+
+    /**
+     * Create a new plugin without proxy support, spigot, or bStats.
+     *
+     * @param color The color.
+     */
+    protected EcoPlugin(@NotNull final String color) {
+        this("", color);
+    }
+
+
+    /**
+     * Create a new plugin unlinked to spigot and bStats.
+     *
+     * @param proxyPackage The package where proxy implementations are stored.
+     * @param color        The color of the plugin (used in messages, such as &a, &b)
+     */
+    protected EcoPlugin(@NotNull final String proxyPackage,
+                        @NotNull final String color) {
+        this(0, 0, proxyPackage, color);
+    }
+
+    /**
+     * Create a new plugin without proxy or extension support.
+     *
+     * @param resourceId The spigot resource ID for the plugin.
+     * @param bStatsId   The bStats resource ID for the plugin.
+     * @param color      The color of the plugin (used in messages, such as &a, &b)
+     */
+    protected EcoPlugin(final int resourceId,
+                        final int bStatsId,
+                        @NotNull final String color) {
+        this(resourceId, bStatsId, "", color);
+    }
+
+    /**
+     * Create a new plugin without proxy support.
+     *
+     * @param resourceId           The spigot resource ID for the plugin.
+     * @param bStatsId             The bStats resource ID for the plugin.
+     * @param color                The color of the plugin (used in messages, such as &a, &b)
+     * @param supportingExtensions If the plugin supports extensions.
+     */
+    protected EcoPlugin(final int resourceId,
+                        final int bStatsId,
+                        @NotNull final String color,
+                        final boolean supportingExtensions) {
+        this(resourceId, bStatsId, "", color, supportingExtensions);
+    }
+
+    /**
+     * Create a new plugin without extension support.
+     *
+     * @param resourceId   The spigot 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, such as &a, &b)
+     */
+    protected EcoPlugin(final int resourceId,
+                        final int bStatsId,
+                        @NotNull final String proxyPackage,
+                        @NotNull final String color) {
+        this(resourceId, bStatsId, proxyPackage, color, false);
+    }
+
+    /**
+     * Create a new plugin.
+     *
+     * @param resourceId           The spigot 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, such as &a, &b)
+     * @param supportingExtensions If the plugin supports extensions.
+     */
+    protected EcoPlugin(final int resourceId,
+                        final int bStatsId,
+                        @NotNull final String proxyPackage,
+                        @NotNull final String color,
+                        final boolean supportingExtensions) {
+        this("", resourceId, bStatsId, proxyPackage, color, supportingExtensions);
+    }
+
     /**
      * Create a new plugin.
      *
@@ -170,17 +273,43 @@ public abstract class EcoPlugin extends JavaPlugin {
      * @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, such as &a, &b)
+     * @deprecated pluginName is redundant.
      */
+    @Deprecated
+    @SuppressWarnings("unused")
     protected EcoPlugin(@NotNull final String pluginName,
                         final int resourceId,
                         final int bStatsId,
                         @NotNull final String proxyPackage,
                         @NotNull final String color) {
-        this.pluginName = pluginName;
+        this(pluginName, resourceId, bStatsId, proxyPackage, color, false);
+    }
+
+    /**
+     * Create a new plugin.
+     *
+     * @param pluginName           The name of the plugin.
+     * @param resourceId           The spigot 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, such as &a, &b)
+     * @param supportingExtensions If the plugin supports extensions.
+     * @deprecated pluginName is redundant.
+     */
+    @Deprecated
+    @SuppressWarnings("unused")
+    protected EcoPlugin(@NotNull final String pluginName,
+                        final int resourceId,
+                        final int bStatsId,
+                        @NotNull final String proxyPackage,
+                        @NotNull final String color,
+                        final boolean supportingExtensions) {
+        this.pluginName = this.getName();
         this.resourceId = resourceId;
         this.bStatsId = bStatsId;
         this.proxyPackage = proxyPackage;
         this.color = color;
+        this.supportingExtensions = supportingExtensions;
 
         this.scheduler = new EcoScheduler(this);
         this.eventManager = new EcoEventManager(this);
@@ -188,7 +317,7 @@ public abstract class EcoPlugin extends JavaPlugin {
         this.metadataValueFactory = new EcoMetadataValueFactory(this);
         this.runnableFactory = new EcoRunnableFactory(this);
         this.extensionLoader = new EcoExtensionLoader(this);
-        this.configHandler = new ConfigHandler(this);
+        this.configHandler = new EcoConfigHandler(this);
         this.logger = new EcoLogger(this);
 
         this.langYml = new LangYml(this);
@@ -205,24 +334,38 @@ public abstract class EcoPlugin extends JavaPlugin {
         super.onEnable();
 
         this.getLogger().info("");
-        this.getLogger().info("Loading " + this.color + this.pluginName);
+        this.getLogger().info("Loading " + this.getColor() + this.getName());
 
         this.getEventManager().registerListener(new ArrowDataListener(this));
 
+        if (this.getResourceId() != 0) {
             new UpdateChecker(this).getVersion(version -> {
                 DefaultArtifactVersion currentVersion = new DefaultArtifactVersion(this.getDescription().getVersion());
                 DefaultArtifactVersion mostRecentVersion = new DefaultArtifactVersion(version);
                 if (!(currentVersion.compareTo(mostRecentVersion) > 0 || currentVersion.equals(mostRecentVersion))) {
                     this.outdated = true;
                     this.getScheduler().runTimer(() -> {
-                    this.getLogger().info("&c " + this.pluginName + " is out of date! (Version " + this.getDescription().getVersion() + ")");
+                        this.getLogger().info("&c " + this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
                         this.getLogger().info("&cThe newest version is &f" + version);
                         this.getLogger().info("&cDownload the new version!");
                     }, 0, 864000);
                 }
             });
+        }
 
-        new Metrics(this, this.bStatsId);
+        DefaultArtifactVersion runningVersion = new DefaultArtifactVersion(Internals.getInstance().getPlugin().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());
+        }
 
         Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(Plugin::getName).collect(Collectors.toSet());
 
@@ -253,11 +396,23 @@ public abstract class EcoPlugin extends JavaPlugin {
         this.getListeners().forEach(listener -> this.getEventManager().registerListener(listener));
 
         this.getCommands().forEach(AbstractCommand::register);
+        this.getPluginCommands().forEach(PluginCommand::register);
 
         this.getScheduler().runLater(this::afterLoad, 1);
 
         this.updatableClasses.forEach(clazz -> this.getConfigHandler().registerUpdatableClass(clazz));
 
+        if (this.isSupportingExtensions()) {
+            this.getExtensionLoader().loadExtensions();
+
+            if (this.getExtensionLoader().getLoadedExtensions().isEmpty()) {
+                this.getLogger().info("&cNo extensions found");
+            } else {
+                this.getLogger().info("Extensions Loaded:");
+                this.getExtensionLoader().getLoadedExtensions().forEach(extension -> this.getLogger().info("- " + extension.getName() + " v" + extension.getVersion()));
+            }
+        }
+
         this.enable();
 
         this.getLogger().info("");
@@ -272,8 +427,13 @@ public abstract class EcoPlugin extends JavaPlugin {
 
         this.getEventManager().unregisterAllListeners();
         this.getScheduler().cancelAll();
+        this.getConfigHandler().saveAllConfigs();
 
         this.disable();
+
+        if (this.isSupportingExtensions()) {
+            this.getExtensionLoader().unloadExtensions();
+        }
     }
 
     /**
@@ -326,8 +486,7 @@ public abstract class EcoPlugin extends JavaPlugin {
      * Default code to be executed on plugin reload.
      */
     public final void reload() {
-        this.getConfigYml().update();
+        this.getConfigHandler().updateConfigs();
-        this.getLangYml().update();
 
         this.getConfigHandler().callUpdate();
         this.getConfigHandler().callUpdate(); // Call twice to fix issues
@@ -338,42 +497,79 @@ public abstract class EcoPlugin extends JavaPlugin {
 
     /**
      * The plugin-specific code to be executed on enable.
+     * <p>
+     * Override when needed.
      */
-    public abstract void enable();
+    public void enable() {
+
+    }
 
     /**
      * The plugin-specific code to be executed on disable.
+     * <p>
+     * Override when needed.
      */
-    public abstract void disable();
+    public void disable() {
+
+    }
 
     /**
      * The plugin-specific code to be executed on load.
+     * <p>
+     * This is executed before enabling.
+     * <p>
+     * Override when needed.
      */
-    public abstract void load();
+    public void load() {
+
+    }
 
     /**
      * The plugin-specific code to be executed on reload.
+     * <p>
+     * Override when needed.
      */
-    public abstract void onReload();
+    public void onReload() {
+
+    }
 
     /**
      * The plugin-specific code to be executed after the server is up.
+     * <p>
+     * Override when needed.
      */
-    public abstract void postLoad();
+    public void postLoad() {
+
+    }
 
     /**
      * The plugin-specific integrations to be tested and loaded.
      *
      * @return A list of integrations.
      */
-    public abstract List<IntegrationLoader> getIntegrationLoaders();
+    public List<IntegrationLoader> getIntegrationLoaders() {
+        return new ArrayList<>();
+    }
 
     /**
-     * The command to be registered.
+     * The commands to be registered.
+     *
+     * @return A list of commands.
+     * @deprecated Use {@link this#getPluginCommands()} instead.
+     */
+    @Deprecated
+    public List<AbstractCommand> getCommands() {
+        return new ArrayList<>();
+    }
+
+    /**
+     * The commands to be registered.
      *
      * @return A list of commands.
      */
-    public abstract List<AbstractCommand> getCommands();
+    public List<PluginCommand> getPluginCommands() {
+        return new ArrayList<>();
+    }
 
     /**
      * ProtocolLib packet adapters to be registered.
@@ -382,7 +578,9 @@ public abstract class EcoPlugin extends JavaPlugin {
      *
      * @return A list of packet adapters.
      */
-    public abstract List<AbstractPacketAdapter> getPacketAdapters();
+    public List<AbstractPacketAdapter> getPacketAdapters() {
+        return new ArrayList<>();
+    }
 
     /**
      * All listeners to be registered.
@@ -396,7 +594,9 @@ public abstract class EcoPlugin extends JavaPlugin {
      *
      * @return A list of all updatable classes.
      */
-    public abstract List<Class<?>> getUpdatableClasses();
+    public List<Class<?>> getUpdatableClasses() {
+        return new ArrayList<>();
+    }
 
     /**
      * Create the display module for the plugin.
@@ -405,12 +605,86 @@ public abstract class EcoPlugin extends JavaPlugin {
      */
     @Nullable
     protected DisplayModule createDisplayModule() {
+        Validate.isTrue(
+                this.getDisplayModule() == null,
+                "Display module exists!"
+        );
+
         return null;
     }
 
+    /**
+     * Get the minimum version of eco to use the plugin.
+     *
+     * @return The version.
+     */
+    protected String getMinimumEcoVersion() {
+        return "5.0.0";
+    }
+
+    /**
+     * Get the plugin's logger.
+     *
+     * @return The logger.
+     */
     @NotNull
     @Override
     public Logger getLogger() {
         return logger;
     }
+
+    /**
+     * Get unwrapped config.
+     * Does not use eco config system, don't use.
+     *
+     * @return The bukkit config.
+     * @deprecated Use {@link EcoPlugin#getConfigYml()} instead.
+     */
+    @NotNull
+    @Override
+    @Deprecated
+    public final FileConfiguration getConfig() {
+        this.getLogger().warning("Call to default config method in eco plugin!");
+
+        return this.getConfigYml().getHandle();
+    }
+
+    /**
+     * Does not use eco config system, don't use.
+     *
+     * @deprecated Use eco config system.
+     */
+    @Override
+    @Deprecated
+    public final void saveConfig() {
+        this.getLogger().warning("Call to default config method in eco plugin!");
+
+        super.saveConfig();
+    }
+
+    /**
+     * Does not use eco config system, don't use.
+     *
+     * @deprecated Use eco config system.
+     */
+    @Override
+    @Deprecated
+    public final void saveDefaultConfig() {
+        this.getLogger().warning("Call to default config method in eco plugin!");
+
+        super.saveDefaultConfig();
+    }
+
+    /**
+     * Does not use eco config system, don't use.
+     *
+     * @deprecated Use eco config system.
+     */
+    @Override
+    @Deprecated
+    public final void reloadConfig() {
+        this.getLogger().warning("Call to default config method in eco plugin!");
+
+        super.reloadConfig();
+    }
 }

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

@@ -4,19 +4,19 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
-public abstract class PluginDependent {
+public abstract class PluginDependent<T extends EcoPlugin> {
     /**
      * The {@link EcoPlugin} that is stored.
      */
     @Getter(AccessLevel.PROTECTED)
-    private final EcoPlugin plugin;
+    private final T plugin;
 
     /**
      * Pass an {@link EcoPlugin} in order to interface with it.
      *
      * @param plugin The plugin to manage.
      */
-    protected PluginDependent(@NotNull final EcoPlugin plugin) {
+    protected PluginDependent(@NotNull final T plugin) {
         this.plugin = plugin;
     }
 }

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core;
 
+import com.willfp.eco.core.proxy.ProxyConstants;
 import com.willfp.eco.util.ClassUtils;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
@@ -14,6 +15,7 @@ public class Prerequisite {
      * All existing prerequisites are registered on creation.
      */
     private static final List<Prerequisite> VALUES = new ArrayList<>();
+
     /**
      * Requires the server to be running an implementation of paper.
      */
@@ -22,6 +24,23 @@ public class Prerequisite {
             "Requires server to be running paper (or a fork)"
     );
 
+    /**
+     * Requires the server to be running 1.17.
+     */
+    @Deprecated
+    public static final Prerequisite v1_17 = new Prerequisite(
+            () -> ProxyConstants.NMS_VERSION.contains("17"),
+            "Requires server to be running 1.17+"
+    );
+
+    /**
+     * Requires the server to be running 1.17.
+     */
+    public static final Prerequisite HAS_1_17 = new Prerequisite(
+            () -> ProxyConstants.NMS_VERSION.contains("17"),
+            "Requires server to be running 1.17+"
+    );
+
     /**
      * If the necessary prerequisite condition has been met.
      */

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

@@ -14,7 +14,9 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Arrays;
 import java.util.List;
 
-public abstract class AbstractCommand extends PluginDependent implements CommandExecutor {
+@Deprecated
+@SuppressWarnings("DeprecatedIsStillUsed")
+public abstract class AbstractCommand extends PluginDependent<EcoPlugin> implements CommandExecutor {
     /**
      * The name of the command
      * <p>

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

@@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Arrays;
 import java.util.List;
 
+@Deprecated
 public abstract class AbstractTabCompleter implements TabCompleter {
     /**
      * The {@link AbstractCommand} that is tab-completed.

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

@@ -0,0 +1,48 @@
+package com.willfp.eco.core.command;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface CommandBase {
+    /**
+     * Get command name.
+     *
+     * @return The name.
+     */
+    String getName();
+
+    /**
+     * Get command permission.
+     *
+     * @return The permission.
+     */
+    String getPermission();
+
+    /**
+     * If only players can execute the command.
+     *
+     * @return If true.
+     */
+    boolean isPlayersOnly();
+
+    /**
+     * Add a subcommand to the command.
+     *
+     * @param command The subcommand.
+     * @return The parent command.
+     */
+    CommandBase addSubcommand(@NotNull CommandBase command);
+
+    /**
+     * Get the handler.
+     *
+     * @return The handler.
+     */
+    CommandHandler getHandler();
+
+    /**
+     * Get the tab completer.
+     *
+     * @return The tab completer.
+     */
+    TabCompleteHandler getTabCompleter();
+}

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

@@ -0,0 +1,18 @@
+package com.willfp.eco.core.command;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface CommandHandler {
+    /**
+     * The code to be called on execution.
+     *
+     * @param sender The sender.
+     * @param args   The arguments.
+     */
+    void onExecute(@NotNull CommandSender sender,
+                   @NotNull List<String> args);
+}

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

@@ -0,0 +1,19 @@
+package com.willfp.eco.core.command;
+
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface TabCompleteHandler {
+    /**
+     * Handle Tab Completion.
+     *
+     * @param sender The sender.
+     * @param args   The arguments.
+     * @return The tab completion results.
+     */
+    List<String> tabComplete(@NotNull CommandSender sender,
+                             @NotNull List<String> args);
+}

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

@@ -0,0 +1,92 @@
+package com.willfp.eco.core.command.impl;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.internal.commands.HandledCommand;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public abstract class PluginCommand extends HandledCommand implements CommandExecutor, TabCompleter {
+    /**
+     * Create a new command.
+     * <p>
+     * The command will not be registered until {@link this#register()} is called.
+     * <p>
+     * The name cannot be the same as an existing command as this will conflict.
+     *
+     * @param plugin      The plugin.
+     * @param name        The name used in execution.
+     * @param permission  The permission required to execute the command.
+     * @param playersOnly If only players should be able to execute this command.
+     */
+    protected PluginCommand(@NotNull final EcoPlugin plugin,
+                            @NotNull final String name,
+                            @NotNull final String permission,
+                            final boolean playersOnly) {
+        super(plugin, name, permission, playersOnly);
+    }
+
+    /**
+     * Registers the command with the server,
+     * <p>
+     * Requires the command name to exist, defined in plugin.yml.
+     */
+    public final void register() {
+        org.bukkit.command.PluginCommand command = Bukkit.getPluginCommand(this.getName());
+        assert command != null;
+        command.setExecutor(this);
+        command.setTabCompleter(this);
+    }
+
+    /**
+     * Internal implementation used to clean up boilerplate.
+     * Used for parity with {@link CommandExecutor#onCommand(CommandSender, Command, String, String[])}.
+     *
+     * @param sender  The executor of the command.
+     * @param command The bukkit command.
+     * @param label   The name of the executed command.
+     * @param args    The arguments of the command (anything after the physical command name)
+     * @return If the command was processed by the linked {@link EcoPlugin}
+     */
+    @Override
+    public final boolean onCommand(@NotNull final CommandSender sender,
+                                   @NotNull final Command command,
+                                   @NotNull final String label,
+                                   @NotNull final String[] args) {
+        if (!command.getName().equalsIgnoreCase(this.getName())) {
+            return false;
+        }
+
+        this.handle(sender, args);
+
+        return true;
+    }
+
+    /**
+     * Internal implementation used to clean up boilerplate.
+     * Used for parity with {@link TabCompleter#onTabComplete(CommandSender, Command, String, String[])}.
+     *
+     * @param sender  The executor of the command.
+     * @param command The bukkit command.
+     * @param label   The name of the executed command.
+     * @param args    The arguments of the command (anything after the physical command name).
+     * @return The list of tab-completions.
+     */
+    @Override
+    public @Nullable List<String> onTabComplete(@NotNull final CommandSender sender,
+                                                @NotNull final Command command,
+                                                @NotNull final String label,
+                                                @NotNull final String[] args) {
+        if (!command.getName().equalsIgnoreCase(this.getName())) {
+            return null;
+        }
+
+        return this.handleTabCompletion(sender, args);
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.willfp.eco.core.command.impl;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.command.CommandBase;
+import com.willfp.eco.internal.commands.HandledCommand;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class Subcommand extends HandledCommand {
+    /**
+     * Create subcommand.
+     *
+     * @param plugin      The plugin.
+     * @param name        The subcommand name.
+     * @param permission  The subcommand permission.
+     * @param playersOnly If the subcommand only works on players.
+     */
+    protected Subcommand(@NotNull final EcoPlugin plugin,
+                         @NotNull final String name,
+                         @NotNull final String permission,
+                         final boolean playersOnly) {
+        super(plugin, name, permission, playersOnly);
+    }
+
+    /**
+     * Create subcommand.
+     *
+     * @param plugin      The plugin.
+     * @param name   The name of the subcommand.
+     * @param parent The parent command.
+     */
+    protected Subcommand(@NotNull final EcoPlugin plugin,
+                         @NotNull final String name,
+                         @NotNull final CommandBase parent) {
+        super(plugin, name, parent.getPermission(), parent.isPlayersOnly());
+    }
+}

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

@@ -1,6 +1,6 @@
 package com.willfp.eco.core.config;
 
-import com.willfp.eco.internal.config.UpdatableYamlConfig;
+import com.willfp.eco.internal.config.yaml.UpdatableYamlConfig;
 import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -11,6 +11,13 @@ public interface Config {
      */
     void clearCache();
 
+    /**
+     * Convert the config into readable text.
+     *
+     * @return The plaintext.
+     */
+    String toPlaintext();
+
     /**
      * Get if the config contains a key.
      *

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

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.internal.config.LoadableConfig;
+import org.jetbrains.annotations.NotNull;
+
+public interface ConfigHandler {
+    /**
+     * Invoke all update methods.
+     */
+    void callUpdate();
+
+    /**
+     * Register an updatable class.
+     *
+     * @param updatableClass The class with an update method.
+     */
+    void registerUpdatableClass(@NotNull Class<?> updatableClass);
+
+    /**
+     * Save all configs.
+     */
+    void saveAllConfigs();
+
+    /**
+     * Update all updatable configs.
+     */
+    void updateConfigs();
+
+    /**
+     * Add new config to be saved.
+     *
+     * @param config The config.
+     */
+    void addConfig(@NotNull LoadableConfig config);
+}

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

@@ -1,6 +1,6 @@
 package com.willfp.eco.core.config;
 
-import com.willfp.eco.internal.config.UpdatableYamlConfig;
+import com.willfp.eco.internal.config.yaml.UpdatableYamlConfig;
 import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -0,0 +1,26 @@
+package com.willfp.eco.core.config;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public interface JSONConfig extends Config {
+    /**
+     * Get a list of subsections from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
+     */
+    @NotNull
+    List<JSONConfig> getSubsections(@NotNull String path);
+
+    /**
+     * Get a list of subsections from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    List<JSONConfig> getSubsectionsOrNull(@NotNull String path);
+}

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

@@ -0,0 +1,20 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.internal.config.json.LoadableJsonConfig;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class JsonStaticBaseConfig extends LoadableJsonConfig {
+    /**
+     * Config implementation for configs present in the plugin's base directory (eg config.json, lang.json).
+     * <p>
+     * Does not automatically update.
+     *
+     * @param configName The name of the config
+     * @param plugin     The plugin.
+     */
+    protected JsonStaticBaseConfig(@NotNull final String configName,
+                                   @NotNull final EcoPlugin plugin) {
+        super(configName, plugin, "", plugin.getClass());
+    }
+}

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

@@ -1,6 +1,6 @@
 package com.willfp.eco.core.config;
 
-import com.willfp.eco.internal.config.LoadableYamlConfig;
+import com.willfp.eco.internal.config.yaml.LoadableYamlConfig;
 import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -1,10 +1,10 @@
 package com.willfp.eco.core.config;
 
-import com.willfp.eco.internal.config.ConfigWrapper;
+import com.willfp.eco.internal.config.yaml.YamlConfigWrapper;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 
-public abstract class YamlConfig extends ConfigWrapper<YamlConfiguration> {
+public abstract class YamlConfig extends YamlConfigWrapper<YamlConfiguration> {
     /**
      * Config implementation for passing YamlConfigurations.
      * <p>

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

@@ -0,0 +1,85 @@
+package com.willfp.eco.core.data;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.config.Config;
+import com.willfp.eco.core.config.JSONConfig;
+import com.willfp.eco.core.config.JsonStaticBaseConfig;
+import com.willfp.eco.internal.config.LoadableConfig;
+import com.willfp.eco.internal.config.json.JsonConfigSection;
+import lombok.experimental.UtilityClass;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@UtilityClass
+public class Data {
+    /**
+     * Instance of eco data.yml.
+     */
+    private static JSONConfig datafile = null;
+
+    /**
+     * All cached player data.
+     */
+    private static final Map<UUID, Map<EcoPlugin, JSONConfig>> PLAYER_DATA = new HashMap<>();
+
+    /**
+     * Initialize the player data with an instance of data.json.
+     *
+     * @param config data.json.
+     */
+    @ApiStatus.Internal
+    public void init(@NotNull final JsonStaticBaseConfig config) {
+        datafile = config;
+    }
+
+    /**
+     * Save to data.yml.
+     *
+     * @param config Instance of data.yml.
+     * @throws IOException Error during saving.
+     */
+    @ApiStatus.Internal
+    public void save(@NotNull final Config config) throws IOException {
+        for (Map.Entry<UUID, Map<EcoPlugin, JSONConfig>> entry : PLAYER_DATA.entrySet()) {
+            entry.getValue().forEach((plugin, jsonConfig) -> {
+                for (String key : jsonConfig.getKeys(false)) {
+                    config.set("player-data." + plugin.getName().toLowerCase() + "." + entry.getKey().toString() + "." + key, jsonConfig);
+                }
+            });
+        }
+        ((LoadableConfig) config).save();
+    }
+
+    /**
+     * Get the data for a player.
+     *
+     * @param player The player.
+     * @param plugin The plugin.
+     * @return The data.
+     */
+    public JSONConfig getData(@NotNull final OfflinePlayer player,
+                              @NotNull final EcoPlugin plugin) {
+        if (!PLAYER_DATA.containsKey(player.getUniqueId())) {
+            PLAYER_DATA.put(player.getUniqueId(), new HashMap<>());
+        }
+
+        JSONConfig config = PLAYER_DATA.get(player.getUniqueId()).get(plugin);
+
+        if (config == null) {
+            config = (JSONConfig) datafile.getSubsectionOrNull("player-data." + plugin.getName().toLowerCase() + "." + player.getUniqueId());
+            if (config == null) {
+                config = new JsonConfigSection(new HashMap<>());
+            }
+            PLAYER_DATA.get(player.getUniqueId()).put(plugin, config);
+            return getData(player, plugin);
+        }
+
+        return config;
+    }
+}

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

@@ -6,7 +6,7 @@ import lombok.Getter;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-public abstract class DisplayModule extends PluginDependent {
+public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
     /**
      * The priority of the module.
      */
@@ -61,6 +61,6 @@ public abstract class DisplayModule extends PluginDependent {
      * @return The plugin name.
      */
     final String getPluginName() {
-        return super.getPlugin().getPluginName();
+        return super.getPlugin().getName();
     }
 }

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

@@ -0,0 +1,40 @@
+package com.willfp.eco.core.events;
+
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class PlayerJumpEvent extends PlayerMoveEvent {
+    /**
+     * Internal bukkit.
+     */
+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * Create a new PlayerJumpEvent.
+     *
+     * @param event The PlayerMoveEvent.
+     */
+    public PlayerJumpEvent(@NotNull final PlayerMoveEvent event) {
+        super(event.getPlayer(), event.getFrom(), event.getTo());
+    }
+
+    /**
+     * Internal bukkit.
+     *
+     * @return The handlers.
+     */
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Internal bukkit.
+     *
+     * @return The handlers.
+     */
+    public static @NotNull HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+}

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

@@ -71,7 +71,7 @@ public abstract class Extension {
      */
     public final String getName() {
         Validate.notNull(metadata, "Metadata cannot be null!");
-        return this.metadata.getName();
+        return this.metadata.name();
     }
 
     /**
@@ -81,6 +81,6 @@ public abstract class Extension {
      */
     public final String getVersion() {
         Validate.notNull(metadata, "Metadata cannot be null!");
-        return this.metadata.getVersion();
+        return this.metadata.version();
     }
 }

eco-api/src/main/java/com/willfp/eco/core/factory/MetadataValueFactory.java

@@ -4,5 +4,11 @@ import org.bukkit.metadata.FixedMetadataValue;
 import org.jetbrains.annotations.NotNull;
 
 public interface MetadataValueFactory {
+    /**
+     * Create a metadata value for a given plugin and object.
+     *
+     * @param value The object to store in metadata.
+     * @return The metadata value.
+     */
     FixedMetadataValue create(@NotNull Object value);
 }

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

@@ -0,0 +1,60 @@
+package com.willfp.eco.core.gui.menu;
+
+import com.willfp.eco.core.gui.slot.Slot;
+import com.willfp.eco.core.items.builder.ItemStackBuilder;
+import com.willfp.eco.internal.gui.FillerSlot;
+import com.willfp.eco.util.ListUtils;
+import lombok.Getter;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class FillerMask {
+    /**
+     * Mask.
+     */
+    @Getter
+    private final List<List<Slot>> mask;
+
+    /**
+     * Create a new filler mask.
+     *
+     * @param material The mask material.
+     * @param pattern  The pattern.
+     */
+    public FillerMask(@NotNull final Material material,
+                      @NotNull final String... pattern) {
+        if (material == Material.AIR) {
+            throw new IllegalArgumentException("Material cannot be air!");
+        }
+
+        mask = ListUtils.create2DList(6, 9);
+
+        ItemStack itemStack = new ItemStackBuilder(material)
+                .setDisplayName("&r")
+                .build();
+
+        int row = 0;
+
+        for (String patternRow : pattern) {
+            int column = 0;
+            if (patternRow.length() != 9) {
+                throw new IllegalArgumentException("Invalid amount of columns in pattern!");
+            }
+            for (char c : patternRow.toCharArray()) {
+                if (c == '0') {
+                    mask.get(row).set(column, null);
+                } else if (c == '1') {
+                    mask.get(row).set(column, new FillerSlot(itemStack));
+                } else {
+                    throw new IllegalArgumentException("Invalid character in pattern! (Must only be 0 and 1)");
+                }
+
+                column++;
+            }
+            row++;
+        }
+    }
+}

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

@@ -0,0 +1,146 @@
+package com.willfp.eco.core.gui.menu;
+
+import com.willfp.eco.core.gui.slot.Slot;
+import com.willfp.eco.internal.gui.EcoMenu;
+import com.willfp.eco.internal.gui.FillerSlot;
+import com.willfp.eco.util.ListUtils;
+import com.willfp.eco.util.StringUtils;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+public interface Menu {
+    /**
+     * Get the amount of rows.
+     *
+     * @return The amount of rows.
+     */
+    int getRows();
+
+    /**
+     * Get slot at given row and column.
+     *
+     * @param row    The row.
+     * @param column The column.
+     * @return The row.
+     */
+    Slot getSlot(int row,
+                 int column);
+
+    /**
+     * Get the menu title.
+     *
+     * @return The title.
+     */
+    String getTitle();
+
+    /**
+     * Open the inventory for the player.
+     *
+     * @param player The player.
+     * @return The inventory.
+     */
+    Inventory open(@NotNull Player player);
+
+    /**
+     * Create a builder with a given amount of rows.
+     *
+     * @param rows The rows.
+     * @return The builder.
+     */
+    static Builder builder(final int rows) {
+        return new Builder(rows);
+    }
+
+    class Builder {
+        /**
+         * The amount of rows.
+         */
+        private final int rows;
+
+        /**
+         * The title.
+         */
+        private String title = "Menu";
+
+        /**
+         * The mask slots.
+         */
+        private List<List<Slot>> maskSlots;
+
+        /**
+         * The slots.
+         */
+        private final List<List<Slot>> slots;
+
+        /**
+         * The close event handler.
+         */
+        private Consumer<InventoryCloseEvent> onClose = (event) -> {
+        };
+
+        Builder(final int rows) {
+            this.rows = rows;
+            this.slots = ListUtils.create2DList(rows, 9);
+            this.maskSlots = ListUtils.create2DList(rows, 9);
+        }
+
+        public Builder setTitle(@NotNull final String title) {
+            this.title = StringUtils.translate(title);
+            return this;
+        }
+
+        public Builder setSlot(final int row,
+                               final int column,
+                               @NotNull final Slot slot) {
+            if (row < 1 || row > this.rows) {
+                throw new IllegalArgumentException("Invalid row number!");
+            }
+
+            if (column < 1 || column > 9) {
+                throw new IllegalArgumentException("Invalid column number!");
+            }
+
+            slots.get(row - 1).set(column - 1, slot);
+            return this;
+        }
+
+        public Builder setMask(@NotNull final FillerMask mask) {
+            this.maskSlots = mask.getMask();
+            return this;
+        }
+
+        public Builder onClose(@NotNull final Consumer<InventoryCloseEvent> action) {
+            this.onClose = action;
+            return this;
+        }
+
+        public Menu build() {
+            List<List<Slot>> finalSlots = maskSlots;
+            for (int i = 0; i < slots.size(); i++) {
+                for (int j = 0; j < slots.get(i).size(); j++) {
+                    Slot slot = slots.get(i).get(j);
+                    if (slot != null) {
+                        finalSlots.get(i).set(j, slot);
+                    }
+                }
+            }
+
+            for (List<Slot> finalSlot : finalSlots) {
+                for (int j = 0; j < finalSlot.size(); j++) {
+                    if (finalSlot.get(j) == null) {
+                        finalSlot.set(j, new FillerSlot(new ItemStack(Material.AIR)));
+                    }
+                }
+            }
+
+            return new EcoMenu(rows, finalSlots, title, onClose);
+        }
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.willfp.eco.core.gui.slot;
+
+import com.willfp.eco.internal.gui.EcoSlot;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+public interface Slot {
+    /**
+     * Get the ItemStack that would be shown to a player.
+     *
+     * @param player The player.
+     * @return The ItemStack.
+     */
+    ItemStack getItemStack(@NotNull Player player);
+
+    /**
+     * Create a builder for an ItemStack.
+     *
+     * @param itemStack The ItemStack.
+     * @return The builder.
+     */
+    static Builder builder(@NotNull final ItemStack itemStack) {
+        return new Builder((player) -> itemStack);
+    }
+
+    /**
+     * Create a builder for a player-specific ItemStack.
+     *
+     * @param provider The provider.
+     * @return The builder.
+     */
+    static Builder builder(@NotNull final Function<Player, ItemStack> provider) {
+        return new Builder(provider);
+    }
+
+    class Builder {
+        /**
+         * Provider.
+         */
+        private final Function<Player, ItemStack> provider;
+
+        /**
+         * Left click handler.
+         */
+        private BiConsumer<InventoryClickEvent, Slot> onLeftClick = null;
+
+        /**
+         * Right click handler.
+         */
+        private BiConsumer<InventoryClickEvent, Slot> onRightClick = null;
+
+        /**
+         * Shift-Left-Click handler.
+         */
+        private BiConsumer<InventoryClickEvent, Slot> onShiftLeftClick = null;
+
+        /**
+         * Shift-Right-Click handler.
+         */
+        private BiConsumer<InventoryClickEvent, Slot> onShiftRightClick = null;
+
+        /**
+         * Middle click handler.
+         */
+        private BiConsumer<InventoryClickEvent, Slot> onMiddleClick = null;
+
+        Builder(@NotNull final Function<Player, ItemStack> provider) {
+            this.provider = provider;
+        }
+
+        public Builder onLeftClick(@NotNull final BiConsumer<InventoryClickEvent, Slot> action) {
+            this.onLeftClick = action;
+            return this;
+        }
+
+        public Builder onRightClick(@NotNull final BiConsumer<InventoryClickEvent, Slot> action) {
+            this.onRightClick = action;
+            return this;
+        }
+
+        public Builder onShiftLeftClick(@NotNull final BiConsumer<InventoryClickEvent, Slot> action) {
+            this.onShiftLeftClick = action;
+            return this;
+        }
+
+        public Builder onShiftRightClick(@NotNull final BiConsumer<InventoryClickEvent, Slot> action) {
+            this.onShiftRightClick = action;
+            return this;
+        }
+
+        public Builder onMiddleClick(@NotNull final BiConsumer<InventoryClickEvent, Slot> action) {
+            this.onMiddleClick = action;
+            return this;
+        }
+
+        public Slot build() {
+            return new EcoSlot(provider, onLeftClick, onRightClick, onShiftLeftClick, onShiftRightClick, onMiddleClick);
+        }
+    }
+}

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

@@ -52,7 +52,7 @@ 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.isPresent()) {
+        if (matching.isEmpty()) {
             return null;
         }
         PlaceholderEntry entry = matching.get();

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

@@ -2,6 +2,7 @@ package com.willfp.eco.core.items;
 
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
 import com.willfp.eco.core.recipe.parts.MaterialTestableItem;
+import com.willfp.eco.core.recipe.parts.TestableStack;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
@@ -40,6 +41,7 @@ public final class Items {
      */
     public TestableItem lookup(@NotNull final String key) {
         String[] split = key.toLowerCase().split(":");
+
         if (split.length == 1) {
             Material material = Material.getMaterial(key.toUpperCase());
             if (material == null || material == Material.AIR) {
@@ -48,8 +50,26 @@ public final class Items {
             return new MaterialTestableItem(material);
         }
 
+        if (split.length == 2) {
             CustomItem part = REGISTRY.get(new NamespacedKey(split[0], split[1]));
-        return part == null ? new EmptyTestableItem() : part;
+
+            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]));
+            } else {
+                return part;
+            }
+        }
+
+        if (split.length == 3) {
+            CustomItem part = REGISTRY.get(new NamespacedKey(split[0], split[1]));
+            return part == null ? new EmptyTestableItem() : new TestableStack(part, Integer.parseInt(split[2]));
+        }
+
+        return new EmptyTestableItem();
     }
 
     /**

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

@@ -0,0 +1,29 @@
+package com.willfp.eco.core.items.builder;
+
+import com.willfp.eco.internal.items.AbstractItemStackBuilder;
+import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
+import org.jetbrains.annotations.NotNull;
+
+public class EnchantedBookBuilder extends AbstractItemStackBuilder<EnchantmentStorageMeta, EnchantedBookBuilder> {
+    /**
+     * Create a new EnchantedBookBuilder.
+     */
+    public EnchantedBookBuilder() {
+        super(Material.ENCHANTED_BOOK);
+    }
+
+    /**
+     * Add an enchantment to the item.
+     *
+     * @param enchantment The enchantment.
+     * @param level       The level.
+     * @return The builder.
+     */
+    public EnchantedBookBuilder addStoredEnchantment(@NotNull final Enchantment enchantment,
+                                                     final int level) {
+        this.getMeta().addStoredEnchant(enchantment, level, true);
+        return this;
+    }
+}

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

@@ -0,0 +1,181 @@
+package com.willfp.eco.core.items.builder;
+
+import org.bukkit.NamespacedKey;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemFlag;
+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.function.Supplier;
+
+public interface ItemBuilder {
+    /**
+     * Set the ItemStack amount.
+     *
+     * @param amount The amount.
+     * @return The builder.
+     */
+    ItemBuilder setAmount(int amount);
+
+    /**
+     * Set the ItemStack amount.
+     *
+     * @param amount The amount.
+     * @return The builder.
+     */
+    ItemBuilder setAmount(@NotNull Supplier<Integer> amount);
+
+    /**
+     * Add an enchantment to the item.
+     *
+     * @param enchantment The enchantment.
+     * @param level       The level.
+     * @return The builder.r
+     */
+    ItemBuilder addEnchantment(@NotNull Enchantment enchantment,
+                     int level);
+
+    /**
+     * Add an enchantment to the item.
+     *
+     * @param enchantment The enchantment.
+     * @param level       The level.
+     * @return The builder.
+     */
+    ItemBuilder addEnchantment(@NotNull Supplier<Enchantment> enchantment,
+                     @NotNull Supplier<Integer> level);
+
+    /**
+     * Set the item display name.
+     *
+     * @param name The name.
+     * @return The builder.
+     */
+    ItemBuilder setDisplayName(@NotNull String name);
+
+    /**
+     * Set the item display name.
+     *
+     * @param name The name.
+     * @return The builder.
+     */
+    ItemBuilder setDisplayName(@NotNull Supplier<String> name);
+
+    /**
+     * Add lore line.
+     *
+     * @param line The line.
+     * @return The builder.
+     */
+    ItemBuilder addLoreLine(@NotNull String line);
+
+    /**
+     * Add lore line.
+     *
+     * @param line The line.
+     * @return The builder.
+     */
+    ItemBuilder addLoreLine(@NotNull Supplier<String> line);
+
+    /**
+     * Add lore lines.
+     *
+     * @param lines The lines.
+     * @return The builder.
+     */
+    ItemBuilder addLoreLines(@NotNull List<String> lines);
+
+    /**
+     * Add lore lines.
+     *
+     * @param lines The lines.
+     * @return The builder.
+     */
+    ItemBuilder addLoreLines(@NotNull Supplier<List<String>> lines);
+
+    /**
+     * Add ItemFlags.
+     *
+     * @param itemFlags The flags.
+     * @return The builder.
+     */
+    ItemBuilder addItemFlag(@NotNull ItemFlag... itemFlags);
+
+    /**
+     * Add ItemFlags.
+     *
+     * @param itemFlags The flags.
+     * @return The builder.
+     */
+    ItemBuilder addItemFlag(@NotNull Supplier<ItemFlag[]> itemFlags);
+
+    /**
+     * Write meta key.
+     *
+     * @param key   The key.
+     * @param type  The type.
+     * @param value The value.
+     * @param <A>   The type.
+     * @param <B>   The type.
+     * @return The builder.
+     */
+    <A, B> ItemBuilder writeMetaKey(@NotNull NamespacedKey key,
+                          @NotNull PersistentDataType<A, B> type,
+                          @NotNull B value);
+
+    /**
+     * Write meta key.
+     *
+     * @param key   The key.
+     * @param type  The type.
+     * @param value The value.
+     * @param <A>   The type.
+     * @param <B>   The type.
+     * @return The builder.
+     */
+    <A, B> ItemBuilder writeMetaKey(@NotNull Supplier<NamespacedKey> key,
+                          @NotNull Supplier<PersistentDataType<A, B>> type,
+                          @NotNull Supplier<B> value);
+
+    /**
+     * Set unbreakable.
+     *
+     * @param unbreakable If the item should be unbreakable.
+     * @return The builder.
+     */
+    ItemBuilder setUnbreakable(boolean unbreakable);
+
+    /**
+     * Set unbreakable.
+     *
+     * @param unbreakable If the item should be unbreakable.
+     * @return The builder.
+     */
+    ItemBuilder setUnbreakable(@NotNull Supplier<Boolean> unbreakable);
+
+    /**
+     * Set custom model data.
+     *
+     * @param data The data.
+     * @return The builder.
+     */
+    ItemBuilder setCustomModelData(@Nullable Integer data);
+
+    /**
+     * Set custom model data.
+     *
+     * @param data The data.
+     * @return The builder.
+     */
+    ItemBuilder setCustomModelData(@NotNull Supplier<Integer> data);
+
+    /**
+     * Build the item.
+     *
+     * @return The item.
+     */
+    ItemStack build();
+}

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

@@ -0,0 +1,27 @@
+package com.willfp.eco.core.items.builder;
+
+import com.willfp.eco.internal.items.AbstractItemStackBuilder;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
+
+public class ItemStackBuilder extends AbstractItemStackBuilder<ItemMeta, ItemStackBuilder> {
+    /**
+     * Create a new ItemStackBuilder.
+     *
+     * @param material The material.
+     */
+    public ItemStackBuilder(@NotNull final Material material) {
+        super(material);
+    }
+
+    /**
+     * Create a new ItemStackBuilder to modify an existing item.
+     *
+     * @param base The ItemStack to start with.
+     */
+    public ItemStackBuilder(@NotNull final ItemStack base) {
+        super(base);
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.willfp.eco.core.items.builder;
+
+import com.willfp.eco.internal.items.AbstractItemStackBuilder;
+import org.bukkit.Color;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.LeatherArmorMeta;
+import org.jetbrains.annotations.NotNull;
+
+public class LeatherArmorBuilder extends AbstractItemStackBuilder<LeatherArmorMeta, LeatherArmorBuilder> {
+    /**
+     * Create a new ItemStackBuilder.
+     *
+     * @param material The material.
+     */
+    public LeatherArmorBuilder(@NotNull final Material material) {
+        super(material);
+    }
+
+    /**
+     * Create a new ItemStackBuilder to modify an existing item.
+     *
+     * @param base The ItemStack to start with.
+     */
+    public LeatherArmorBuilder(@NotNull final ItemStack base) {
+        super(base);
+    }
+
+    /**
+     * Set leather color.
+     *
+     * @param color The color.
+     * @return The builder.
+     */
+    public LeatherArmorBuilder setColor(@NotNull final java.awt.Color color) {
+        Color bukkitColor = Color.fromRGB(color.getRed(), color.getGreen(), color.getBlue());
+        this.getMeta().setColor(bukkitColor);
+
+        return this;
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.willfp.eco.core.items.builder;
+
+import com.willfp.eco.internal.items.AbstractItemStackBuilder;
+import com.willfp.eco.util.SkullUtils;
+import org.bukkit.Material;
+import org.bukkit.inventory.meta.SkullMeta;
+import org.jetbrains.annotations.NotNull;
+
+public class SkullBuilder extends AbstractItemStackBuilder<SkullMeta, SkullBuilder> {
+    /**
+     * Create a new EnchantedBookBuilder.
+     */
+    public SkullBuilder() {
+        super(Material.PLAYER_HEAD);
+    }
+
+    /**
+     * Set skull texture.
+     *
+     * @param texture The texture.
+     * @return The builder.
+     */
+    public SkullBuilder setSkullTexture(@NotNull final String texture) {
+        SkullUtils.setSkullTexture(this.getMeta(), texture);
+
+        return this;
+    }
+}

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

@@ -2,13 +2,18 @@ package com.willfp.eco.core.recipe;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.items.Items;
 import com.willfp.eco.core.recipe.recipes.CraftingRecipe;
+import com.willfp.eco.core.recipe.recipes.ShapedCraftingRecipe;
 import lombok.experimental.UtilityClass;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @UtilityClass
 @SuppressWarnings("deprecation")
 public class Recipes {
@@ -59,4 +64,29 @@ public class Recipes {
 
         return null;
     }
+
+    /**
+     * Create and register recipe.
+     *
+     * @param plugin        The plugin.
+     * @param key           The key.
+     * @param output        The output.
+     * @param recipeStrings The recipe.
+     * @return The recipe.
+     */
+    public CraftingRecipe createAndRegisterRecipe(@NotNull final EcoPlugin plugin,
+                                                  @NotNull final String key,
+                                                  @NotNull final ItemStack output,
+                                                  @NotNull final List<String> recipeStrings) {
+        ShapedCraftingRecipe.Builder builder = ShapedCraftingRecipe.builder(plugin, key).setOutput(output);
+
+        for (int i = 0; i < 9; i++) {
+            builder.setRecipePart(i, Items.lookup(recipeStrings.get(i)));
+        }
+
+        ShapedCraftingRecipe recipe = builder.build();
+        recipe.register();
+
+        return recipe;
+    }
 }

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

@@ -0,0 +1,70 @@
+package com.willfp.eco.core.recipe.parts;
+
+import com.willfp.eco.core.items.TestableItem;
+import com.willfp.eco.internal.Internals;
+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;
+
+public class TestableStack implements TestableItem {
+    /**
+     * The item.
+     */
+    private final TestableItem handle;
+
+    /**
+     * The amount.
+     */
+    @Getter
+    private final int amount;
+
+    /**
+     * Create a new testable stack.
+     *
+     * @param item   The item.
+     * @param amount The amount.
+     */
+    public TestableStack(@NotNull final TestableItem item,
+                         final int amount) {
+        Validate.isTrue(!(item instanceof TestableStack));
+
+        this.handle = item;
+        this.amount = amount;
+    }
+
+    /**
+     * 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) && itemStack.getAmount() >= amount;
+    }
+
+    @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 = Internals.getInstance().getPlugin().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

@@ -17,8 +17,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-@SuppressWarnings("deprecation")
+public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> implements CraftingRecipe {
-public final class ShapedCraftingRecipe extends PluginDependent implements CraftingRecipe {
     /**
      * Recipe parts.
      */

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

@@ -0,0 +1,100 @@
+package com.willfp.eco.core.web;
+
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+public class Paste {
+    /**
+     * The contents.
+     */
+    @Getter
+    private final String contents;
+
+    /**
+     * Create a new paste.
+     *
+     * @param contents The contents.
+     */
+    public Paste(@NotNull final String contents) {
+        this.contents = contents;
+    }
+
+    /**
+     * Upload to hastebin and get a token.
+     *
+     * @return The token.
+     */
+    public String getHastebinToken() {
+        try {
+            String url = "https://hastebin.com/documents";
+            URL obj = new URL(url);
+            HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+
+            con.setRequestMethod("POST");
+            con.setRequestProperty("Content-Type", "application/json");
+
+            con.setDoOutput(true);
+            DataOutputStream wr = new DataOutputStream(con.getOutputStream());
+            wr.writeBytes(URLEncoder.encode(contents, StandardCharsets.UTF_8));
+            wr.flush();
+            wr.close();
+
+            BufferedReader iny = new BufferedReader(
+                    new InputStreamReader(con.getInputStream()));
+            String output;
+            StringBuilder responseBuilder = new StringBuilder();
+
+            while ((output = iny.readLine()) != null) {
+                responseBuilder.append(output);
+            }
+            iny.close();
+
+            String responseString = responseBuilder.toString();
+
+            responseString = responseString.replace("{\"key\":\"", "");
+            responseString = responseString.replace("\"}", "");
+
+            return responseString;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return "";
+    }
+
+    /**
+     * Get paste from hastebin.
+     *
+     * @param token The token.
+     * @return The paste.
+     */
+    public static Paste getFromHastebin(@NotNull final String token) {
+        try {
+            StringBuilder result = new StringBuilder();
+            URL url = new URL("https://hastebin.com/raw/" + token);
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("GET");
+            try (var reader = new BufferedReader(
+                    new InputStreamReader(conn.getInputStream()))) {
+                for (String line; (line = reader.readLine()) != null;) {
+                    result.append(line);
+                }
+            }
+            return new Paste(URLDecoder.decode(result.toString(), StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/Internals.java

@@ -0,0 +1,18 @@
+package com.willfp.eco.internal;
+
+import com.willfp.eco.core.EcoPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class Internals {
+    private static Internals internals;
+
+    public static void setInterfacing(@NotNull final Internals internals) {
+        Internals.internals = internals;
+    }
+
+    public abstract EcoPlugin getPlugin();
+
+    public static Internals getInstance() {
+        return internals;
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/UpdateChecker.java

@@ -10,7 +10,7 @@ import java.io.InputStream;
 import java.net.URL;
 import java.util.Scanner;
 
-public class UpdateChecker extends PluginDependent {
+public class UpdateChecker extends PluginDependent<EcoPlugin> {
     /**
      * Create an update checker for the specified spigot resource id.
      *

eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java

@@ -13,7 +13,7 @@ import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-public class ArrowDataListener extends PluginDependent implements Listener {
+public class ArrowDataListener extends PluginDependent<EcoPlugin> implements Listener {
     /**
      * Listener to add metadata to arrows about the enchantments on the bow that shot them.
      *
@@ -31,15 +31,13 @@ public class ArrowDataListener extends PluginDependent implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST)
     public void onLaunch(final ProjectileLaunchEvent event) {
-        if (!(event.getEntity() instanceof Arrow)) {
+        if (!(event.getEntity() instanceof Arrow arrow)) {
-            return;
-        }
-        if (!(event.getEntity().getShooter() instanceof LivingEntity)) {
             return;
         }
 
-        Arrow arrow = (Arrow) event.getEntity();
+        if (!(arrow.getShooter() instanceof LivingEntity entity)) {
-        LivingEntity entity = (LivingEntity) arrow.getShooter();
+            return;
+        }
 
         if (entity.getEquipment() == null) {
             return;

eco-api/src/main/java/com/willfp/eco/internal/commands/HandledCommand.java

@@ -0,0 +1,166 @@
+package com.willfp.eco.internal.commands;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.command.CommandBase;
+import com.willfp.eco.core.command.CommandHandler;
+import com.willfp.eco.core.command.TabCompleteHandler;
+import com.willfp.eco.internal.commands.util.CommandUtils;
+import lombok.AccessLevel;
+import lombok.Getter;
+import org.bukkit.command.CommandSender;
+import org.bukkit.util.StringUtil;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public abstract class HandledCommand extends PluginDependent<EcoPlugin> implements CommandBase {
+    /**
+     * The name of the command.
+     */
+    @Getter
+    private final String name;
+
+    /**
+     * The permission required to execute the command.
+     * <p>
+     * Written out as a string for flexibility with subclasses.
+     */
+    @Getter
+    private final String permission;
+
+    /**
+     * Should the command only be allowed to be executed by players?
+     * <p>
+     * In other worlds, only allowed to be executed by console.
+     */
+    @Getter
+    private final boolean playersOnly;
+
+    /**
+     * All subcommands for the command.
+     */
+    @Getter(AccessLevel.PROTECTED)
+    private final List<CommandBase> subcommands;
+
+    /**
+     * Create a new command.
+     * <p>
+     * The name cannot be the same as an existing command as this will conflict.
+     *
+     * @param plugin      Instance of a plugin.
+     * @param name        The name used in execution.
+     * @param permission  The permission required to execute the command.
+     * @param playersOnly If only players should be able to execute this command.
+     */
+    protected HandledCommand(@NotNull final EcoPlugin plugin,
+                             @NotNull final String name,
+                             @NotNull final String permission,
+                             final boolean playersOnly) {
+        super(plugin);
+        this.name = name;
+        this.permission = permission;
+        this.playersOnly = playersOnly;
+        this.subcommands = new ArrayList<>();
+    }
+
+    /**
+     * Add a subcommand to the command.
+     *
+     * @param subcommand The subcommand.
+     * @return The parent command.
+     */
+    @Override
+    public final CommandBase addSubcommand(@NotNull final CommandBase subcommand) {
+        subcommands.add(subcommand);
+
+        return this;
+    }
+
+    /**
+     * Handle the command.
+     *
+     * @param sender The sender.
+     * @param args   The arguments.
+     */
+    protected final void handle(@NotNull final CommandSender sender,
+                                @NotNull final String[] args) {
+        if (!CommandUtils.canExecute(sender, this, this.getPlugin())) {
+            return;
+        }
+
+        if (args.length > 0) {
+            for (CommandBase subcommand : this.getSubcommands()) {
+                if (subcommand.getName().equalsIgnoreCase(args[0])) {
+                    if (!CommandUtils.canExecute(sender, subcommand, this.getPlugin())) {
+                        return;
+                    }
+
+                    ((HandledCommand) subcommand).handle(sender, Arrays.copyOfRange(args, 1, args.length));
+
+                    return;
+                }
+            }
+        }
+
+        this.getHandler().onExecute(sender, Arrays.asList(args));
+    }
+
+    /**
+     * Handle the tab completion.
+     *
+     * @param sender The sender.
+     * @param args   The arguments.
+     */
+    protected final List<String> handleTabCompletion(@NotNull final CommandSender sender,
+                                                     @NotNull final String[] args) {
+
+        if (!sender.hasPermission(this.getPermission())) {
+            return null;
+        }
+
+        if (args.length == 1) {
+            List<String> completions = new ArrayList<>();
+
+            StringUtil.copyPartialMatches(
+                    args[0],
+                    this.getSubcommands().stream().map(CommandBase::getName).collect(Collectors.toList()),
+                    completions
+            );
+
+            Collections.sort(completions);
+
+            if (!completions.isEmpty()) {
+                return completions;
+            }
+        }
+
+        if (args.length >= 2) {
+            HandledCommand command = null;
+
+            for (CommandBase subcommand : this.getSubcommands()) {
+                if (args[0].equalsIgnoreCase(subcommand.getName())) {
+                    command = (HandledCommand) subcommand;
+                }
+            }
+
+            if (command != null) {
+                return command.handleTabCompletion(sender, Arrays.copyOfRange(args, 1, args.length));
+            }
+        }
+
+        return this.getTabCompleter().tabComplete(sender, Arrays.asList(args));
+    }
+
+    @Override
+    public abstract CommandHandler getHandler();
+
+    @Override
+    public TabCompleteHandler getTabCompleter() {
+        return (sender, args) -> new ArrayList<>();
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/commands/util/CommandUtils.java

@@ -0,0 +1,27 @@
+package com.willfp.eco.internal.commands.util;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.command.CommandBase;
+import lombok.experimental.UtilityClass;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+@UtilityClass
+public class CommandUtils {
+    public boolean canExecute(@NotNull final CommandSender sender,
+                              @NotNull final CommandBase command,
+                              @NotNull final EcoPlugin plugin) {
+        if (command.isPlayersOnly() && !(sender instanceof Player)) {
+            sender.sendMessage(plugin.getLangYml().getMessage("not-player"));
+            return false;
+        }
+
+        if (!sender.hasPermission(command.getPermission()) && sender instanceof Player) {
+            sender.sendMessage(plugin.getLangYml().getNoPermission());
+            return false;
+        }
+
+        return true;
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/config/ConfigSection.java

@@ -1,15 +0,0 @@
-package com.willfp.eco.internal.config;
-
-import org.bukkit.configuration.ConfigurationSection;
-import org.jetbrains.annotations.NotNull;
-
-public class ConfigSection extends ConfigWrapper<ConfigurationSection> {
-    /**
-     * Config section.
-     *
-     * @param section    The section.
-     */
-    protected ConfigSection(@NotNull final ConfigurationSection section) {
-        this.init(section);
-    }
-}

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

@@ -0,0 +1,39 @@
+package com.willfp.eco.internal.config;
+
+import java.io.File;
+import java.io.IOException;
+
+public interface LoadableConfig {
+    /**
+     * Create the file.
+     */
+    void createFile();
+
+    /**
+     * Get resource path as relative to base directory.
+     *
+     * @return The resource path.
+     */
+    String getResourcePath();
+
+    /**
+     * Save the config.
+     *
+     * @throws IOException If error in saving.
+     */
+    void save() throws IOException;
+
+    /**
+     * Get the config file.
+     *
+     * @return The file.
+     */
+    File getConfigFile();
+
+    /**
+     * Get the config name (including extension)
+     *
+     * @return The name.
+     */
+    String getName();
+}

eco-api/src/main/java/com/willfp/eco/internal/config/json/JsonConfigSection.java

@@ -0,0 +1,16 @@
+package com.willfp.eco.internal.config.json;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+public class JsonConfigSection extends JsonConfigWrapper {
+    /**
+     * Config section.
+     *
+     * @param values The values.
+     */
+    public JsonConfigSection(@NotNull final Map<String, Object> values) {
+        this.init(values);
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/config/json/JsonConfigWrapper.java

@@ -0,0 +1,345 @@
+package com.willfp.eco.internal.config.json;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.willfp.eco.core.config.Config;
+import com.willfp.eco.core.config.JSONConfig;
+import com.willfp.eco.util.StringUtils;
+import lombok.Getter;
+import org.apache.commons.lang.Validate;
+import org.bukkit.configuration.ConfigurationSection;
+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 abstract class JsonConfigWrapper implements JSONConfig, Cloneable {
+    /**
+     * The linked {@link ConfigurationSection} where values are physically stored.
+     */
+    @Getter
+    private final Gson handle = new GsonBuilder().setPrettyPrinting().create();
+
+    /**
+     * All stored values.
+     */
+    @Getter
+    private final Map<String, Object> values = new HashMap<>();
+
+    /**
+     * All cached values.
+     */
+    @Getter
+    private final Map<String, Object> cache = new HashMap<>();
+
+    /**
+     * Abstract config.
+     */
+    protected JsonConfigWrapper() {
+
+    }
+
+    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)) {
+            JsonConfigSection section = new JsonConfigSection((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) {
+                JsonConfigSection section = new JsonConfigSection((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)) {
+            JsonConfigSection section = new JsonConfigSection((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 = ((JsonConfigWrapper) 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 JsonConfigSection(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 JsonConfigSection(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 StringUtils.translate(Objects.requireNonNullElse(getOfKnownType(path, String.class), ""));
+    }
+
+    @Override
+    @Nullable
+    public String getStringOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getString(path);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    @NotNull
+    public List<String> getStrings(@NotNull final String path) {
+        return StringUtils.translateList((List<String>) Objects.requireNonNullElse(getOfKnownType(path, Object.class), new ArrayList<>()));
+    }
+
+    @Override
+    @Nullable
+    public List<String> getStringsOrNull(@NotNull final String path) {
+        if (has(path)) {
+            return getStrings(path);
+        } 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 JsonConfigSection(new HashMap<>(this.getValues()));
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/config/json/LoadableJsonConfig.java

@@ -0,0 +1,155 @@
+package com.willfp.eco.internal.config.json;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.internal.config.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 abstract class LoadableJsonConfig extends JsonConfigWrapper implements LoadableConfig {
+    /**
+     * The physical config file, as stored on disk.
+     */
+    @Getter
+    private final File configFile;
+
+    /**
+     * Plugin handle.
+     */
+    @Getter(AccessLevel.PROTECTED)
+    private final EcoPlugin plugin;
+
+    /**
+     * The full name of the config file (eg config.json).
+     */
+    @Getter
+    private final String name;
+
+    /**
+     * The subdirectory path.
+     */
+    @Getter(AccessLevel.PROTECTED)
+    private final String subDirectoryPath;
+
+    /**
+     * The provider of the config.
+     */
+    @Getter(AccessLevel.PROTECTED)
+    private final Class<?> source;
+
+    /**
+     * Abstract 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.
+     */
+    protected LoadableJsonConfig(@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) {
+        }
+    }
+
+    /**
+     * Get resource path as relative to base directory.
+     *
+     * @return The resource path.
+     */
+    @Override
+    public String getResourcePath() {
+        String resourcePath;
+
+        if (subDirectoryPath.isEmpty()) {
+            resourcePath = name;
+        } else {
+            resourcePath = subDirectoryPath + name;
+        }
+
+        return "/" + resourcePath;
+    }
+
+    /**
+     * Save the config.
+     *
+     * @throws IOException If error in saving.
+     */
+    @Override
+    public void save() throws IOException {
+        configFile.delete();
+        Files.write(configFile.toPath(), this.toPlaintext().getBytes(), StandardOpenOption.CREATE, StandardOpenOption.WRITE);
+    }
+
+    /**
+     * Initialize the config.
+     *
+     * @param file The config file.
+     * @throws FileNotFoundException If the file doesn't exist.
+     */
+    public void init(@NotNull final File file) throws FileNotFoundException {
+        super.init(this.getHandle().fromJson(new FileReader(file), HashMap.class));
+    }
+}

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

@@ -1,20 +1,31 @@
 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.ConfigHandler;
 import com.willfp.eco.core.config.ConfigUpdater;
+import com.willfp.eco.internal.config.LoadableConfig;
 import com.willfp.eco.internal.config.updating.exceptions.InvalidUpdatableClassException;
 import com.willfp.eco.internal.config.updating.exceptions.InvalidUpdateMethodException;
-import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.internal.config.yaml.UpdatableYamlConfig;
-import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 
+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.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
-public class ConfigHandler extends PluginDependent {
+public class EcoConfigHandler extends PluginDependent<EcoPlugin> implements ConfigHandler {
+    /**
+     * A set of all configs that can be saved.
+     */
+    private final List<LoadableConfig> configs = new ArrayList<>();
+
     /**
      * A set of all classes that can be updated.
      */
@@ -25,25 +36,26 @@ public class ConfigHandler extends PluginDependent {
      *
      * @param plugin The plugin to manage.
      */
-    public ConfigHandler(@NotNull final EcoPlugin plugin) {
+    public EcoConfigHandler(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 
-    /**
+    @Override
-     * Invoke all update methods.
-     */
     public void callUpdate() {
         updatableClasses.forEach(clazz -> Arrays.stream(clazz.getDeclaredMethods()).forEach(method -> {
             if (method.isAnnotationPresent(ConfigUpdater.class)) {
-                if (method.getParameterTypes().length != 0) {
-                    throw new InvalidUpdateMethodException("Update method must not have parameters.");
-                }
                 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.");
@@ -52,15 +64,11 @@ public class ConfigHandler extends PluginDependent {
         }));
     }
 
-    /**
+    @Override
-     * Register an updatable class.
-     *
-     * @param updatableClass The class with an update method.
-     */
     public void registerUpdatableClass(@NotNull final Class<?> updatableClass) {
         boolean isValid = false;
         for (Method method : updatableClass.getDeclaredMethods()) {
-            if (Modifier.isStatic(method.getModifiers()) && method.getParameterTypes().length == 0 && method.isAnnotationPresent(ConfigUpdater.class)) {
+            if (Modifier.isStatic(method.getModifiers()) && (method.getParameterCount() == 0 || method.getParameterCount() == 1) && method.isAnnotationPresent(ConfigUpdater.class)) {
                 isValid = true;
                 break;
             }
@@ -72,4 +80,29 @@ public class ConfigHandler extends PluginDependent {
 
         updatableClasses.add(updatableClass);
     }
+
+    @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 UpdatableYamlConfig updatableYamlConfig) {
+                updatableYamlConfig.update();
+            }
+        }
+    }
 }

eco-api/src/main/java/com/willfp/eco/internal/config/updating/exceptions/InvalidUpdatableClassException.java

@@ -1,11 +1,11 @@
 package com.willfp.eco.internal.config.updating.exceptions;
 
-import com.willfp.eco.internal.config.updating.ConfigHandler;
+import com.willfp.eco.internal.config.updating.EcoConfigHandler;
 import org.jetbrains.annotations.NotNull;
 
 public class InvalidUpdatableClassException extends RuntimeException {
     /**
-     * Called when an updatable class is registered into an {@link ConfigHandler}.
+     * Called when an updatable class is registered into an {@link EcoConfigHandler}.
      *
      * @param message The error message.
      */

eco-api/src/main/java/com/willfp/eco/internal/config/yaml/LoadableYamlConfig.java

@@ -1,26 +1,23 @@
-package com.willfp.eco.internal.config;
+package com.willfp.eco.internal.config.yaml;
 
 import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.internal.config.LoadableConfig;
 import lombok.AccessLevel;
 import lombok.Getter;
-import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
 
-public abstract class LoadableYamlConfig extends ConfigWrapper<YamlConfiguration> {
+public abstract class LoadableYamlConfig extends YamlConfigWrapper<YamlConfiguration> implements LoadableConfig {
     /**
      * The physical config file, as stored on disk.
      */
-    @Getter(AccessLevel.PROTECTED)
+    @Getter
     private final File configFile;
 
     /**
@@ -77,7 +74,8 @@ public abstract class LoadableYamlConfig extends ConfigWrapper<YamlConfiguration
         init(YamlConfiguration.loadConfiguration(configFile));
     }
 
-    private void createFile() {
+    @Override
+    public void createFile() {
         String resourcePath = getResourcePath();
         InputStream in = source.getResourceAsStream(resourcePath);
 
@@ -102,14 +100,12 @@ public abstract class LoadableYamlConfig extends ConfigWrapper<YamlConfiguration
             }
         } catch (IOException ignored) {
         }
+
+        plugin.getConfigHandler().addConfig(this);
     }
 
-    /**
+    @Override
-     * Get resource path as relative to base directory.
+    public String getResourcePath() {
-     *
-     * @return The resource path.
-     */
-    protected String getResourcePath() {
         String resourcePath;
 
         if (subDirectoryPath.isEmpty()) {
@@ -121,35 +117,7 @@ public abstract class LoadableYamlConfig extends ConfigWrapper<YamlConfiguration
         return "/" + resourcePath;
     }
 
-    /**
+    @Override
-     * Get YamlConfiguration as found in jar.
-     *
-     * @return The YamlConfiguration.
-     */
-    protected YamlConfiguration getConfigInJar() {
-        InputStream newIn = source.getResourceAsStream(getResourcePath());
-
-        if (newIn == null) {
-            throw new NullPointerException(name + " 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;
-    }
-
-    /**
-     * Save the config.
-     *
-     * @throws IOException If error in saving.
-     */
     public void save() throws IOException {
         this.getHandle().save(this.getConfigFile());
     }

eco-api/src/main/java/com/willfp/eco/internal/config/yaml/UpdatableYamlConfig.java

@@ -1,11 +1,15 @@
-package com.willfp.eco.internal.config;
+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;
@@ -84,4 +88,23 @@ public abstract class UpdatableYamlConfig extends LoadableYamlConfig {
             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-api/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigSection.java

@@ -0,0 +1,15 @@
+package com.willfp.eco.internal.config.yaml;
+
+import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.NotNull;
+
+public class YamlConfigSection extends YamlConfigWrapper<ConfigurationSection> {
+    /**
+     * Config section.
+     *
+     * @param section The section.
+     */
+    public YamlConfigSection(@NotNull final ConfigurationSection section) {
+        this.init(section);
+    }
+}

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

@@ -1,10 +1,11 @@
-package com.willfp.eco.internal.config;
+package com.willfp.eco.internal.config.yaml;
 
-import com.willfp.eco.util.StringUtils;
 import com.willfp.eco.core.config.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;
 
@@ -15,7 +16,7 @@ import java.util.Map;
 import java.util.Objects;
 
 @SuppressWarnings({"unchecked", "unused"})
-public abstract class ConfigWrapper<T extends ConfigurationSection> implements Config {
+public abstract class YamlConfigWrapper<T extends ConfigurationSection> implements Config {
     /**
      * The linked {@link ConfigurationSection} where values are physically stored.
      */
@@ -30,7 +31,7 @@ public abstract class ConfigWrapper<T extends ConfigurationSection> implements C
     /**
      * Abstract config.
      */
-    protected ConfigWrapper() {
+    protected YamlConfigWrapper() {
 
     }
 
@@ -39,6 +40,15 @@ public abstract class ConfigWrapper<T extends ConfigurationSection> implements C
         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();
@@ -64,6 +74,7 @@ public abstract class ConfigWrapper<T extends ConfigurationSection> implements C
     @Override
     public void set(@NotNull final String path,
                     @Nullable final Object object) {
+        cache.remove(path);
         handle.set(path, object);
     }
 
@@ -81,7 +92,12 @@ public abstract class ConfigWrapper<T extends ConfigurationSection> implements C
         if (cache.containsKey(path)) {
             return (Config) cache.get(path);
         } else {
-            cache.put(path, new ConfigSection(Objects.requireNonNull(handle.getConfigurationSection(path))));
+            ConfigurationSection raw = handle.getConfigurationSection(path);
+            if (raw == null) {
+                cache.put(path, null);
+            } else {
+                cache.put(path, new YamlConfigSection(raw));
+            }
             return getSubsectionOrNull(path);
         }
     }
@@ -204,7 +220,7 @@ public abstract class ConfigWrapper<T extends ConfigurationSection> implements C
     @NotNull
     public List<String> getStrings(@NotNull final String path) {
         if (cache.containsKey(path)) {
-            return (List<String>) cache.get(path);
+            return StringUtils.translateList((List<String>) cache.get(path));
         } else {
             cache.put(path, has(path) ? new ArrayList<>(handle.getStringList(path)) : new ArrayList<>());
             return getStrings(path);

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

@@ -9,7 +9,7 @@ import org.bukkit.event.Listener;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-public class EcoEventManager extends PluginDependent implements EventManager {
+public class EcoEventManager extends PluginDependent<EcoPlugin> implements EventManager {
     /**
      * Manager class for event management.
      *

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

@@ -24,7 +24,7 @@ import java.util.Set;
 /**
  * Concrete implementation of {@link ExtensionLoader}.
  */
-public class EcoExtensionLoader extends PluginDependent implements ExtensionLoader {
+public class EcoExtensionLoader extends PluginDependent<EcoPlugin> implements ExtensionLoader {
     /**
      * All currently loaded extensions.
      */
@@ -110,11 +110,10 @@ public class EcoExtensionLoader extends PluginDependent implements ExtensionLoad
             e.printStackTrace();
         }
 
-        if (!(object instanceof Extension)) {
+        if (!(object instanceof Extension extension)) {
             throw new MalformedExtensionException(extensionJar.getName() + " is invalid");
         }
 
-        Extension extension = (Extension) object;
         extension.setMetadata(metadata);
         extension.enable();
         extensions.add(extension);

eco-api/src/main/java/com/willfp/eco/internal/extensions/ExtensionMetadata.java

@@ -1,32 +1,8 @@
 package com.willfp.eco.internal.extensions;
 
-import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
-public class ExtensionMetadata {
+public record ExtensionMetadata(@NotNull String version,
-    /**
+                                @NotNull String name) {
-     * The version of the extension.
-     */
-    @NotNull
-    @Getter
-    private final String version;
 
-    /**
-     * The extension's name.
-     */
-    @NotNull
-    @Getter
-    private final String name;
-
-    /**
-     * Create a new extension metadata.
-     *
-     * @param version The version for the extension to be.
-     * @param name    The name of the extension.
-     */
-    public ExtensionMetadata(@NotNull final String version,
-                             @NotNull final String name) {
-        this.version = version;
-        this.name = name;
-    }
 }

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

@@ -6,7 +6,7 @@ import com.willfp.eco.core.factory.MetadataValueFactory;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.jetbrains.annotations.NotNull;
 
-public class EcoMetadataValueFactory extends PluginDependent implements MetadataValueFactory {
+public class EcoMetadataValueFactory extends PluginDependent<EcoPlugin> implements MetadataValueFactory {
     /**
      * Factory class to produce {@link FixedMetadataValue}s associated with an {@link EcoPlugin}.
      *

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

@@ -6,7 +6,7 @@ import com.willfp.eco.core.factory.NamespacedKeyFactory;
 import org.bukkit.NamespacedKey;
 import org.jetbrains.annotations.NotNull;
 
-public class EcoNamespacedKeyFactory extends PluginDependent implements NamespacedKeyFactory {
+public class EcoNamespacedKeyFactory extends PluginDependent<EcoPlugin> implements NamespacedKeyFactory {
     /**
      * Factory class to produce {@link NamespacedKey}s associated with an {@link EcoPlugin}.
      *

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

@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Consumer;
 
-public class EcoRunnableFactory extends PluginDependent implements RunnableFactory {
+public class EcoRunnableFactory extends PluginDependent<EcoPlugin> implements RunnableFactory {
     /**
      * Factory class to produce {@link RunnableTask}s associated with an {@link EcoPlugin}.
      *

eco-api/src/main/java/com/willfp/eco/internal/gui/EcoMenu.java

@@ -0,0 +1,86 @@
+package com.willfp.eco.internal.gui;
+
+import com.willfp.eco.core.gui.menu.Menu;
+import com.willfp.eco.core.gui.slot.Slot;
+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!");
+        }
+
+        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.translate(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);
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/gui/EcoSlot.java

@@ -0,0 +1,57 @@
+package com.willfp.eco.internal.gui;
+
+import com.willfp.eco.core.gui.slot.Slot;
+import lombok.Getter;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+public class EcoSlot implements Slot {
+    @Getter
+    private final Function<Player, ItemStack> provider;
+
+    private final BiConsumer<InventoryClickEvent, Slot> onLeftClick;
+
+    private final BiConsumer<InventoryClickEvent, Slot> onRightClick;
+
+    private final BiConsumer<InventoryClickEvent, Slot> onShiftLeftClick;
+
+    private final BiConsumer<InventoryClickEvent, Slot> onShiftRightClick;
+
+    private final BiConsumer<InventoryClickEvent, Slot> onMiddleClick;
+
+    public EcoSlot(@NotNull final Function<Player, ItemStack> provider,
+                   @Nullable final BiConsumer<InventoryClickEvent, Slot> onLeftClick,
+                   @Nullable final BiConsumer<InventoryClickEvent, Slot> onRightClick,
+                   @Nullable final BiConsumer<InventoryClickEvent, Slot> onShiftLeftClick,
+                   @Nullable final BiConsumer<InventoryClickEvent, Slot> onShiftRightClick,
+                   @Nullable final BiConsumer<InventoryClickEvent, Slot> onMiddleClick) {
+        this.provider = provider;
+        this.onLeftClick = onLeftClick == null ? ((event, slot) -> { }) : onLeftClick;
+        this.onRightClick = onRightClick == null ? ((event, slot) -> { }) : onRightClick;
+        this.onShiftLeftClick = onShiftLeftClick == null ? ((event, slot) -> { }) : onShiftLeftClick;
+        this.onShiftRightClick = onShiftRightClick == null ? ((event, slot) -> { }) : onShiftRightClick;
+        this.onMiddleClick = onMiddleClick == null ? ((event, slot) -> { }) : onMiddleClick;
+    }
+
+    public void handleInventoryClick(@NotNull final InventoryClickEvent event) {
+        switch (event.getClick()) {
+            case LEFT -> this.onLeftClick.accept(event, this);
+            case RIGHT -> this.onRightClick.accept(event, this);
+            case SHIFT_LEFT -> this.onShiftLeftClick.accept(event, this);
+            case SHIFT_RIGHT -> this.onShiftRightClick.accept(event, this);
+            case MIDDLE -> this.onMiddleClick.accept(event, this);
+            default -> { }
+        }
+    }
+
+    @Override
+    public ItemStack getItemStack(@NotNull final Player player) {
+        return provider.apply(player);
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.willfp.eco.internal.gui;
+
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+public class FillerSlot extends EcoSlot {
+    /**
+     * Create new filler slot.
+     *
+     * @param itemStack The ItemStack.
+     */
+    public FillerSlot(@NotNull final ItemStack itemStack) {
+        super((player) -> itemStack, null, null, null, null, null);
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/gui/MenuHandler.java

@@ -0,0 +1,29 @@
+package com.willfp.eco.internal.gui;
+
+import com.willfp.eco.core.gui.menu.Menu;
+import lombok.experimental.UtilityClass;
+import org.bukkit.inventory.Inventory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@UtilityClass
+public class MenuHandler {
+    private static final Map<Inventory, Menu> MENUS = new HashMap<>();
+
+    public void registerMenu(@NotNull final Inventory inventory,
+                             @NotNull final Menu menu) {
+        MENUS.put(inventory, menu);
+    }
+
+    public void unregisterMenu(@NotNull final Inventory inventory) {
+        MENUS.remove(inventory);
+    }
+
+    @Nullable
+    public Menu getMenu(@NotNull final Inventory inventory) {
+        return MENUS.get(inventory);
+    }
+}

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

@@ -0,0 +1,194 @@
+package com.willfp.eco.internal.items;
+
+import com.willfp.eco.core.items.builder.ItemBuilder;
+import com.willfp.eco.util.StringUtils;
+import lombok.AccessLevel;
+import lombok.Getter;
+import org.apache.commons.lang.Validate;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemFlag;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+@SuppressWarnings("unchecked")
+public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends AbstractItemStackBuilder<T, U>> implements ItemBuilder {
+    /**
+     * The ItemMeta used while building.
+     */
+    @Getter(AccessLevel.PROTECTED)
+    private final T meta;
+
+    /**
+     * The ItemStack.
+     */
+    @Getter(AccessLevel.PROTECTED)
+    private final ItemStack base;
+
+    /**
+     * Create a new ItemStackBuilder.
+     *
+     * @param material The material.
+     */
+    protected AbstractItemStackBuilder(@NotNull final Material material) {
+        this(new ItemStack(material));
+    }
+
+    /**
+     * Create a new ItemStackBuilder to modify an existing item.
+     *
+     * @param base The ItemStack to start with.
+     */
+    protected AbstractItemStackBuilder(@NotNull final ItemStack base) {
+        this.base = base;
+        this.meta = (T) base.getItemMeta();
+        assert meta != null;
+    }
+
+    @Override
+    public U setAmount(final int amount) {
+        Validate.isTrue(amount >= 1 && amount <= base.getMaxStackSize());
+        base.setAmount(amount);
+        return (U) this;
+    }
+
+    @Override
+    public U setAmount(@NotNull final Supplier<Integer> amount) {
+        return setAmount(amount.get());
+    }
+
+    @Override
+    public U addEnchantment(@NotNull final Enchantment enchantment,
+                            final int level) {
+        meta.addEnchant(enchantment, level, true);
+        return (U) this;
+    }
+
+    @Override
+    public U addEnchantment(@NotNull final Supplier<Enchantment> enchantment,
+                            @NotNull final Supplier<Integer> level) {
+        return addEnchantment(enchantment.get(), level.get());
+    }
+
+    @Override
+    public U setDisplayName(@NotNull final String name) {
+        meta.setDisplayName(StringUtils.translate(name));
+        return (U) this;
+    }
+
+    @Override
+    public U setDisplayName(@NotNull final Supplier<String> name) {
+        String result = name.get();
+
+        return result == null ? (U) this : setDisplayName(name.get());
+    }
+
+    @Override
+    public U addLoreLine(@NotNull final String line) {
+        List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
+        assert lore != null;
+        lore.add(StringUtils.translate(line));
+        meta.setLore(lore);
+
+        return (U) this;
+    }
+
+    @Override
+    public U addLoreLine(@NotNull final Supplier<String> line) {
+        String result = line.get();
+
+        return result == null ? (U) this : addLoreLine(line.get());
+    }
+
+    @Override
+    public U addLoreLines(@NotNull final List<String> lines) {
+        List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
+        assert lore != null;
+        for (String line : lines) {
+            lore.add(StringUtils.translate(line));
+        }
+        meta.setLore(lore);
+
+        return (U) this;
+    }
+
+    @Override
+    public U addLoreLines(@NotNull final Supplier<List<String>> lines) {
+        List<String> result = lines.get();
+
+        return result == null ? (U) this : addLoreLines(lines.get());
+    }
+
+    @Override
+    public U addItemFlag(@NotNull final ItemFlag... itemFlags) {
+        meta.addItemFlags(itemFlags);
+
+        return (U) this;
+    }
+
+    @Override
+    public U addItemFlag(@NotNull final Supplier<ItemFlag[]> itemFlags) {
+        ItemFlag[] result = itemFlags.get();
+
+        return result == null ? (U) this : addItemFlag(result);
+    }
+
+    @Override
+    public <A, B> U writeMetaKey(@NotNull final NamespacedKey key,
+                                 @NotNull final PersistentDataType<A, B> type,
+                                 @NotNull final B value) {
+        meta.getPersistentDataContainer().set(key, type, value);
+
+        return (U) this;
+    }
+
+    @Override
+    public <A, B> U writeMetaKey(@NotNull final Supplier<NamespacedKey> key,
+                                 @NotNull final Supplier<PersistentDataType<A, B>> type,
+                                 @NotNull final Supplier<B> value) {
+        return writeMetaKey(key.get(), type.get(), value.get());
+    }
+
+    @Override
+    public U setUnbreakable(final boolean unbreakable) {
+        meta.setUnbreakable(unbreakable);
+
+        return (U) this;
+    }
+
+    @Override
+    public U setUnbreakable(@NotNull final Supplier<Boolean> unbreakable) {
+        Boolean result = unbreakable.get();
+
+        return result == null ? (U) this : setUnbreakable(unbreakable);
+    }
+
+    @Override
+    public U setCustomModelData(@Nullable final Integer data) {
+        meta.setCustomModelData(data);
+
+        return (U) this;
+    }
+
+    @Override
+    public U setCustomModelData(@NotNull final Supplier<Integer> data) {
+        Integer result = data.get();
+
+        return result == null ? (U) this : setCustomModelData(result);
+    }
+
+    @Override
+    public ItemStack build() {
+        base.setItemMeta(meta);
+
+        return base;
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/scheduling/EcoScheduler.java

@@ -8,7 +8,7 @@ import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-public class EcoScheduler extends PluginDependent implements Scheduler {
+public class EcoScheduler extends PluginDependent<EcoPlugin> implements Scheduler {
     /**
      * Create a scheduler to manage the tasks of an {@link EcoPlugin}.
      *

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

@@ -37,15 +37,6 @@ public class BlockUtils {
                 if (blocks.size() > limit || blocks.size() > 2500) {
                     return blocks;
                 }
-            }
-        }
-        // Running twice to get more spherical shape.
-        for (BlockFace face : BlockFace.values()) {
-            Block block = start.getRelative(face);
-            if (!blocks.contains(block) && allowedMaterials.contains(block.getType())) {
-                if (blocks.size() > limit || blocks.size() > 2500) {
-                    return blocks;
-                }
                 blocks.addAll(getNearbyBlocks(block, allowedMaterials, blocks, limit));
             }
         }

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

@@ -121,8 +121,7 @@ public class DurabilityUtils {
             return;
         }
 
-        if (item.getItemMeta() instanceof Damageable) {
+        if (item.getItemMeta() instanceof Damageable meta) {
-            Damageable meta = (Damageable) item.getItemMeta();
             meta.setDamage(meta.getDamage() - repair);
 
             if (meta.getDamage() < 0) {

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

@@ -0,0 +1,31 @@
+package com.willfp.eco.util;
+
+import lombok.experimental.UtilityClass;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@UtilityClass
+public class ListUtils {
+    /**
+     * Initialize 2D list of a given size.
+     *
+     * @param rows    The amount of rows.
+     * @param columns The amount of columns.
+     * @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,
+                                          final int columns) {
+        List<List<T>> list = new ArrayList<>(rows);
+        while (list.size() < rows) {
+            List<T> row = new ArrayList<>(columns);
+            while (row.size() < columns) {
+                row.add(null);
+            }
+            list.add(row);
+        }
+
+        return list;
+    }
+}

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

@@ -10,20 +10,10 @@ import java.util.concurrent.ThreadLocalRandom;
 
 @UtilityClass
 public class NumberUtils {
-    /**
-     * Precision.
-     */
-    private static final int FAST_TRIG_PRECISION = 100;
-
-    /**
-     * Modulus.
-     */
-    private static final int FAST_TRIG_MODULUS = 360 * FAST_TRIG_PRECISION;
-
     /**
      * Sin lookup table.
      */
-    private static final double[] SIN_LOOKUP = new double[FAST_TRIG_MODULUS];
+    private static final double[] SIN_LOOKUP = new double[65536];
 
     /**
      * Set of roman numerals to look up.
@@ -45,15 +35,11 @@ public class NumberUtils {
         NUMERALS.put(4, "IV");
         NUMERALS.put(1, "I");
 
-        for (int i = 0; i < SIN_LOOKUP.length; i++) {
+        for (int i = 0; i < 65536; ++i) {
-            SIN_LOOKUP[i] = Math.sin((i * Math.PI) / (FAST_TRIG_PRECISION * 180));
+            SIN_LOOKUP[i] = Math.sin((double) i * 3.141592653589793D * 2.0D / 65536.0D);
         }
     }
 
-    private static double sinLookup(final int a) {
-        return a >= 0 ? SIN_LOOKUP[a % FAST_TRIG_MODULUS] : -SIN_LOOKUP[-a % FAST_TRIG_MODULUS];
-    }
-
     /**
      * Get the sin of a number.
      *
@@ -61,7 +47,8 @@ public class NumberUtils {
      * @return The sin.
      */
     public static double fastSin(final double a) {
-        return sinLookup((int) (a * FAST_TRIG_PRECISION + 0.5f));
+        float f = (float) a;
+        return SIN_LOOKUP[(int) (f * 10430.378F) & '\uffff'];
     }
 
     /**
@@ -71,7 +58,8 @@ public class NumberUtils {
      * @return The cosine.
      */
     public static double fastCos(final double a) {
-        return sinLookup((int) ((a + 90f) * FAST_TRIG_PRECISION + 0.5f));
+        float f = (float) a;
+        return SIN_LOOKUP[(int) (f * 10430.378F + 16384.0F) & '\uffff'];
     }
 
     /**

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

@@ -39,6 +39,33 @@ public class StringUtils {
             .add(Pattern.compile("<#" + "([A-Fa-f0-9]{6})" + ">"))
             .build();
 
+    /**
+     * Translate a list of strings - converts Placeholders and Color codes.
+     *
+     * @param list The messages to translate.
+     * @param player  The player to translate placeholders with respect to.
+     * @return The message, translated.
+     */
+    public List<String> translateList(@NotNull final List<String> list,
+                                      @Nullable final Player player) {
+        List<String> translated = new ArrayList<>();
+        for (String string : list) {
+            translated.add(translate(string, player));
+        }
+
+        return translated;
+    }
+
+    /**
+     * Translate a list of strings - converts Placeholders and Color codes.
+     *
+     * @param list The messages to translate.
+     * @return The message, translated.
+     */
+    public List<String> translateList(@NotNull final List<String> list) {
+        return translateList(list, null);
+    }
+
     /**
      * Translate a string - converts Placeholders and Color codes.
      *
@@ -79,16 +106,16 @@ public class StringUtils {
                                                  @NotNull final Pattern pattern) {
         Matcher matcher = pattern.matcher(message);
 
-        StringBuffer buffer = new StringBuffer(message.length() + 4 * 8);
+        StringBuilder builder = new StringBuilder(message.length() + 4 * 8);
         while (matcher.find()) {
             String group = matcher.group(1);
-            matcher.appendReplacement(buffer, COLOR_CHAR + "x"
+            matcher.appendReplacement(builder, COLOR_CHAR + "x"
                     + COLOR_CHAR + group.charAt(0) + COLOR_CHAR + group.charAt(1)
                     + COLOR_CHAR + group.charAt(2) + COLOR_CHAR + group.charAt(3)
                     + COLOR_CHAR + group.charAt(4) + COLOR_CHAR + group.charAt(5));
         }
 
-        return matcher.appendTail(buffer).toString();
+        return matcher.appendTail(builder).toString();
     }
 
     /**
@@ -198,8 +225,7 @@ public class StringUtils {
             return (String) object;
         } else if (object instanceof Double) {
             return NumberUtils.format((Double) object);
-        } else if (object instanceof Collection<?>) {
+        } else if (object instanceof Collection<?> c) {
-            Collection<?> c = (Collection<?>) object;
             return c.stream().map(StringUtils::internalToString).collect(Collectors.joining(", "));
         } else {
             return String.valueOf(object);

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

@@ -2,6 +2,7 @@ package com.willfp.eco.util;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import com.willfp.eco.core.Prerequisite;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -10,6 +11,8 @@ import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @UtilityClass
@@ -17,7 +20,7 @@ public class TeamUtils {
     /**
      * Ore ChatColors.
      */
-    private static final BiMap<Material, ChatColor> MATERIAL_COLORS = HashBiMap.create();
+    private static final Map<Material, ChatColor> MATERIAL_COLORS = new HashMap<>();
 
     /**
      * All chat color teams.
@@ -73,12 +76,25 @@ public class TeamUtils {
             fromChatColor(value);
         }
 
-        MATERIAL_COLORS.forcePut(Material.COAL_ORE, ChatColor.BLACK);
+        MATERIAL_COLORS.put(Material.COAL_ORE, ChatColor.BLACK);
-        MATERIAL_COLORS.forcePut(Material.IRON_ORE, ChatColor.GRAY);
+        MATERIAL_COLORS.put(Material.IRON_ORE, ChatColor.GRAY);
-        MATERIAL_COLORS.forcePut(Material.GOLD_ORE, ChatColor.YELLOW);
+        MATERIAL_COLORS.put(Material.GOLD_ORE, ChatColor.YELLOW);
-        MATERIAL_COLORS.forcePut(Material.LAPIS_ORE, ChatColor.BLUE);
+        MATERIAL_COLORS.put(Material.LAPIS_ORE, ChatColor.BLUE);
-        MATERIAL_COLORS.forcePut(Material.REDSTONE_ORE, ChatColor.RED);
+        MATERIAL_COLORS.put(Material.REDSTONE_ORE, ChatColor.RED);
-        MATERIAL_COLORS.forcePut(Material.DIAMOND_ORE, ChatColor.AQUA);
+        MATERIAL_COLORS.put(Material.DIAMOND_ORE, ChatColor.AQUA);
-        MATERIAL_COLORS.forcePut(Material.ANCIENT_DEBRIS, ChatColor.DARK_RED);
+        MATERIAL_COLORS.put(Material.EMERALD_ORE, ChatColor.GREEN);
+        MATERIAL_COLORS.put(Material.ANCIENT_DEBRIS, ChatColor.DARK_RED);
+
+        if (Prerequisite.HAS_1_17.isMet()) {
+            MATERIAL_COLORS.put(Material.COPPER_ORE, ChatColor.GOLD);
+            MATERIAL_COLORS.put(Material.DEEPSLATE_COPPER_ORE, ChatColor.GOLD);
+            MATERIAL_COLORS.put(Material.DEEPSLATE_COAL_ORE, ChatColor.BLACK);
+            MATERIAL_COLORS.put(Material.DEEPSLATE_IRON_ORE, ChatColor.GRAY);
+            MATERIAL_COLORS.put(Material.DEEPSLATE_GOLD_ORE, ChatColor.YELLOW);
+            MATERIAL_COLORS.put(Material.DEEPSLATE_LAPIS_ORE, ChatColor.BLUE);
+            MATERIAL_COLORS.put(Material.DEEPSLATE_REDSTONE_ORE, ChatColor.RED);
+            MATERIAL_COLORS.put(Material.DEEPSLATE_DIAMOND_ORE, ChatColor.AQUA);
+            MATERIAL_COLORS.put(Material.DEEPSLATE_EMERALD_ORE, ChatColor.GREEN);
+        }
     }
 }

eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/BlockBreak.java

@@ -11,6 +11,10 @@ public final class BlockBreak implements BlockBreakProxy {
     @Override
     public void breakBlock(@NotNull final Player player,
                            @NotNull final Block block) {
+        if (!(player instanceof CraftPlayer)) {
+            return;
+        }
+
         ((CraftPlayer) player).getHandle().playerInteractManager.breakBlock(new BlockPosition(block.getX(), block.getY(), block.getZ()));
     }
 }

eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/ChatComponent.java

@@ -22,18 +22,29 @@ import java.util.Arrays;
 public final class ChatComponent implements ChatComponentProxy {
     @Override
     public Object modifyComponent(@NotNull final Object object) {
-        if (!(object instanceof IChatBaseComponent)) {
+        if (!(object instanceof IChatBaseComponent chatComponent)) {
             return object;
         }
 
-        IChatBaseComponent chatComponent = (IChatBaseComponent) object;
+        for (IChatBaseComponent iChatBaseComponent : chatComponent) {
-        chatComponent.stream().forEach(this::modifyBaseComponent);
+            if (iChatBaseComponent == null) {
+                continue;
+            }
+
+            modifyBaseComponent(iChatBaseComponent);
+        }
 
         return chatComponent;
     }
 
     private void modifyBaseComponent(@NotNull final IChatBaseComponent component) {
-        component.getSiblings().forEach(this::modifyBaseComponent);
+        for (IChatBaseComponent sibling : component.getSiblings()) {
+            if (sibling == null) {
+                continue;
+            }
+
+            modifyBaseComponent(sibling);
+        }
         if (component instanceof ChatMessage) {
             Arrays.stream(((ChatMessage) component).getArgs())
                     .filter(o -> o instanceof IChatBaseComponent)

eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/VillagerTrade.java

@@ -1,8 +1,7 @@
 package com.willfp.eco.proxy.v1_16_R1;
 
-import com.willfp.eco.proxy.proxies.VillagerTradeProxy;
 import com.willfp.eco.core.display.Display;
-import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
+import com.willfp.eco.proxy.proxies.VillagerTradeProxy;
 import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftMerchantRecipe;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
@@ -11,30 +10,56 @@ import org.jetbrains.annotations.NotNull;
 import java.lang.reflect.Field;
 
 public final class VillagerTrade implements VillagerTradeProxy {
-    @Override
+    /**
-    public void displayTrade(@NotNull final MerchantRecipe merchantRecipe) {
+     * Handle.
+     */
+    private final Field handle;
+
+    /**
+     * Create new Villager Trade.
+     */
+    public VillagerTrade() {
         try {
-            // Bukkit MerchantRecipe result
+            handle = CraftMerchantRecipe.class.getDeclaredField("handle");
-            Field fResult = MerchantRecipe.class.getDeclaredField("result");
+            handle.setAccessible(true);
-            fResult.setAccessible(true);
+            return;
-            ItemStack result = merchantRecipe.getResult();
+        } catch (NoSuchFieldException e) {
-            Display.displayAndFinalize(result);
-            fResult.set(merchantRecipe, result);
-
-            // Get NMS MerchantRecipe from CraftMerchantRecipe
-            Field fHandle = CraftMerchantRecipe.class.getDeclaredField("handle");
-            fHandle.setAccessible(true);
-            net.minecraft.server.v1_16_R1.MerchantRecipe handle = (net.minecraft.server.v1_16_R1.MerchantRecipe) fHandle.get(merchantRecipe); // NMS Recipe
-
-            Field fSelling = net.minecraft.server.v1_16_R1.MerchantRecipe.class.getDeclaredField("sellingItem");
-            fSelling.setAccessible(true);
-
-            ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
-            Display.displayAndFinalize(selling);
-
-            fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
-        } catch (IllegalAccessException | NoSuchFieldException e) {
             e.printStackTrace();
         }
+
+        throw new RuntimeException("Error!");
+    }
+
+    @Override
+    public MerchantRecipe displayTrade(@NotNull final MerchantRecipe recipe) {
+        CraftMerchantRecipe oldRecipe = (CraftMerchantRecipe) recipe;
+
+        CraftMerchantRecipe newRecipe = new CraftMerchantRecipe(
+                Display.display(recipe.getResult().clone()),
+                recipe.getUses(),
+                recipe.getMaxUses(),
+                recipe.hasExperienceReward(),
+                recipe.getVillagerExperience(),
+                recipe.getPriceMultiplier()
+        );
+
+        for (ItemStack ingredient : recipe.getIngredients()) {
+            newRecipe.addIngredient(Display.display(ingredient.clone()));
+        }
+
+        getHandle(newRecipe).setSpecialPrice(getHandle(oldRecipe).getSpecialPrice());
+
+        return newRecipe;
+    }
+
+    @NotNull
+    private net.minecraft.server.v1_16_R1.MerchantRecipe getHandle(@NotNull final CraftMerchantRecipe recipe) {
+        try {
+            return (net.minecraft.server.v1_16_R1.MerchantRecipe) handle.get(recipe);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        throw new IllegalArgumentException("Not CMR");
     }
 }

eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/BlockBreak.java

@@ -11,6 +11,10 @@ public final class BlockBreak implements BlockBreakProxy {
     @Override
     public void breakBlock(@NotNull final Player player,
                            @NotNull final Block block) {
+        if (!(player instanceof CraftPlayer)) {
+            return;
+        }
+
         ((CraftPlayer) player).getHandle().playerInteractManager.breakBlock(new BlockPosition(block.getX(), block.getY(), block.getZ()));
     }
 }

eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/ChatComponent.java

@@ -22,18 +22,29 @@ import java.util.Arrays;
 public final class ChatComponent implements ChatComponentProxy {
     @Override
     public Object modifyComponent(@NotNull final Object object) {
-        if (!(object instanceof IChatBaseComponent)) {
+        if (!(object instanceof IChatBaseComponent chatComponent)) {
             return object;
         }
 
-        IChatBaseComponent chatComponent = (IChatBaseComponent) object;
+        for (IChatBaseComponent iChatBaseComponent : chatComponent) {
-        chatComponent.stream().forEach(this::modifyBaseComponent);
+            if (iChatBaseComponent == null) {
+                continue;
+            }
+
+            modifyBaseComponent(iChatBaseComponent);
+        }
 
         return chatComponent;
     }
 
     private void modifyBaseComponent(@NotNull final IChatBaseComponent component) {
-        component.getSiblings().forEach(this::modifyBaseComponent);
+        for (IChatBaseComponent sibling : component.getSiblings()) {
+            if (sibling == null) {
+                continue;
+            }
+
+            modifyBaseComponent(sibling);
+        }
         if (component instanceof ChatMessage) {
             Arrays.stream(((ChatMessage) component).getArgs())
                     .filter(o -> o instanceof IChatBaseComponent)

eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/VillagerTrade.java

@@ -1,8 +1,7 @@
 package com.willfp.eco.proxy.v1_16_R2;
 
-import com.willfp.eco.proxy.proxies.VillagerTradeProxy;
 import com.willfp.eco.core.display.Display;
-import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
+import com.willfp.eco.proxy.proxies.VillagerTradeProxy;
 import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftMerchantRecipe;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
@@ -11,30 +10,56 @@ import org.jetbrains.annotations.NotNull;
 import java.lang.reflect.Field;
 
 public final class VillagerTrade implements VillagerTradeProxy {
-    @Override
+    /**
-    public void displayTrade(@NotNull final MerchantRecipe merchantRecipe) {
+     * Handle.
+     */
+    private final Field handle;
+
+    /**
+     * Create new Villager Trade.
+     */
+    public VillagerTrade() {
         try {
-            // Bukkit MerchantRecipe result
+            handle = CraftMerchantRecipe.class.getDeclaredField("handle");
-            Field fResult = MerchantRecipe.class.getDeclaredField("result");
+            handle.setAccessible(true);
-            fResult.setAccessible(true);
+            return;
-            ItemStack result = merchantRecipe.getResult();
+        } catch (NoSuchFieldException e) {
-            Display.displayAndFinalize(result);
-            fResult.set(merchantRecipe, result);
-
-            // Get NMS MerchantRecipe from CraftMerchantRecipe
-            Field fHandle = CraftMerchantRecipe.class.getDeclaredField("handle");
-            fHandle.setAccessible(true);
-            net.minecraft.server.v1_16_R2.MerchantRecipe handle = (net.minecraft.server.v1_16_R2.MerchantRecipe) fHandle.get(merchantRecipe); // NMS Recipe
-
-            Field fSelling = net.minecraft.server.v1_16_R2.MerchantRecipe.class.getDeclaredField("sellingItem");
-            fSelling.setAccessible(true);
-
-            ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
-            Display.displayAndFinalize(selling);
-
-            fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
-        } catch (IllegalAccessException | NoSuchFieldException e) {
             e.printStackTrace();
         }
+
+        throw new RuntimeException("Error!");
+    }
+
+    @Override
+    public MerchantRecipe displayTrade(@NotNull final MerchantRecipe recipe) {
+        CraftMerchantRecipe oldRecipe = (CraftMerchantRecipe) recipe;
+
+        CraftMerchantRecipe newRecipe = new CraftMerchantRecipe(
+                Display.display(recipe.getResult().clone()),
+                recipe.getUses(),
+                recipe.getMaxUses(),
+                recipe.hasExperienceReward(),
+                recipe.getVillagerExperience(),
+                recipe.getPriceMultiplier()
+        );
+
+        for (ItemStack ingredient : recipe.getIngredients()) {
+            newRecipe.addIngredient(Display.display(ingredient.clone()));
+        }
+
+        getHandle(newRecipe).setSpecialPrice(getHandle(oldRecipe).getSpecialPrice());
+
+        return newRecipe;
+    }
+
+    @NotNull
+    private net.minecraft.server.v1_16_R2.MerchantRecipe getHandle(@NotNull final CraftMerchantRecipe recipe) {
+        try {
+            return (net.minecraft.server.v1_16_R2.MerchantRecipe) handle.get(recipe);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        throw new IllegalArgumentException("Not CMR");
     }
 }

eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/BlockBreak.java

@@ -11,6 +11,10 @@ public final class BlockBreak implements BlockBreakProxy {
     @Override
     public void breakBlock(@NotNull final Player player,
                            @NotNull final Block block) {
+        if (!(player instanceof CraftPlayer)) {
+            return;
+        }
+
         ((CraftPlayer) player).getHandle().playerInteractManager.breakBlock(new BlockPosition(block.getX(), block.getY(), block.getZ()));
     }
 }

eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java

@@ -22,18 +22,29 @@ import java.util.Arrays;
 public final class ChatComponent implements ChatComponentProxy {
     @Override
     public Object modifyComponent(@NotNull final Object object) {
-        if (!(object instanceof IChatBaseComponent)) {
+        if (!(object instanceof IChatBaseComponent chatComponent)) {
             return object;
         }
 
-        IChatBaseComponent chatComponent = (IChatBaseComponent) object;
+        for (IChatBaseComponent iChatBaseComponent : chatComponent) {
-        chatComponent.stream().forEach(this::modifyBaseComponent);
+            if (iChatBaseComponent == null) {
+                continue;
+            }
+
+            modifyBaseComponent(iChatBaseComponent);
+        }
 
         return chatComponent;
     }
 
     private void modifyBaseComponent(@NotNull final IChatBaseComponent component) {
-        component.getSiblings().forEach(this::modifyBaseComponent);
+        for (IChatBaseComponent sibling : component.getSiblings()) {
+            if (sibling == null) {
+                continue;
+            }
+
+            modifyBaseComponent(sibling);
+        }
         if (component instanceof ChatMessage) {
             Arrays.stream(((ChatMessage) component).getArgs())
                     .filter(o -> o instanceof IChatBaseComponent)

eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.java

@@ -1,8 +1,7 @@
 package com.willfp.eco.proxy.v1_16_R3;
 
-import com.willfp.eco.proxy.proxies.VillagerTradeProxy;
 import com.willfp.eco.core.display.Display;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import com.willfp.eco.proxy.proxies.VillagerTradeProxy;
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantRecipe;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
@@ -11,30 +10,56 @@ import org.jetbrains.annotations.NotNull;
 import java.lang.reflect.Field;
 
 public final class VillagerTrade implements VillagerTradeProxy {
-    @Override
+    /**
-    public void displayTrade(@NotNull final MerchantRecipe merchantRecipe) {
+     * Handle.
+     */
+    private final Field handle;
+
+    /**
+     * Create new Villager Trade.
+     */
+    public VillagerTrade() {
         try {
-            // Bukkit MerchantRecipe result
+            handle = CraftMerchantRecipe.class.getDeclaredField("handle");
-            Field fResult = MerchantRecipe.class.getDeclaredField("result");
+            handle.setAccessible(true);
-            fResult.setAccessible(true);
+            return;
-            ItemStack result = merchantRecipe.getResult();
+        } catch (NoSuchFieldException e) {
-            Display.displayAndFinalize(result);
-            fResult.set(merchantRecipe, result);
-
-            // Get NMS MerchantRecipe from CraftMerchantRecipe
-            Field fHandle = CraftMerchantRecipe.class.getDeclaredField("handle");
-            fHandle.setAccessible(true);
-            net.minecraft.server.v1_16_R3.MerchantRecipe handle = (net.minecraft.server.v1_16_R3.MerchantRecipe) fHandle.get(merchantRecipe); // NMS RecipeR
-
-            Field fSelling = net.minecraft.server.v1_16_R3.MerchantRecipe.class.getDeclaredField("sellingItem");
-            fSelling.setAccessible(true);
-
-            ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem);
-            Display.displayAndFinalize(selling);
-
-            fSelling.set(handle, CraftItemStack.asNMSCopy(selling));
-        } catch (IllegalAccessException | NoSuchFieldException e) {
             e.printStackTrace();
         }
+
+        throw new RuntimeException("Error!");
+    }
+
+    @Override
+    public MerchantRecipe displayTrade(@NotNull final MerchantRecipe recipe) {
+        CraftMerchantRecipe oldRecipe = (CraftMerchantRecipe) recipe;
+
+        CraftMerchantRecipe newRecipe = new CraftMerchantRecipe(
+                Display.display(recipe.getResult().clone()),
+                recipe.getUses(),
+                recipe.getMaxUses(),
+                recipe.hasExperienceReward(),
+                recipe.getVillagerExperience(),
+                recipe.getPriceMultiplier()
+        );
+
+        for (ItemStack ingredient : recipe.getIngredients()) {
+            newRecipe.addIngredient(Display.display(ingredient.clone()));
+        }
+
+        getHandle(newRecipe).setSpecialPrice(getHandle(oldRecipe).getSpecialPrice());
+
+        return newRecipe;
+    }
+
+    @NotNull
+    private net.minecraft.server.v1_16_R3.MerchantRecipe getHandle(@NotNull final CraftMerchantRecipe recipe) {
+        try {
+            return (net.minecraft.server.v1_16_R3.MerchantRecipe) handle.get(recipe);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        throw new IllegalArgumentException("Not CMR");
     }
 }

eco-core/core-nms/v1_17_R1/build.gradle

@@ -0,0 +1,6 @@
+group 'com.willfp'
+version rootProject.version
+
+dependencies {
+    compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT'
+}

eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/AutoCraft.java

@@ -0,0 +1,19 @@
+package com.willfp.eco.proxy.v1_17_R1;
+
+import com.willfp.eco.proxy.proxies.AutoCraftProxy;
+import net.minecraft.network.protocol.game.PacketPlayOutAutoRecipe;
+import net.minecraft.resources.MinecraftKey;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+
+public final class AutoCraft implements AutoCraftProxy {
+    @Override
+    public void modifyPacket(@NotNull final Object packet) throws NoSuchFieldException, IllegalAccessException {
+        PacketPlayOutAutoRecipe recipePacket = (PacketPlayOutAutoRecipe) packet;
+        Field fKey = recipePacket.getClass().getDeclaredField("b");
+        fKey.setAccessible(true);
+        MinecraftKey key = (MinecraftKey) fKey.get(recipePacket);
+        fKey.set(recipePacket, new MinecraftKey(key.getNamespace(), key.getKey() + "_displayed"));
+    }
+}

eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/BlockBreak.java

@@ -0,0 +1,20 @@
+package com.willfp.eco.proxy.v1_17_R1;
+
+import com.willfp.eco.proxy.proxies.BlockBreakProxy;
+import net.minecraft.core.BlockPosition;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public final class BlockBreak implements BlockBreakProxy {
+    @Override
+    public void breakBlock(@NotNull final Player player,
+                           @NotNull final Block block) {
+        if (!(player instanceof CraftPlayer)) {
+            return;
+        }
+
+        ((CraftPlayer) player).getHandle().d.breakBlock(new BlockPosition(block.getX(), block.getY(), block.getZ()));
+    }
+}

eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java

@@ -0,0 +1,115 @@
+package com.willfp.eco.proxy.v1_17_R1;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.willfp.eco.proxy.proxies.ChatComponentProxy;
+import com.willfp.eco.core.display.Display;
+import net.minecraft.nbt.MojangsonParser;
+import net.minecraft.network.chat.ChatBaseComponent;
+import net.minecraft.network.chat.ChatHoverable;
+import net.minecraft.network.chat.ChatMessage;
+import net.minecraft.network.chat.ChatModifier;
+import net.minecraft.network.chat.IChatBaseComponent;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+
+public final class ChatComponent implements ChatComponentProxy {
+    @Override
+    public Object modifyComponent(@NotNull final Object object) {
+        if (!(object instanceof IChatBaseComponent chatComponent)) {
+            return object;
+        }
+
+        for (IChatBaseComponent iChatBaseComponent : chatComponent) {
+            if (iChatBaseComponent == null) {
+                continue;
+            }
+
+            modifyBaseComponent(iChatBaseComponent);
+        }
+
+        return chatComponent;
+    }
+
+    private void modifyBaseComponent(@NotNull final IChatBaseComponent component) {
+        for (IChatBaseComponent sibling : component.getSiblings()) {
+            if (sibling == null) {
+                continue;
+            }
+
+            modifyBaseComponent(sibling);
+        }
+        if (component instanceof ChatMessage) {
+            Arrays.stream(((ChatMessage) component).getArgs())
+                    .filter(o -> o instanceof IChatBaseComponent)
+                    .map(o -> (IChatBaseComponent) o)
+                    .forEach(this::modifyBaseComponent);
+        }
+
+        ChatHoverable hoverable = component.getChatModifier().getHoverEvent();
+
+        if (hoverable == null) {
+            return;
+        }
+
+        JsonObject jsonObject = hoverable.b();
+        JsonElement json = hoverable.b().get("contents");
+        if (json.getAsJsonObject().get("id") == null) {
+            return;
+        }
+        if (json.getAsJsonObject().get("tag") == null) {
+            return;
+        }
+        String id = json.getAsJsonObject().get("id").toString();
+        String tag = json.getAsJsonObject().get("tag").toString();
+        ItemStack itemStack = getFromTag(tag, id);
+
+        Display.displayAndFinalize(itemStack);
+
+        json.getAsJsonObject().remove("tag");
+        String newTag = toJson(itemStack);
+        json.getAsJsonObject().add("tag", new JsonPrimitive(newTag));
+
+        jsonObject.remove("contents");
+        jsonObject.add("contents", json);
+        ChatHoverable newHoverable = ChatHoverable.a(jsonObject);
+        ChatModifier modifier = component.getChatModifier();
+        modifier = modifier.setChatHoverable(newHoverable);
+
+        ((ChatBaseComponent) component).setChatModifier(modifier);
+    }
+
+    private static ItemStack getFromTag(@NotNull final String jsonTag,
+                                        @NotNull final String id) {
+        String processedId = id;
+        String processedJsonTag = jsonTag;
+        processedId = processedId.replace("minecraft:", "");
+        processedId = processedId.toUpperCase();
+        processedId = processedId.replace("\"", "");
+        processedJsonTag = processedJsonTag.substring(1, processedJsonTag.length() - 1);
+        processedJsonTag = processedJsonTag.replace("id:", "\"id\":");
+        processedJsonTag = processedJsonTag.replace("\\", "");
+        Material material = Material.getMaterial(processedId);
+
+        assert material != null;
+        ItemStack itemStack = new ItemStack(material);
+        net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
+
+        try {
+            nmsStack.setTag(MojangsonParser.parse(processedJsonTag));
+        } catch (CommandSyntaxException e) {
+            e.printStackTrace();
+        }
+        return CraftItemStack.asBukkitCopy(nmsStack);
+    }
+
+    private static String toJson(@NotNull final ItemStack itemStack) {
+        return CraftItemStack.asNMSCopy(itemStack).getOrCreateTag().toString();
+    }
+}

eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/Skull.java

@@ -0,0 +1,41 @@
+package com.willfp.eco.proxy.v1_17_R1;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.willfp.eco.proxy.proxies.SkullProxy;
+import org.bukkit.inventory.meta.SkullMeta;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.UUID;
+
+public final class Skull implements SkullProxy {
+    /**
+     * Cached method to set the gameProfile.
+     */
+    private Method setProfile = null;
+
+    @Override
+    public void setSkullTexture(@NotNull final SkullMeta meta,
+                                @NotNull final String base64) {
+        try {
+            if (setProfile == null) {
+                setProfile = meta.getClass().getDeclaredMethod("setProfile", GameProfile.class);
+                setProfile.setAccessible(true);
+            }
+
+            UUID uuid = new UUID(
+                    base64.substring(base64.length() - 20).hashCode(),
+                    base64.substring(base64.length() - 10).hashCode()
+            );
+
+            GameProfile profile = new GameProfile(uuid, "talismans");
+            profile.getProperties().put("textures", new Property("textures", base64));
+
+            setProfile.invoke(meta, profile);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
+}

eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/TridentStack.java

@@ -0,0 +1,13 @@
+package com.willfp.eco.proxy.v1_17_R1;
+
+import com.willfp.eco.proxy.proxies.TridentStackProxy;
+import org.bukkit.entity.Trident;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+public final class TridentStack implements TridentStackProxy {
+    @Override
+    public ItemStack getTridentStack(@NotNull final Trident trident) {
+        return trident.getItem();
+    }
+}

eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/VillagerTrade.java

@@ -0,0 +1,65 @@
+package com.willfp.eco.proxy.v1_17_R1;
+
+import com.willfp.eco.core.display.Display;
+import com.willfp.eco.proxy.proxies.VillagerTradeProxy;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftMerchantRecipe;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.MerchantRecipe;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+
+public final class VillagerTrade implements VillagerTradeProxy {
+    /**
+     * Handle.
+     */
+    private final Field handle;
+
+    /**
+     * Create new Villager Trade.
+     */
+    public VillagerTrade() {
+        try {
+            handle = CraftMerchantRecipe.class.getDeclaredField("handle");
+            handle.setAccessible(true);
+            return;
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+
+        throw new RuntimeException("Error!");
+    }
+
+    @Override
+    public MerchantRecipe displayTrade(@NotNull final MerchantRecipe recipe) {
+        CraftMerchantRecipe oldRecipe = (CraftMerchantRecipe) recipe;
+
+        CraftMerchantRecipe newRecipe = new CraftMerchantRecipe(
+                Display.display(recipe.getResult().clone()),
+                recipe.getUses(),
+                recipe.getMaxUses(),
+                recipe.hasExperienceReward(),
+                recipe.getVillagerExperience(),
+                recipe.getPriceMultiplier()
+        );
+
+        for (ItemStack ingredient : recipe.getIngredients()) {
+            newRecipe.addIngredient(Display.display(ingredient.clone()));
+        }
+
+        getHandle(newRecipe).setSpecialPrice(getHandle(oldRecipe).getSpecialPrice());
+
+        return newRecipe;
+    }
+
+    @NotNull
+    private net.minecraft.world.item.trading.MerchantRecipe getHandle(@NotNull final CraftMerchantRecipe recipe) {
+        try {
+            return (net.minecraft.world.item.trading.MerchantRecipe) handle.get(recipe);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        throw new IllegalArgumentException("Not CMR");
+    }
+}

eco-core/core-plugin/build.gradle

@@ -4,6 +4,7 @@ version rootProject.version
 dependencies {
     implementation 'org.apache.maven:maven-artifact:3.0.3'
     implementation 'org.bstats:bstats-bukkit:1.7'
+    compileOnly 'com.google.code.gson:gson:2.8.7'
     compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
     compileOnly project(":eco-core:core-proxy")
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.0-SNAPSHOT'
@@ -16,6 +17,15 @@ dependencies {
     compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
     compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'
     compileOnly 'com.gmail.nossr50.mcMMO:mcMMO:2.1.157'
+
+    // CombatLogX V10 + NewbieHelper Expansion
+    compileOnly 'com.SirBlobman.combatlogx:CombatLogX-API:10.0.0.0-SNAPSHOT'
+    compileOnly 'com.SirBlobman.combatlogx.expansions:NewbieHelper:10.0.0.0-SNAPSHOT'
+
+    // CombatLogX V11 + NewbieHelper Expansion
+    compileOnly 'com.github.sirblobman.combatlogx:api:11.0.0.0-SNAPSHOT'
+    compileOnly 'com.github.sirblobman.combatlogx.expansion:newbie-helper:11.0.0.0-SNAPSHOT'
+
     compileOnly fileTree(dir: '../../lib', include: ['*.jar'])
 }
 

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoInternals.java

@@ -0,0 +1,17 @@
+package com.willfp.eco.spigot;
+
+import com.willfp.eco.internal.Internals;
+import org.jetbrains.annotations.NotNull;
+
+public class EcoInternals extends Internals {
+    private final EcoSpigotPlugin plugin;
+
+    EcoInternals(@NotNull final EcoSpigotPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public EcoSpigotPlugin getPlugin() {
+        return plugin;
+    }
+}

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java

@@ -2,16 +2,17 @@ package com.willfp.eco.spigot;
 
 import com.willfp.eco.core.AbstractPacketAdapter;
 import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.command.AbstractCommand;
+import com.willfp.eco.core.data.Data;
 import com.willfp.eco.core.display.Display;
-import com.willfp.eco.core.display.DisplayModule;
 import com.willfp.eco.core.integrations.IntegrationLoader;
 import com.willfp.eco.core.integrations.anticheat.AnticheatManager;
 import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.core.integrations.mcmmo.McmmoManager;
+import com.willfp.eco.internal.Internals;
 import com.willfp.eco.proxy.proxies.BlockBreakProxy;
 import com.willfp.eco.proxy.proxies.SkullProxy;
 import com.willfp.eco.proxy.proxies.TridentStackProxy;
+import com.willfp.eco.spigot.config.DataJson;
 import com.willfp.eco.spigot.display.PacketAutoRecipe;
 import com.willfp.eco.spigot.display.PacketChat;
 import com.willfp.eco.spigot.display.PacketOpenWindowMerchant;
@@ -23,10 +24,15 @@ import com.willfp.eco.spigot.eventlisteners.ArmorListener;
 import com.willfp.eco.spigot.eventlisteners.DispenserArmorListener;
 import com.willfp.eco.spigot.eventlisteners.EntityDeathByEntityListeners;
 import com.willfp.eco.spigot.eventlisteners.NaturalExpGainListeners;
+import com.willfp.eco.spigot.eventlisteners.PlayerJumpListeners;
+import com.willfp.eco.spigot.gui.GUIListener;
 import com.willfp.eco.spigot.integrations.anticheat.AnticheatAAC;
 import com.willfp.eco.spigot.integrations.anticheat.AnticheatMatrix;
 import com.willfp.eco.spigot.integrations.anticheat.AnticheatNCP;
-import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogX;
+import com.willfp.eco.spigot.integrations.anticheat.AnticheatSpartan;
+import com.willfp.eco.spigot.integrations.anticheat.AnticheatVulcan;
+import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogXV10;
+import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogXV11;
 import com.willfp.eco.spigot.integrations.antigrief.AntigriefFactionsUUID;
 import com.willfp.eco.spigot.integrations.antigrief.AntigriefGriefPrevention;
 import com.willfp.eco.spigot.integrations.antigrief.AntigriefKingdoms;
@@ -39,9 +45,13 @@ import com.willfp.eco.util.BlockUtils;
 import com.willfp.eco.util.SkullUtils;
 import com.willfp.eco.util.TridentUtils;
 import lombok.Getter;
-import org.bukkit.event.Listener;
-import org.jetbrains.annotations.Nullable;
 
+import org.bukkit.Bukkit;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
+
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -53,42 +63,45 @@ public class EcoSpigotPlugin extends EcoPlugin {
     @Getter
     private static EcoSpigotPlugin instance;
 
+    /**
+     * data.json.
+     */
+    private final DataJson dataJson;
+
     /**
      * Create a new instance of eco.
      */
     public EcoSpigotPlugin() {
-        super("eco", 87955, 10043, "com.willfp.eco.proxy", "&a");
+        super(87955, 10043, "com.willfp.eco.proxy", "&a");
         instance = this;
+        Internals.setInterfacing(new EcoInternals(this));
         Display.setFinalizeKey(this.getNamespacedKeyFactory().create("finalized"));
 
-        SkullProxy skullProxy = InternalProxyUtils.getProxy(SkullProxy.class);
+        SkullProxy skullProxy = ProxyUtils.getProxy(SkullProxy.class);
         SkullUtils.initialize(skullProxy::setSkullTexture);
 
-        BlockBreakProxy blockBreakProxy = InternalProxyUtils.getProxy(BlockBreakProxy.class);
+        BlockBreakProxy blockBreakProxy = ProxyUtils.getProxy(BlockBreakProxy.class);
         BlockUtils.initialize(blockBreakProxy::breakBlock);
 
-        TridentStackProxy tridentStackProxy = InternalProxyUtils.getProxy(TridentStackProxy.class);
+        TridentStackProxy tridentStackProxy = ProxyUtils.getProxy(TridentStackProxy.class);
         TridentUtils.initialize(tridentStackProxy::getTridentStack);
+
+        this.dataJson = new DataJson(this);
+        Data.init(this.dataJson);
     }
 
     @Override
     public void enable() {
         new CollatedRunnable(this);
-        this.getEventManager().registerListener(new NaturalExpGainListeners());
-        this.getEventManager().registerListener(new ArmorListener());
-        this.getEventManager().registerListener(new DispenserArmorListener());
-        this.getEventManager().registerListener(new EntityDeathByEntityListeners(this));
-        this.getEventManager().registerListener(new ShapedRecipeListener());
     }
 
     @Override
     public void disable() {
-
+        try {
+            Data.save(this.dataJson);
+        } catch (IOException e) {
+            e.printStackTrace();
         }
-
-    @Override
-    public void load() {
-
     }
 
     @Override
@@ -96,11 +109,6 @@ public class EcoSpigotPlugin extends EcoPlugin {
         new CollatedRunnable(this);
     }
 
-    @Override
-    public void postLoad() {
-
-    }
-
     @Override
     public List<IntegrationLoader> getIntegrationLoaders() {
         return Arrays.asList(
@@ -111,48 +119,60 @@ public class EcoSpigotPlugin extends EcoPlugin {
                 new IntegrationLoader("Towny", () -> AntigriefManager.register(new AntigriefTowny())),
                 new IntegrationLoader("Lands", () -> AntigriefManager.register(new AntigriefLands(this))),
                 new IntegrationLoader("Kingdoms", () -> AntigriefManager.register(new AntigriefKingdoms())),
-                new IntegrationLoader("CombatLogX", () -> AntigriefManager.register(new AntigriefCombatLogX())),
+                new IntegrationLoader("CombatLogX", () -> {
+                    PluginManager pluginManager = Bukkit.getPluginManager();
+                    Plugin plugin_CombatLogX = pluginManager.getPlugin("CombatLogX");
+                    if (plugin_CombatLogX == null) return;
+
+                    String pluginVersion = plugin_CombatLogX.getDescription().getVersion();
+                    if (pluginVersion.startsWith("10")) {
+                        AntigriefManager.register(new AntigriefCombatLogXV10());
+                    }
+
+                    if(pluginVersion.startsWith("11")) {
+                        AntigriefManager.register(new AntigriefCombatLogXV11());
+                    }
+                }),
 
                 // Anticheat
                 new IntegrationLoader("AAC5", () -> AnticheatManager.register(this, new AnticheatAAC())),
                 new IntegrationLoader("Matrix", () -> AnticheatManager.register(this, new AnticheatMatrix())),
                 new IntegrationLoader("NoCheatPlus", () -> AnticheatManager.register(this, new AnticheatNCP())),
+                new IntegrationLoader("Spartan", () -> AnticheatManager.register(this, new AnticheatSpartan())),
+                new IntegrationLoader("Vulcan", () -> AnticheatManager.register(this, new AnticheatVulcan())),
 
                 // Misc
                 new IntegrationLoader("mcMMO", () -> McmmoManager.register(new McmmoIntegrationImpl()))
         );
     }
 
-    @Override
-    public List<AbstractCommand> getCommands() {
-        return new ArrayList<>();
-    }
-
     @Override
     public List<AbstractPacketAdapter> getPacketAdapters() {
-        return Arrays.asList(
+        List<AbstractPacketAdapter> adapters = new ArrayList<>(Arrays.asList(
                 new PacketAutoRecipe(this),
                 new PacketChat(this),
-                new PacketOpenWindowMerchant(this),
                 new PacketSetCreativeSlot(this),
                 new PacketSetSlot(this),
                 new PacketWindowItems(this)
-        );
+        ));
+
+        if (!this.getConfigYml().getBool("disable-display-on-villagers")) {
+            adapters.add(new PacketOpenWindowMerchant(this));
+        }
+
+        return adapters;
     }
 
     @Override
     public List<Listener> getListeners() {
-        return new ArrayList<>();
+        return Arrays.asList(
-    }
+                new NaturalExpGainListeners(),
-
+                new ArmorListener(),
-    @Override
+                new DispenserArmorListener(),
-    public List<Class<?>> getUpdatableClasses() {
+                new EntityDeathByEntityListeners(this),
-        return new ArrayList<>();
+                new ShapedRecipeListener(this),
-    }
+                new PlayerJumpListeners(),
-
+                new GUIListener(this)
-    @Override
+        );
-    @Nullable
-    protected DisplayModule createDisplayModule() {
-        return null;
     }
 }

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/InternalProxyUtils.java

@@ -1,20 +0,0 @@
-package com.willfp.eco.spigot;
-
-import com.willfp.eco.core.proxy.AbstractProxy;
-import com.willfp.eco.proxy.util.ProxyFactory;
-import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
-
-@UtilityClass
-public class InternalProxyUtils {
-    /**
-     * Get the implementation of a specified proxy.
-     *
-     * @param proxyClass The proxy interface.
-     * @param <T>        The type of the proxy.
-     * @return The proxy implementation.
-     */
-    public @NotNull <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxyClass) {
-        return new ProxyFactory<>(EcoSpigotPlugin.getInstance(), proxyClass).getProxy();
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/ProxyUtils.java

@@ -0,0 +1,13 @@
+package com.willfp.eco.spigot;
+
+import com.willfp.eco.core.proxy.AbstractProxy;
+import com.willfp.eco.proxy.util.ProxyFactory;
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+
+@UtilityClass
+public class ProxyUtils {
+    public <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxy) {
+        return new ProxyFactory<>(EcoSpigotPlugin.getInstance(), proxy).getProxy();
+    }
+}

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/config/DataJson.java

@@ -0,0 +1,16 @@
+package com.willfp.eco.spigot.config;
+
+import com.willfp.eco.core.config.JsonStaticBaseConfig;
+import com.willfp.eco.spigot.EcoSpigotPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class DataJson extends JsonStaticBaseConfig {
+    /**
+     * Init data.json.
+     *
+     * @param plugin EcoSpigotPlugin.
+     */
+    public DataJson(@NotNull final EcoSpigotPlugin plugin) {
+        super("data", plugin);
+    }
+}

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java

@@ -3,10 +3,10 @@ package com.willfp.eco.spigot.display;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketContainer;
-import com.willfp.eco.proxy.proxies.AutoCraftProxy;
-import com.willfp.eco.spigot.InternalProxyUtils;
-import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.AbstractPacketAdapter;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.proxy.proxies.AutoCraftProxy;
+import com.willfp.eco.spigot.ProxyUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -34,7 +34,7 @@ public class PacketAutoRecipe extends AbstractPacketAdapter {
         }
 
         try {
-            InternalProxyUtils.getProxy(AutoCraftProxy.class).modifyPacket(packet.getHandle());
+            ProxyUtils.getProxy(AutoCraftProxy.class).modifyPacket(packet.getHandle());
         } catch (NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
         }

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketChat.java

@@ -4,10 +4,10 @@ import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
-import com.willfp.eco.proxy.proxies.ChatComponentProxy;
-import com.willfp.eco.spigot.InternalProxyUtils;
-import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.AbstractPacketAdapter;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.proxy.proxies.ChatComponentProxy;
+import com.willfp.eco.spigot.ProxyUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -34,7 +34,7 @@ public class PacketChat extends AbstractPacketAdapter {
                 return;
             }
 
-            WrappedChatComponent newComponent = WrappedChatComponent.fromHandle(InternalProxyUtils.getProxy(ChatComponentProxy.class).modifyComponent(component.getHandle()));
+            WrappedChatComponent newComponent = WrappedChatComponent.fromHandle(ProxyUtils.getProxy(ChatComponentProxy.class).modifyComponent(component.getHandle()));
             packet.getChatComponents().write(i, newComponent);
         }
     }

eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java

@@ -1,17 +1,23 @@
 package com.willfp.eco.spigot.display;
 
 import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketContainer;
-import com.willfp.eco.proxy.proxies.VillagerTradeProxy;
+import com.comphenix.protocol.events.PacketEvent;
-import com.willfp.eco.spigot.InternalProxyUtils;
-import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.AbstractPacketAdapter;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.proxy.proxies.VillagerTradeProxy;
+import com.willfp.eco.spigot.ProxyUtils;
+import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemFlag;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class PacketOpenWindowMerchant extends AbstractPacketAdapter {
     /**
@@ -20,16 +26,32 @@ public class PacketOpenWindowMerchant extends AbstractPacketAdapter {
      * @param plugin The plugin to listen through.
      */
     public PacketOpenWindowMerchant(@NotNull final EcoPlugin plugin) {
-        super(plugin, PacketType.Play.Server.OPEN_WINDOW_MERCHANT, false);
+        super(plugin, PacketType.Play.Server.OPEN_WINDOW_MERCHANT, ListenerPriority.MONITOR, true);
     }
 
     @Override
     public void onSend(@NotNull final PacketContainer packet,
-                       @NotNull final Player player) {
+                       @NotNull final Player player,
-        List<MerchantRecipe> recipes = packet.getMerchantRecipeLists().readSafely(0);
+                       @NotNull final PacketEvent event) {
+        List<MerchantRecipe> recipes = new ArrayList<>();
 
-        recipes = recipes.stream().peek(merchantRecipe -> InternalProxyUtils.getProxy(VillagerTradeProxy.class).displayTrade(merchantRecipe)).collect(Collectors.toList());
+        if (this.getPlugin().getConfigYml().getBool("villager-display-fix")) {
-
+            for (MerchantRecipe recipe : packet.getMerchantRecipeLists().read(0)) {
-        packet.getMerchantRecipeLists().writeSafely(0, recipes);
+                ItemStack result = recipe.getResult();
+                ItemMeta meta = result.getItemMeta();
+                if (meta != null) {
+                    meta.removeItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_POTION_EFFECTS);
+                    meta.getPersistentDataContainer().remove(NamespacedKey.fromString("ecoenchants:ecoenchantlore-skip"));
+                    result.setItemMeta(meta);
+                }
+            }
+        }
+
+        for (MerchantRecipe recipe : packet.getMerchantRecipeLists().read(0)) {
+            MerchantRecipe newRecipe = ProxyUtils.getProxy(VillagerTradeProxy.class).displayTrade(recipe);
+            recipes.add(newRecipe);
+        }
+
+        packet.getMerchantRecipeLists().write(0, recipes);
     }
 }