Fixed global placeholders

# Conflicts:
#	gradle.properties

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java-library")
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("com.github.johnrengelman.shadow") version "7.1.0"
     id("maven-publish")
     id("java")
 }
@@ -12,7 +12,7 @@ dependencies {
     implementation(project(":eco-core:core-backend"))
     implementation(project(":eco-core:core-nms:v1_16_R3"))
     implementation(project(path = ":eco-core:core-nms:v1_17_R1", configuration = "reobf"))
-    implementation(project(":eco-core:core-nms:v1_18_R1"))
+    implementation(project(path = ":eco-core:core-nms:v1_18_R1", configuration = "reobf"))
 }
 
 allprojects {
@@ -35,7 +35,7 @@ allprojects {
         // NMS (for jitpack compilation)
         maven("https://repo.codemc.org/repository/nms/")
 
-        // bStats, mcMMO, BentoBox
+        // mcMMO, BentoBox
         maven("https://repo.codemc.org/repository/maven-public/")
 
         // Spigot API, Bungee API
@@ -61,6 +61,12 @@ allprojects {
 
         // IridiumSkyblock
         maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
+
+        // MythicMobs
+        maven("https://mvn.lumine.io/repository/maven-public/")
+
+        // Crunch
+        maven("https://redempt.dev")
     }
 
     dependencies {
@@ -68,7 +74,7 @@ allprojects {
 
         // Test
         testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
-        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
         
         // Adventure
         compileOnly("net.kyori:adventure-api:4.9.3")
@@ -88,12 +94,14 @@ allprojects {
         exclude(group = "org.spongepowered", module = "configurate-hocon")
         exclude(group = "com.darkblade12", module = "particleeffect")
         exclude(group = "com.github.cryptomorin", module = "XSeries")
+        exclude(group = "org.apache.commons", module = "commons-lang3")
     }
 
     tasks {
         shadowJar {
             relocate("org.bstats", "com.willfp.eco.shaded.bstats")
             relocate("net.kyori.adventure.text.minimessage", "com.willfp.eco.shaded.minimessage")
+            relocate("redempt.crunch", "com.willfp.eco.shaded.crunch")
         }
 
         compileJava {

eco-api/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     compileOnly 'org.apache.maven:maven-artifact:3.8.1'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
     compileOnly 'com.google.code.gson:gson:2.8.8'
+    compileOnly 'org.apache.commons:commons-lang3:3.0'
 }
 
 java {

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

@@ -5,10 +5,13 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Base class to hold the handler.
+ * Holds the instance of the eco handler for bridging between the frontend
+ * and backend.
  *
+ * @see Eco#getHandler()
  * @see Handler
  */
+@ApiStatus.Internal
 public final class Eco {
     /**
      * Instance of eco handler.
@@ -18,6 +21,7 @@ public final class Eco {
 
     /**
      * Set the handler.
+     *
      * @param handler The handler.
      */
     @ApiStatus.Internal
@@ -28,18 +32,18 @@ public final class Eco {
     }
 
     /**
-     * Get the instance of the eco handler.
+     * Get the instance of the eco handler; the bridge between the api frontend
+     * and the implementation backend.
      * <p>
-     * The handler is, in essence, a way to interface between the eco-api
-     * frontend module, and the eco-backend implementations.
+     * <strong>Do not use the handler in your plugins!</strong> It can and will contain
+     * breaking changes between minor versions and even patches, and you will create
+     * compatibility issues by using the handler. All parts of the handler have been abstracted
+     * into logically named API components that you can use.
      * <p>
-     * There shouldn't really be any reason to ever use the handler
-     * in your own plugins, and you are likely to break things. All parts of
-     * the handler are abstracted into logically named parts of the API.
-     * <p>
-     * In versions of eco before 6.12.0, the handler was considered part of
-     * the eco API, however it has since been moved into an internal component
-     * that shouldn't be used in your plugins.
+     * Prior to version 6.12.0, the handler was considered as an API component, but it has
+     * since been moved into an internal component, and in 6.17.0, the first breaking change
+     * was introduced to {@link com.willfp.eco.core.config.wrapper.ConfigFactory}. This means
+     * that any usages of the handler can now cause problems in your plugins.
      *
      * @return The handler.
      */

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

@@ -14,7 +14,6 @@ import com.willfp.eco.core.factory.NamespacedKeyFactory;
 import com.willfp.eco.core.factory.RunnableFactory;
 import com.willfp.eco.core.integrations.IntegrationLoader;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
-import com.willfp.eco.core.proxy.AbstractProxy;
 import com.willfp.eco.core.proxy.ProxyFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
 import com.willfp.eco.core.web.UpdateChecker;
@@ -32,6 +31,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -327,11 +327,9 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
                 DefaultArtifactVersion mostRecentVersion = new DefaultArtifactVersion(version);
                 if (!(currentVersion.compareTo(mostRecentVersion) > 0 || currentVersion.equals(mostRecentVersion))) {
                     this.outdated = true;
-                    this.getScheduler().runTimer(() -> {
-                        this.getLogger().info("&c " + this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
-                        this.getLogger().info("&cThe newest version is &f" + version);
-                        this.getLogger().info("&cDownload the new version!");
-                    }, 0, 864000);
+                    this.getLogger().warning("&c" + this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
+                    this.getLogger().warning("&cThe newest version is &f" + version);
+                    this.getLogger().warning("&cDownload the new version!");
                 }
             });
         }
@@ -636,7 +634,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @param <T>        The proxy type.
      * @return The proxy.
      */
-    public final <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxyClass) {
+    public final <T> T getProxy(@NotNull final Class<T> proxyClass) {
         Validate.notNull(proxyFactory, "Plugin does not support proxy!");
 
         return proxyFactory.getProxy(proxyClass);
@@ -655,7 +653,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     public final FileConfiguration getConfig() {
         this.getLogger().warning("Call to default config method in eco plugin!");
 
-        return this.getConfigYml().getBukkitHandle();
+        return Objects.requireNonNull(this.getConfigYml().getBukkitHandle());
     }
 
     /**

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

@@ -18,6 +18,8 @@ import com.willfp.eco.core.proxy.ProxyFactory;
 import com.willfp.eco.core.requirement.RequirementFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -230,5 +232,15 @@ public interface Handler {
      *
      * @return The handler.
      */
+    @NotNull
     PlayerProfileHandler getPlayerProfileHandler();
+
+    /**
+     * Create dummy entity - never spawned, exists purely in code.
+     *
+     * @param location The location.
+     * @return The entity.
+     */
+    @NotNull
+    Entity createDummyEntity(@NotNull Location location);
 }

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

@@ -4,6 +4,13 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * Quick DI class to manage passing eco plugins.
+ * <p>
+ * Basically just a quick bit of laziness if you can't be bothered to add a private field
+ * and a protected getter, don't use this in kotlin as you can just specify
+ * {@code
+ * private val plugin: EcoPlugin
+ * }
+ * in the constructor.
  *
  * @param <T> The eco plugin type.
  */

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

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

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

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

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

@@ -10,9 +10,13 @@ import java.util.List;
  * A command handler handles the actual code for a command.
  * <p>
  * The replacement for {@link org.bukkit.command.CommandExecutor#onCommand(CommandSender, Command, String, String[])}
+ *
  * @see CommandBase
+ * @deprecated Handlers have been deprecated. This legacy system will eventually be removed,
+ * update to use the new system: {@link CommandBase#onExecute(CommandSender, List)}.
  */
 @FunctionalInterface
+@Deprecated(since = "6.17.0")
 public interface CommandHandler {
     /**
      * The code to be called on execution.

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

@@ -10,9 +10,13 @@ import java.util.List;
  * A Tab Complete handler handles the actual tab-completion code.
  * <p>
  * The replacement for {@link org.bukkit.command.TabCompleter#onTabComplete(CommandSender, Command, String, String[])}
+ *
  * @see CommandBase
+ * @deprecated Handlers have been deprecated. This legacy system will eventually be removed,
+ * update to use the new system: {@link CommandBase#tabComplete(CommandSender, List)}
  */
 @FunctionalInterface
+@Deprecated(since = "6.17.0")
 public interface TabCompleteHandler {
     /**
      * Handle Tab Completion.

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

@@ -9,6 +9,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,6 +24,7 @@ import java.util.stream.Collectors;
  * in order to execute the command-specific code. It's essentially an internal
  * layer, hence why it's a package-private class.
  */
+@SuppressWarnings({"DeprecatedIsStillUsed"})
 abstract class HandledCommand extends PluginDependent<EcoPlugin> implements CommandBase {
     /**
      * The name of the command.
@@ -46,14 +48,16 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
     /**
      * The actual code to be executed in the command.
      */
-    private CommandHandler handler = (sender, args) -> {
-        // Do nothing by default
-    };
+    @Deprecated
+    @Nullable
+    private CommandHandler handler = null;
 
     /**
      * The tab completion code to be executed in the command.
      */
-    private TabCompleteHandler tabCompleter = (sender, args) -> new ArrayList<>();
+    @Deprecated
+    @Nullable
+    private TabCompleteHandler tabCompleter = null;
 
     /**
      * All subcommands for the command.
@@ -120,7 +124,11 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
             }
         }
 
+        if (this.getHandler() != null) {
             this.getHandler().onExecute(sender, Arrays.asList(args));
+        } else {
+            this.onExecute(sender, Arrays.asList(args));
+        }
     }
 
     /**
@@ -167,7 +175,11 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
             }
         }
 
+        if (this.getTabCompleter() != null) {
             return this.getTabCompleter().tabComplete(sender, Arrays.asList(args));
+        } else {
+            return this.tabComplete(sender, Arrays.asList(args));
+        }
     }
 
     /**
@@ -221,24 +233,6 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
         return this.playersOnly;
     }
 
-    /**
-     * Get the actual code to be executed in the command.
-     *
-     * @return The code.
-     */
-    public CommandHandler getHandler() {
-        return this.handler;
-    }
-
-    /**
-     * Get the tab completion code to be executed in the command.
-     *
-     * @return The code.
-     */
-    public TabCompleteHandler getTabCompleter() {
-        return this.tabCompleter;
-    }
-
     /**
      * Get the subcommands of the command.
      *
@@ -248,21 +242,27 @@ abstract class HandledCommand extends PluginDependent<EcoPlugin> implements Comm
         return this.subcommands;
     }
 
-    /**
-     * Set the command handler.
-     *
-     * @param handler The handler.
-     */
-    public void setHandler(@NotNull final CommandHandler handler) {
+    @Deprecated
+    @Override
+    public @Nullable CommandHandler getHandler() {
+        return this.handler;
+    }
+
+    @Deprecated
+    @Override
+    public @Nullable TabCompleteHandler getTabCompleter() {
+        return this.tabCompleter;
+    }
+
+    @Deprecated
+    @Override
+    public void setHandler(@Nullable final CommandHandler handler) {
         this.handler = handler;
     }
 
-    /**
-     * Set the tab completer.
-     *
-     * @param tabCompleter The tab completer.
-     */
-    public void setTabCompleter(@NotNull final TabCompleteHandler tabCompleter) {
+    @Deprecated
+    @Override
+    public void setTabCompleter(@Nullable final TabCompleteHandler tabCompleter) {
         this.tabCompleter = tabCompleter;
     }
 }

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

@@ -12,7 +12,9 @@ import org.jetbrains.annotations.Nullable;
 import java.util.List;
 
 /**
- * PluginCommands are the class to be used instead of CommandExecutor.
+ * PluginCommands are the class to be used instead of CommandExecutor,
+ * they function as the base command, e.g. {@code /ecoenchants} would be a base command, with each
+ * subsequent argument functioning as subcommands.
  * <p>
  * The command will not be registered until register() is called.
  * <p>

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

@@ -0,0 +1,35 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.PluginLike;
+import com.willfp.eco.core.config.wrapper.LoadableConfigWrapper;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml).
+ * <p>
+ * Automatically updates.
+ */
+public abstract class BaseConfig extends LoadableConfigWrapper {
+    /**
+     * Create new Base Config.
+     *
+     * @param plugin       The plugin or extension.
+     * @param configName   The config name (excluding extension).
+     * @param removeUnused If unused sections should be removed.
+     * @param type         The config type.
+     */
+    protected BaseConfig(@NotNull final String configName,
+                         @NotNull final PluginLike plugin,
+                         final boolean removeUnused,
+                         @NotNull final ConfigType type) {
+        super(Eco.getHandler().getConfigFactory().createUpdatableConfig(
+                configName,
+                plugin,
+                "",
+                plugin.getClass(),
+                removeUnused,
+                type
+        ));
+    }
+}

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

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

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

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

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

@@ -0,0 +1,32 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.PluginLike;
+import com.willfp.eco.core.config.wrapper.LoadableConfigWrapper;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Non-updatable yaml config that exists within a plugin jar.
+ */
+public abstract class StaticBaseConfig extends LoadableConfigWrapper {
+    /**
+     * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml).
+     * <p>
+     * Does not automatically update.
+     *
+     * @param configName The name of the config
+     * @param plugin     The plugin.
+     * @param type       The config type.
+     */
+    protected StaticBaseConfig(@NotNull final String configName,
+                               @NotNull final PluginLike plugin,
+                               @NotNull final ConfigType type) {
+        super(Eco.getHandler().getConfigFactory().createLoadableConfig(
+                configName,
+                plugin,
+                "",
+                plugin.getClass(),
+                type
+        ));
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.willfp.eco.core.config;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.config.interfaces.Config;
+import com.willfp.eco.core.config.wrapper.ConfigWrapper;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+/**
+ * Config that exists purely in the code, not linked to any file.
+ * <p>
+ * Use for inline configs to move data around or to add subsections to other configs.
+ */
+public class TransientConfig extends ConfigWrapper<Config> {
+    /**
+     * @param config The YamlConfiguration handle.
+     */
+    public TransientConfig(@NotNull final YamlConfiguration config) {
+        super(Eco.getHandler().getConfigFactory().createConfig(config));
+    }
+
+    /**
+     * Create a new empty transient config.
+     *
+     * @param values The values.
+     */
+    public TransientConfig(@NotNull final Map<String, Object> values) {
+        super(Eco.getHandler().getConfigFactory().createConfig(values));
+    }
+
+    /**
+     * Create a new empty transient config.
+     */
+    public TransientConfig() {
+        super(Eco.getHandler().getConfigFactory().createConfig("", ConfigType.YAML));
+    }
+
+    /**
+     * @param contents The contents of the config.
+     * @param type     The config type.
+     */
+    public TransientConfig(@NotNull final String contents,
+                           @NotNull final ConfigType type) {
+        super(Eco.getHandler().getConfigFactory().createConfig(contents, type));
+    }
+}

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

@@ -1,20 +1,21 @@
 package com.willfp.eco.core.config.base;
 
 import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.yaml.YamlBaseConfig;
+import com.willfp.eco.core.config.BaseConfig;
+import com.willfp.eco.core.config.ConfigType;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Default plugin config.yml.
  */
-public class ConfigYml extends YamlBaseConfig {
+public class ConfigYml extends BaseConfig {
     /**
      * Config.yml.
      *
      * @param plugin The plugin.
      */
     public ConfigYml(@NotNull final EcoPlugin plugin) {
-        super("config", true, plugin);
+        super("config", plugin, true, ConfigType.YAML);
     }
 
     /**
@@ -25,7 +26,7 @@ public class ConfigYml extends YamlBaseConfig {
      */
     public ConfigYml(@NotNull final EcoPlugin plugin,
                      final boolean removeUnused) {
-        super("config", removeUnused, plugin);
+        super("config", plugin, removeUnused, ConfigType.YAML);
     }
 
     /**
@@ -36,7 +37,7 @@ public class ConfigYml extends YamlBaseConfig {
      */
     public ConfigYml(@NotNull final EcoPlugin plugin,
                      @NotNull final String name) {
-        super(name, true, plugin);
+        super(name, plugin, true, ConfigType.YAML);
     }
 
     /**
@@ -49,7 +50,6 @@ public class ConfigYml extends YamlBaseConfig {
     public ConfigYml(@NotNull final EcoPlugin plugin,
                      @NotNull final String name,
                      final boolean removeUnused) {
-        super(name, removeUnused, plugin);
+        super(name, plugin, removeUnused, ConfigType.YAML);
     }
-
 }

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

@@ -1,21 +1,22 @@
 package com.willfp.eco.core.config.base;
 
 import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.yaml.YamlBaseConfig;
+import com.willfp.eco.core.config.BaseConfig;
+import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Default plugin lang.yml.
  */
-public class LangYml extends YamlBaseConfig {
+public class LangYml extends BaseConfig {
     /**
      * Lang.yml.
      *
      * @param plugin The plugin.
      */
     public LangYml(@NotNull final EcoPlugin plugin) {
-        super("lang", false, plugin);
+        super("lang", plugin, false, ConfigType.YAML);
     }
 
     /**

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

@@ -1,13 +1,19 @@
 package com.willfp.eco.core.config.interfaces;
 
+import com.willfp.eco.core.config.ConfigType;
+import com.willfp.eco.core.config.TransientConfig;
+import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.StringUtils;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
- * All canfigs implement this interface.
+ * All configs implement this interface.
  * <p>
  * Contains all methods that must exist in yaml and json configurations.
  */
@@ -66,10 +72,12 @@ public interface Config extends Cloneable {
      * Get subsection from config.
      *
      * @param path The key to check.
-     * @return The subsection. Throws NPE if not found.
+     * @return The subsection. Returns an empty section if not found.
      */
     @NotNull
-    Config getSubsection(@NotNull String path);
+    default Config getSubsection(@NotNull String path) {
+        return Objects.requireNonNullElse(getSubsectionOrNull(path), new TransientConfig());
+    }
 
     /**
      * Get subsection from config.
@@ -86,7 +94,44 @@ public interface Config extends Cloneable {
      * @param path The key to fetch the value from.
      * @return The found value, or 0 if not found.
      */
-    int getInt(@NotNull String path);
+    default int getInt(@NotNull String path) {
+        return Objects.requireNonNullElse(getIntOrNull(path), 0);
+    }
+
+    /**
+     * Get an integer from config with a specified default (not found) value.
+     *
+     * @param path The key to fetch the value from.
+     * @param def  The value to default to if not found.
+     * @return The found value, or the default.
+     */
+    default int getInt(@NotNull String path,
+                       int def) {
+        return Objects.requireNonNullElse(getIntOrNull(path), def);
+    }
+
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path The key to fetch the value from.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default int getIntFromExpression(@NotNull String path) {
+        return getIntFromExpression(path, null);
+    }
+
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path   The key to fetch the value from.
+     * @param player The player to evaluate placeholders with respect to.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default int getIntFromExpression(@NotNull String path,
+                                     @Nullable Player player) {
+        return Double.valueOf(getDoubleFromExpression(path, player)).intValue();
+    }
+
 
     /**
      * Get an integer from config.
@@ -97,16 +142,6 @@ public interface Config extends Cloneable {
     @Nullable
     Integer getIntOrNull(@NotNull String path);
 
-    /**
-     * Get an integer from config with a specified default (not found) value.
-     *
-     * @param path The key to fetch the value from.
-     * @param def  The value to default to if not found.
-     * @return The found value, or the default.
-     */
-    int getInt(@NotNull String path,
-               int def);
-
     /**
      * Get a list of integers from config.
      *
@@ -114,7 +149,9 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<Integer> getInts(@NotNull String path);
+    default List<Integer> getInts(@NotNull String path) {
+        return Objects.requireNonNullElse(getIntsOrNull(path), new ArrayList<>());
+    }
 
     /**
      * Get a list of integers from config.
@@ -131,7 +168,9 @@ public interface Config extends Cloneable {
      * @param path The key to fetch the value from.
      * @return The found value, or false if not found.
      */
-    boolean getBool(@NotNull String path);
+    default boolean getBool(@NotNull String path) {
+        return Objects.requireNonNullElse(getBoolOrNull(path), false);
+    }
 
     /**
      * Get a boolean from config.
@@ -149,7 +188,9 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<Boolean> getBools(@NotNull String path);
+    default List<Boolean> getBools(@NotNull String path) {
+        return Objects.requireNonNullElse(getBoolsOrNull(path), new ArrayList<>());
+    }
 
     /**
      * Get a list of booleans from config.
@@ -168,7 +209,7 @@ public interface Config extends Cloneable {
      */
     @NotNull
     default String getFormattedString(@NotNull String path) {
-        return getString(path, true);
+        return getString(path, true, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
     /**
@@ -187,25 +228,25 @@ public interface Config extends Cloneable {
     /**
      * Get a string from config.
      * <p>
-     * Formatted by default.
+     * Not formatted.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or an empty string if not found.
      */
     @NotNull
     default String getString(@NotNull String path) {
-        return getString(path, true);
+        return getString(path, false);
     }
 
     /**
      * Get a string from config.
-     * <p>
-     * This will be deprecated when {@link Config#getString(String)} no longer formats by default.
      *
      * @param path   The key to fetch the value from.
      * @param format If the string should be formatted.
      * @return The found value, or an empty string if not found.
+     * @deprecated Since 6.18.0, {@link Config#getString(String)} is not formatted by default.
      */
+    @Deprecated(since = "6.18.0")
     default String getString(@NotNull String path,
                              boolean format) {
         return this.getString(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
@@ -235,9 +276,11 @@ public interface Config extends Cloneable {
      * @return The found value, or an empty string if not found.
      */
     @NotNull
-    String getString(@NotNull String path,
+    default String getString(@NotNull String path,
                              boolean format,
-                     @NotNull StringUtils.FormatOption option);
+                             @NotNull StringUtils.FormatOption option) {
+        return Objects.requireNonNullElse(getStringOrNull(path, format, option), "");
+    }
 
     /**
      * Get a formatted string from config.
@@ -247,7 +290,7 @@ public interface Config extends Cloneable {
      */
     @Nullable
     default String getFormattedStringOrNull(@NotNull String path) {
-        return getStringOrNull(path, true);
+        return getStringOrNull(path, true, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
     /**
@@ -273,19 +316,19 @@ public interface Config extends Cloneable {
      */
     @Nullable
     default String getStringOrNull(@NotNull String path) {
-        return getStringOrNull(path, true);
+        return getStringOrNull(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
     /**
      * Get a string from config.
-     * <p>
-     * This will be deprecated when {@link Config#getStringOrNull(String)} no longer formats by default.
      *
      * @param path   The key to fetch the value from.
      * @param format If the string should be formatted.
      * @return The found value, or null if not found.
+     * @deprecated Since 6.18.0, {@link Config#getString(String)} is not formatted by default.
      */
     @Nullable
+    @Deprecated(since = "6.18.0")
     default String getStringOrNull(@NotNull String path,
                                    boolean format) {
         return this.getStringOrNull(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
@@ -350,28 +393,26 @@ public interface Config extends Cloneable {
     /**
      * Get a list of strings from config.
      * <p>
-     * Formatted by default.
-     * <p>
-     * This will be changed in newer versions to <b>not</b> format by default.
+     * Not formatted.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
     default List<String> getStrings(@NotNull String path) {
-        return getStrings(path, true);
+        return getStrings(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
     /**
      * Get a list of strings from config.
-     * <p>
-     * This will be deprecated when {@link Config#getStrings(String)} no longer formats by default.
      *
      * @param path   The key to fetch the value from.
      * @param format If the strings should be formatted.
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
+     * @deprecated Since 6.18.0, {@link Config#getString(String)} is not formatted by default.
      */
     @NotNull
+    @Deprecated(since = "6.18.0")
     default List<String> getStrings(@NotNull String path,
                                     boolean format) {
         return this.getStrings(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
@@ -389,7 +430,7 @@ public interface Config extends Cloneable {
     @Deprecated
     default List<String> getStrings(@NotNull String path,
                                     @NotNull StringUtils.FormatOption option) {
-        return getStrings(path, true, option);
+        return getStrings(path, false, option);
     }
 
     /**
@@ -401,14 +442,16 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<String> getStrings(@NotNull String path,
+    default List<String> getStrings(@NotNull String path,
                                     boolean format,
-                            @NotNull StringUtils.FormatOption option);
+                                    @NotNull StringUtils.FormatOption option) {
+        return Objects.requireNonNullElse(getStringsOrNull(path, format, option), new ArrayList<>());
+    }
 
     /**
      * Get a list of strings from config.
      * <p>
-     * Formatted by default.
+     * Formatted.
      *
      * @param path The key to fetch the value from.
      * @return The found value, or null if not found.
@@ -421,7 +464,7 @@ public interface Config extends Cloneable {
     /**
      * Get a list of strings from config.
      * <p>
-     * Formatted by default.
+     * Formatted.
      *
      * @param path   The key to fetch the value from.
      * @param option The format option.
@@ -436,7 +479,7 @@ public interface Config extends Cloneable {
     /**
      * Get a list of strings from config.
      * <p>
-     * Formatted by default.
+     * Not formatted.
      * <p>
      * This will be changed in newer versions to <b>not</b> format by default.
      *
@@ -445,7 +488,7 @@ public interface Config extends Cloneable {
      */
     @Nullable
     default List<String> getStringsOrNull(@NotNull String path) {
-        return getStringsOrNull(path, true);
+        return getStringsOrNull(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
     /**
@@ -454,8 +497,10 @@ public interface Config extends Cloneable {
      * @param path   The key to fetch the value from.
      * @param format If the strings should be formatted.
      * @return The found value, or null if not found.
+     * @deprecated Since 6.18.0, {@link Config#getString(String)} is not formatted by default.
      */
     @Nullable
+    @Deprecated(since = "6.18.0")
     default List<String> getStringsOrNull(@NotNull String path,
                                           boolean format) {
         return getStringsOrNull(path, format, StringUtils.FormatOption.WITH_PLACEHOLDERS);
@@ -473,7 +518,7 @@ public interface Config extends Cloneable {
     @Deprecated
     default List<String> getStringsOrNull(@NotNull String path,
                                           @NotNull StringUtils.FormatOption option) {
-        return getStringsOrNull(path, true, option);
+        return getStringsOrNull(path, false, option);
     }
 
     /**
@@ -495,7 +540,31 @@ public interface Config extends Cloneable {
      * @param path The key to fetch the value from.
      * @return The found value, or 0 if not found.
      */
-    double getDouble(@NotNull String path);
+    default double getDouble(@NotNull String path) {
+        return Objects.requireNonNullElse(getDoubleOrNull(path), 0.0);
+    }
+
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path The key to fetch the value from.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default double getDoubleFromExpression(@NotNull String path) {
+        return getDoubleFromExpression(path, null);
+    }
+
+    /**
+     * Get a decimal value via a mathematical expression.
+     *
+     * @param path   The key to fetch the value from.
+     * @param player The player to evaluate placeholders with respect to.
+     * @return The computed value, or 0 if not found or invalid.
+     */
+    default double getDoubleFromExpression(@NotNull String path,
+                                           @Nullable Player player) {
+        return NumberUtils.evaluateExpression(this.getString(path), player);
+    }
 
     /**
      * Get a decimal from config.
@@ -513,7 +582,9 @@ public interface Config extends Cloneable {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<Double> getDoubles(@NotNull String path);
+    default List<Double> getDoubles(@NotNull String path) {
+        return Objects.requireNonNullElse(getDoublesOrNull(path), new ArrayList<>());
+    }
 
     /**
      * Get a list of decimals from config.
@@ -524,6 +595,34 @@ public interface Config extends Cloneable {
     @Nullable
     List<Double> getDoublesOrNull(@NotNull String path);
 
+    /**
+     * Get a list of subsections from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
+     */
+    @NotNull
+    default List<? extends Config> getSubsections(@NotNull String path) {
+        return Objects.requireNonNullElse(getSubsectionsOrNull(path), new ArrayList<>());
+    }
+
+    /**
+     * Get a list of subsections from config.
+     *
+     * @param path The key to fetch the value from.
+     * @return The found value, or null if not found.
+     */
+    @Nullable
+    List<? extends Config> getSubsectionsOrNull(@NotNull String path);
+
+    /**
+     * Get config type.
+     *
+     * @return The type.
+     */
+    @NotNull
+    ConfigType getType();
+
     /**
      * Clone the config.
      *

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

@@ -3,13 +3,19 @@ package com.willfp.eco.core.config.interfaces;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
- * JSON configs have extra methods compared to yaml configs.
- * <p>
- * If you need to use them, then use JSONConfig instead.
+ * JSON config.
+ *
+ * @deprecated JSON and yml have full parity, use configs without a prefix instead,
+ * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
+ * These configs will be removed eventually.
  */
+@Deprecated(since = "6.17.0")
+@SuppressWarnings("DeprecatedIsStillUsed")
 public interface JSONConfig extends Config {
     /**
      * Get a list of subsections from config.
@@ -18,7 +24,9 @@ public interface JSONConfig extends Config {
      * @return The found value, or a blank {@link java.util.ArrayList} if not found.
      */
     @NotNull
-    List<JSONConfig> getSubsections(@NotNull String path);
+    default List<JSONConfig> getSubsections(@NotNull String path) {
+        return Objects.requireNonNullElse(getSubsectionsOrNull(path), new ArrayList<>());
+    }
 
     /**
      * Get a list of subsections from config.

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

@@ -1,12 +1,16 @@
 package com.willfp.eco.core.config.interfaces;
 
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
 import java.io.IOException;
 
 /**
  * Interface for configs that physically exist as files in plugins.
  */
-public interface LoadableConfig {
+public interface LoadableConfig extends Config {
     /**
      * Create the file.
      */
@@ -39,4 +43,18 @@ public interface LoadableConfig {
      * @return The name.
      */
     String getName();
+
+    /**
+     * Get bukkit {@link YamlConfiguration}.
+     * <p>
+     * This method is not recommended unless absolutely required as it
+     * only returns true if the type of config is {@link com.willfp.eco.core.config.ConfigType#YAML},
+     * and if the handle is an {@link YamlConfiguration} specifically. This depends on the internals
+     * and the implementation, and so may cause problems - it exists mostly for parity with
+     * {@link JavaPlugin#getConfig()}.
+     *
+     * @return The config, or null if config is not yaml-based.
+     */
+    @Nullable
+    YamlConfiguration getBukkitHandle();
 }

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

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

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

@@ -3,6 +3,8 @@ package com.willfp.eco.core.config.json;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.PluginLike;
+import com.willfp.eco.core.config.ConfigType;
+import com.willfp.eco.core.config.interfaces.JSONConfig;
 import com.willfp.eco.core.config.json.wrapper.LoadableJSONConfigWrapper;
 import org.jetbrains.annotations.NotNull;
 
@@ -10,7 +12,12 @@ import org.jetbrains.annotations.NotNull;
  * Config implementation for configs present in the plugin's base directory (eg config.json).
  * <p>
  * Automatically updates.
+ *
+ * @deprecated JSON and yml have full parity, use configs without a prefix instead,
+ * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
+ * These configs will be removed eventually.
  */
+@Deprecated(since = "6.17.0")
 public abstract class JSONBaseConfig extends LoadableJSONConfigWrapper {
     /**
      * @param configName      The name of the config
@@ -23,12 +30,15 @@ public abstract class JSONBaseConfig extends LoadableJSONConfigWrapper {
                              @NotNull final PluginLike plugin,
                              @NotNull final String... updateBlacklist) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableJSONConfig(
+                (JSONConfig)
+                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
                                 configName,
                                 plugin,
                                 "",
                                 plugin.getClass(),
-                        removeUnused, updateBlacklist
+                                removeUnused,
+                                ConfigType.JSON,
+                                updateBlacklist
                         )
         );
     }
@@ -42,12 +52,14 @@ public abstract class JSONBaseConfig extends LoadableJSONConfigWrapper {
                              final boolean removeUnused,
                              @NotNull final PluginLike plugin) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableJSONConfig(
+                (JSONConfig)
+                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
                                 configName,
                                 plugin,
                                 "",
                                 plugin.getClass(),
-                        removeUnused
+                                removeUnused,
+                                ConfigType.JSON
                         )
         );
     }

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

@@ -3,6 +3,8 @@ package com.willfp.eco.core.config.json;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.PluginLike;
+import com.willfp.eco.core.config.ConfigType;
+import com.willfp.eco.core.config.interfaces.JSONConfig;
 import com.willfp.eco.core.config.json.wrapper.LoadableJSONConfigWrapper;
 import org.jetbrains.annotations.NotNull;
 
@@ -14,7 +16,12 @@ import org.jetbrains.annotations.NotNull;
  * </ul>
  * <p>
  * Automatically updates.
+ *
+ * @deprecated JSON and yml have full parity, use configs without a prefix instead,
+ * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
+ * These configs will be removed eventually.
  */
+@Deprecated(since = "6.17.0")
 public abstract class JSONExtendableConfig extends LoadableJSONConfigWrapper {
     /**
      * @param configName       The name of the config
@@ -31,16 +38,19 @@ public abstract class JSONExtendableConfig extends LoadableJSONConfigWrapper {
                                    @NotNull final String subDirectoryPath,
                                    @NotNull final String... updateBlacklist) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableJSONConfig(
+                (JSONConfig)
+                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
                                 configName,
                                 plugin,
                                 subDirectoryPath,
                                 source,
                                 removeUnused,
+                                ConfigType.JSON,
                                 updateBlacklist
                         )
         );
     }
+
     /**
      * @param configName       The name of the config
      * @param removeUnused     Whether keys not present in the default config should be removed on update.

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

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

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

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

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

@@ -9,7 +9,12 @@ import java.util.List;
 
 /**
  * Wrapper to handle the backend JSON config implementations.
+ *
+ * @deprecated JSON and yml have full parity, use configs without a prefix instead,
+ * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
+ * These configs will be removed eventually.
  */
+@Deprecated(since = "6.17.0")
 public abstract class JSONConfigWrapper extends ConfigWrapper<JSONConfig> implements JSONConfig {
     /**
      * Create a config wrapper.

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

@@ -3,14 +3,21 @@ package com.willfp.eco.core.config.json.wrapper;
 import com.willfp.eco.core.config.interfaces.JSONConfig;
 import com.willfp.eco.core.config.interfaces.LoadableConfig;
 import org.apache.commons.lang.Validate;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.IOException;
 
 /**
  * Wrapper to handle the backend loadable JSON config implementations.
+ *
+ * @deprecated JSON and yml have full parity, use configs without a prefix instead,
+ * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
+ * These configs will be removed eventually.
  */
+@Deprecated(since = "6.17.0")
 public abstract class LoadableJSONConfigWrapper extends JSONConfigWrapper implements LoadableConfig {
     /**
      * Create a config wrapper.
@@ -48,4 +55,9 @@ public abstract class LoadableJSONConfigWrapper extends JSONConfigWrapper implem
     public String getName() {
         return ((LoadableConfig) this.getHandle()).getName();
     }
+
+    @Override
+    public @Nullable YamlConfiguration getBukkitHandle() {
+        return null;
+    }
 }

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

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

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

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

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.config.wrapper;
 
+import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.interfaces.Config;
 import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -15,6 +16,7 @@ import java.util.List;
  *
  * @param <T> The type of the handle.
  */
+@SuppressWarnings("MethodDoesntCallSuperMethod")
 public abstract class ConfigWrapper<T extends Config> implements Config {
     /**
      * Configs from eco have an internal implementation,
@@ -68,70 +70,31 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         handle.set(path, object);
     }
 
-    @Override
-    public @NotNull Config getSubsection(@NotNull final String path) {
-        return handle.getSubsection(path);
-    }
-
     @Override
     public @Nullable Config getSubsectionOrNull(@NotNull final String path) {
         return handle.getSubsectionOrNull(path);
     }
 
-    @Override
-    public int getInt(@NotNull final String path) {
-        return handle.getInt(path);
-    }
-
     @Override
     public @Nullable Integer getIntOrNull(@NotNull final String path) {
         return handle.getIntOrNull(path);
     }
 
-    @Override
-    public int getInt(@NotNull final String path,
-                      final int def) {
-        return handle.getInt(path, def);
-    }
-
-    @Override
-    public @NotNull List<Integer> getInts(@NotNull final String path) {
-        return handle.getInts(path);
-    }
-
     @Override
     public @Nullable List<Integer> getIntsOrNull(@NotNull final String path) {
         return handle.getIntsOrNull(path);
     }
 
-    @Override
-    public boolean getBool(@NotNull final String path) {
-        return handle.getBool(path);
-    }
-
     @Override
     public @Nullable Boolean getBoolOrNull(@NotNull final String path) {
         return handle.getBoolOrNull(path);
     }
 
-    @Override
-    public @NotNull List<Boolean> getBools(@NotNull final String path) {
-        return handle.getBools(path);
-    }
-
     @Override
     public @Nullable List<Boolean> getBoolsOrNull(@NotNull final String path) {
         return handle.getBoolsOrNull(path);
     }
 
-
-    @Override
-    public @NotNull String getString(@NotNull final String path,
-                                     final boolean format,
-                                     @NotNull final StringUtils.FormatOption option) {
-        return handle.getString(path, format, option);
-    }
-
     @Override
     public @Nullable String getStringOrNull(@NotNull final String path,
                                             final boolean format,
@@ -139,13 +102,6 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getStringOrNull(path, format, option);
     }
 
-    @Override
-    public @NotNull List<String> getStrings(@NotNull final String path,
-                                            final boolean format,
-                                            @NotNull final StringUtils.FormatOption option) {
-        return handle.getStrings(path, format, option);
-    }
-
     @Override
     public @Nullable List<String> getStringsOrNull(@NotNull final String path,
                                                    final boolean format,
@@ -153,31 +109,31 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getStringsOrNull(path, format, option);
     }
 
-    @Override
-    public double getDouble(@NotNull final String path) {
-        return handle.getDouble(path);
-    }
-
     @Override
     public @Nullable Double getDoubleOrNull(@NotNull final String path) {
         return handle.getDoubleOrNull(path);
     }
 
-    @Override
-    public @NotNull List<Double> getDoubles(@NotNull final String path) {
-        return handle.getDoubles(path);
-    }
-
     @Override
     public @Nullable List<Double> getDoublesOrNull(@NotNull final String path) {
         return handle.getDoublesOrNull(path);
     }
 
+    @Override
+    public @Nullable List<? extends Config> getSubsectionsOrNull(@NotNull final String path) {
+        return handle.getSubsectionsOrNull(path);
+    }
+
     @Override
     public Config clone() {
         return handle.clone();
     }
 
+    @Override
+    public @NotNull ConfigType getType() {
+        return handle.getType();
+    }
+
     /**
      * Get the handle.
      *

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

@@ -0,0 +1,53 @@
+package com.willfp.eco.core.config.wrapper;
+
+import com.willfp.eco.core.config.interfaces.LoadableConfig;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Wrapper to handle the backend loadable yaml config implementations.
+ */
+public abstract class LoadableConfigWrapper extends ConfigWrapper<LoadableConfig> implements LoadableConfig {
+    /**
+     * Create a config wrapper.
+     *
+     * @param handle The handle.
+     */
+    protected LoadableConfigWrapper(@NotNull final LoadableConfig handle) {
+        super(handle);
+    }
+
+    @Override
+    public void createFile() {
+        this.getHandle().createFile();
+    }
+
+    @Override
+    public String getResourcePath() {
+        return this.getHandle().getResourcePath();
+    }
+
+    @Override
+    public void save() throws IOException {
+        this.getHandle().save();
+    }
+
+    @Override
+    public File getConfigFile() {
+        return this.getHandle().getConfigFile();
+    }
+
+    @Override
+    public String getName() {
+        return this.getHandle().getName();
+    }
+
+    @Override
+    public @Nullable YamlConfiguration getBukkitHandle() {
+        return this.getHandle().getBukkitHandle();
+    }
+}

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

@@ -3,6 +3,7 @@ package com.willfp.eco.core.config.yaml;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.PluginLike;
+import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper;
 import org.jetbrains.annotations.NotNull;
 
@@ -10,7 +11,12 @@ import org.jetbrains.annotations.NotNull;
  * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml).
  * <p>
  * Automatically updates.
+ *
+ * @deprecated JSON and yml have full parity, use configs without a prefix instead,
+ * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
+ * These configs will be removed eventually.
  */
+@Deprecated(since = "6.17.0")
 public abstract class YamlBaseConfig extends LoadableYamlConfigWrapper {
     /**
      * @param configName      The name of the config
@@ -23,12 +29,14 @@ public abstract class YamlBaseConfig extends LoadableYamlConfigWrapper {
                              @NotNull final PluginLike plugin,
                              @NotNull final String... updateBlacklist) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableYamlConfig(
+                Eco.getHandler().getConfigFactory().createUpdatableConfig(
                         configName,
                         plugin,
                         "",
                         plugin.getClass(),
-                        removeUnused, updateBlacklist
+                        removeUnused,
+                        ConfigType.YAML,
+                        updateBlacklist
                 )
         );
     }
@@ -42,12 +50,13 @@ public abstract class YamlBaseConfig extends LoadableYamlConfigWrapper {
                              final boolean removeUnused,
                              @NotNull final PluginLike plugin) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableYamlConfig(
+                Eco.getHandler().getConfigFactory().createUpdatableConfig(
                         configName,
                         plugin,
                         "",
                         plugin.getClass(),
-                        removeUnused
+                        removeUnused,
+                        ConfigType.YAML
                 )
         );
     }

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

@@ -3,6 +3,7 @@ package com.willfp.eco.core.config.yaml;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.PluginLike;
+import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.yaml.wrapper.LoadableYamlConfigWrapper;
 import org.jetbrains.annotations.NotNull;
 
@@ -14,7 +15,12 @@ import org.jetbrains.annotations.NotNull;
  * </ul>
  * <p>
  * Automatically updates.
+ *
+ * @deprecated JSON and yml have full parity, use configs without a prefix instead,
+ * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
+ * These configs will be removed eventually.
  */
+@Deprecated(since = "6.17.0")
 public abstract class YamlExtendableConfig extends LoadableYamlConfigWrapper {
     /**
      * @param configName       The name of the config
@@ -31,16 +37,18 @@ public abstract class YamlExtendableConfig extends LoadableYamlConfigWrapper {
                                    @NotNull final String subDirectoryPath,
                                    @NotNull final String... updateBlacklist) {
         super(
-                Eco.getHandler().getConfigFactory().createUpdatableYamlConfig(
+                Eco.getHandler().getConfigFactory().createUpdatableConfig(
                         configName,
                         plugin,
                         subDirectoryPath,
                         source,
                         removeUnused,
+                        ConfigType.YAML,
                         updateBlacklist
                 )
         );
     }
+
     /**
      * @param configName       The name of the config
      * @param removeUnused     Whether keys not present in the default config should be removed on update.

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

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

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

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

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

@@ -3,14 +3,21 @@ package com.willfp.eco.core.config.yaml.wrapper;
 import com.willfp.eco.core.config.interfaces.Config;
 import com.willfp.eco.core.config.interfaces.LoadableConfig;
 import org.apache.commons.lang.Validate;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.IOException;
 
 /**
  * Wrapper to handle the backend loadable yaml config implementations.
+ *
+ * @deprecated JSON and yml have full parity, use configs without a prefix instead,
+ * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
+ * These configs will be removed eventually.
  */
+@Deprecated(since = "6.17.0")
 public abstract class LoadableYamlConfigWrapper extends YamlConfigWrapper implements LoadableConfig {
     /**
      * Create a config wrapper.
@@ -48,4 +55,9 @@ public abstract class LoadableYamlConfigWrapper extends YamlConfigWrapper implem
     public String getName() {
         return ((LoadableConfig) this.getHandle()).getName();
     }
+
+    @Override
+    public @Nullable YamlConfiguration getBukkitHandle() {
+        return ((LoadableConfig) this.getHandle()).getBukkitHandle();
+    }
 }

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

@@ -8,7 +8,12 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * Wrapper to handle the backend yaml config implementations.
+ *
+ * @deprecated JSON and yml have full parity, use configs without a prefix instead,
+ * eg {@link com.willfp.eco.core.config.TransientConfig}, {@link com.willfp.eco.core.config.BaseConfig}.
+ * These configs will be removed eventually.
  */
+@Deprecated(since = "6.17.0")
 public abstract class YamlConfigWrapper extends ConfigWrapper<Config> implements WrappedYamlConfiguration {
     /**
      * Create a config wrapper.

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

@@ -53,15 +53,6 @@ public class PersistentDataKey<T> {
                 + '}';
     }
 
-    /**
-     * Get all persistent data keys.
-     *
-     * @return The keys.
-     */
-    public static Set<PersistentDataKey<?>> values() {
-        return Eco.getHandler().getKeyRegistry().getRegisteredKeys();
-    }
-
     /**
      * Get the key.
      *
@@ -88,4 +79,13 @@ public class PersistentDataKey<T> {
     public PersistentDataKeyType getType() {
         return this.type;
     }
+
+    /**
+     * Get all persistent data keys.
+     *
+     * @return The keys.
+     */
+    public static Set<PersistentDataKey<?>> values() {
+        return Eco.getHandler().getKeyRegistry().getRegisteredKeys();
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7,6 +7,7 @@ import org.apache.commons.lang.Validate;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
+import java.util.logging.Logger;
 
 /**
  * An extension is a separate jar file that hooks into the base plugin jar.
@@ -143,6 +144,11 @@ public abstract class Extension implements PluginLike {
         return this.plugin.getConfigHandler();
     }
 
+    @Override
+    public Logger getLogger() {
+        return this.plugin.getLogger();
+    }
+
     /**
      * Get the plugin for the extension.
      *

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

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

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

@@ -37,6 +37,17 @@ public final class AntigriefManager {
         REGISTERED.remove(antigrief);
     }
 
+    /**
+     * Can player pickup item.
+     *
+     * @param player   The player.
+     * @param location The location.
+     * @return If player can pick up item.
+     */
+    public static boolean canPickupItem(@NotNull final Player player, @NotNull final Location location) {
+        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canPickupItem(player, location));
+    }
+
     /**
      * Can player break block.
      *

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -66,7 +66,7 @@ public class CustomItem implements TestableItem {
 
     @Override
     public ItemStack getItem() {
-        return item;
+        return item.clone();
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.items;
 
+import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.core.items.args.LookupArgParser;
 import com.willfp.eco.core.items.provider.ItemProvider;
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
@@ -8,10 +9,12 @@ import com.willfp.eco.core.recipe.parts.ModifiedTestableItem;
 import com.willfp.eco.core.recipe.parts.TestableStack;
 import com.willfp.eco.util.NamespacedKeyUtils;
 import com.willfp.eco.util.NumberUtils;
+import com.willfp.eco.util.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -33,6 +36,11 @@ public final class Items {
      */
     private static final Map<NamespacedKey, TestableItem> REGISTRY = new ConcurrentHashMap<>();
 
+    /**
+     * Cached custom item lookups, using {@link FastItemStack#hashCode()}.
+     */
+    private static final Map<Integer, TestableItem> CACHE = new ConcurrentHashMap<>();
+
     /**
      * All item providers.
      */
@@ -84,7 +92,7 @@ public final class Items {
     /**
      * This is the backbone of the entire eco item system.
      * <p>
-     * You can lookup a TestableItem for any material, custom item,
+     * You can look up a TestableItem for any material, custom item,
      * or item in general, and it will return it with any modifiers
      * passed as parameters. This includes stack size (item amount)
      * and enchantments that should be present on the item.
@@ -94,8 +102,8 @@ public final class Items {
      * <p>
      * The advantages of the testable item system are that there is the inbuilt
      * {@link TestableItem#matches(ItemStack)} - this allows to check if any item
-     * is that testable item; which may sound negligible but actually it allows for
-     * much more power an flexibility. For example, you can have an item with an
+     * is that testable item; which may sound negligible, but actually it allows for
+     * much more power and flexibility. For example, you can have an item with an
      * extra metadata tag, extra lore lines, different display name - and it
      * will still work as long as the test passes. This is very important
      * for custom crafting recipes where other plugins may add metadata
@@ -104,6 +112,7 @@ public final class Items {
      * @param key The lookup string.
      * @return The testable item, or an {@link EmptyTestableItem}.
      */
+    @NotNull
     public static TestableItem lookup(@NotNull final String key) {
         if (key.contains("?")) {
             String[] options = key.split("\\?");
@@ -117,7 +126,8 @@ public final class Items {
             return new EmptyTestableItem();
         }
 
-        String[] args = key.split(" ");
+        String[] args = StringUtils.parseTokens(key);
+
         if (args.length == 0) {
             return new EmptyTestableItem();
         }
@@ -235,6 +245,37 @@ public final class Items {
         }
     }
 
+    /**
+     * Get a Testable Item from an ItemStack.
+     * <p>
+     * Will search for registered items first. If there are no matches in the registry,
+     * then it will return a {@link MaterialTestableItem} matching the item type.
+     * <p>
+     * Does not account for modifiers (arg parser data).
+     *
+     * @param item The ItemStack.
+     * @return The found Testable Item.
+     */
+    @NotNull
+    public static TestableItem getItem(@Nullable final ItemStack item) {
+        if (item == null || item.getType().isAir()) {
+            return new EmptyTestableItem();
+        }
+
+        CustomItem customItem = getCustomItem(item);
+
+        if (customItem != null) {
+            return customItem;
+        }
+
+        for (TestableItem known : REGISTRY.values()) {
+            if (known.matches(item)) {
+                return known;
+            }
+        }
+        return new MaterialTestableItem(item.getType());
+    }
+
     /**
      * Get if itemStack is a custom item.
      *
@@ -242,12 +283,7 @@ public final class Items {
      * @return If is recipe.
      */
     public static boolean isCustomItem(@NotNull final ItemStack itemStack) {
-        for (TestableItem item : REGISTRY.values()) {
-            if (item.matches(itemStack)) {
-                return true;
-            }
-        }
-        return false;
+        return getCustomItem(itemStack) != null;
     }
 
     /**
@@ -258,14 +294,32 @@ public final class Items {
      */
     @Nullable
     public static CustomItem getCustomItem(@NotNull final ItemStack itemStack) {
+        int hash = FastItemStack.wrap(itemStack).hashCode();
+        TestableItem cached = CACHE.get(hash);
+        if (cached != null) {
+            return getOrWrap(cached);
+        } else {
+            CACHE.remove(hash);
+        }
+
+        TestableItem match = null;
+
         for (TestableItem item : REGISTRY.values()) {
             if (item.matches(itemStack)) {
-                return getOrWrap(item);
+                match = item;
+                break;
             }
         }
+
+        if (match == null) {
             return null;
         }
 
+        CACHE.put(hash, match);
+
+        return getOrWrap(match);
+    }
+
     /**
      * Get all registered custom items.
      *
@@ -284,6 +338,7 @@ public final class Items {
      * @param item The item.
      * @return The CustomItem.
      */
+    @NotNull
     public static CustomItem getOrWrap(@NotNull final TestableItem item) {
         if (item instanceof CustomItem) {
             return (CustomItem) item;
@@ -296,6 +351,14 @@ public final class Items {
         }
     }
 
+    /**
+     * Clear the lookup cache.
+     */
+    @ApiStatus.Internal
+    public static void clearCache() {
+        CACHE.clear();
+    }
+
     private Items() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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

@@ -1,57 +0,0 @@
-package com.willfp.eco.core.items.args;
-
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.function.Predicate;
-
-/**
- * Parse custom model data.
- */
-public class CustomModelDataArgParser implements LookupArgParser {
-    @Override
-    public @Nullable Predicate<ItemStack> parseArguments(@NotNull final String[] args,
-                                                         @NotNull final ItemMeta meta) {
-        Integer modelData = null;
-
-        for (String arg : args) {
-            String[] argSplit = arg.split(":");
-            if (!argSplit[0].equalsIgnoreCase("custom-model-data")) {
-                continue;
-            }
-
-            if (argSplit.length < 2) {
-                continue;
-            }
-
-            String asString = argSplit[1];
-
-            try {
-                modelData = Integer.parseInt(asString);
-            } catch (NumberFormatException e) {
-                modelData = null;
-            }
-        }
-
-        if (modelData == null) {
-            return null;
-        }
-
-        meta.setCustomModelData(modelData);
-
-        int finalModelData = modelData;
-        return test -> {
-            if (!test.hasItemMeta()) {
-                return false;
-            }
-
-            ItemMeta testMeta = test.getItemMeta();
-
-            assert testMeta != null;
-
-            return testMeta.getCustomModelData() == finalModelData;
-        };
-    }
-}

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

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

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

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

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.items.builder;
 
+import com.willfp.eco.core.items.TestableItem;
 import com.willfp.eco.util.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Material;
@@ -43,6 +44,15 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
         this(new ItemStack(material));
     }
 
+    /**
+     * Create a new ItemStackBuilder to modify an existing item.
+     *
+     * @param item The item to start with.
+     */
+    protected AbstractItemStackBuilder(@NotNull final TestableItem item) {
+        this(item.getItem());
+    }
+
     /**
      * Create a new ItemStackBuilder to modify an existing item.
      *

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

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

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

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

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

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

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

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

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

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

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

@@ -79,7 +79,27 @@ public final class Recipes {
                                                          @NotNull final String key,
                                                          @NotNull final ItemStack output,
                                                          @NotNull final List<String> recipeStrings) {
-        ShapedCraftingRecipe.Builder builder = ShapedCraftingRecipe.builder(plugin, key).setOutput(output);
+        return createAndRegisterRecipe(plugin, key, output, recipeStrings, null);
+    }
+
+    /**
+     * Create and register recipe.
+     *
+     * @param plugin        The plugin.
+     * @param key           The key.
+     * @param output        The output.
+     * @param recipeStrings The recipe.
+     * @param permission    The permission.
+     * @return The recipe.
+     */
+    public static CraftingRecipe createAndRegisterRecipe(@NotNull final EcoPlugin plugin,
+                                                         @NotNull final String key,
+                                                         @NotNull final ItemStack output,
+                                                         @NotNull final List<String> recipeStrings,
+                                                         @Nullable final String permission) {
+        ShapedCraftingRecipe.Builder builder = ShapedCraftingRecipe.builder(plugin, key)
+                .setOutput(output)
+                .setPermission(permission);
 
         for (int i = 0; i < 9; i++) {
             builder.setRecipePart(i, Items.lookup(recipeStrings.get(i)));

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

@@ -4,6 +4,7 @@ import com.willfp.eco.core.items.TestableItem;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -31,6 +32,7 @@ public interface CraftingRecipe {
      *
      * @return The parts.
      */
+    @NotNull
     List<TestableItem> getParts();
 
     /**
@@ -38,6 +40,7 @@ public interface CraftingRecipe {
      *
      * @return The key.
      */
+    @NotNull
     NamespacedKey getKey();
 
     /**
@@ -45,6 +48,7 @@ public interface CraftingRecipe {
      *
      * @return The key.
      */
+    @NotNull
     NamespacedKey getDisplayedKey();
 
     /**
@@ -52,5 +56,16 @@ public interface CraftingRecipe {
      *
      * @return The output.
      */
+    @NotNull
     ItemStack getOutput();
+
+    /**
+     * Get the recipe permission.
+     *
+     * @return The permission.
+     */
+    @Nullable
+    default String getPermission() {
+        return null;
+    }
 }

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

@@ -15,6 +15,7 @@ import org.bukkit.inventory.RecipeChoice;
 import org.bukkit.inventory.ShapedRecipe;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,16 +45,23 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
      */
     private final ItemStack output;
 
+    /**
+     * The permission.
+     */
+    private final String permission;
+
     private ShapedCraftingRecipe(@NotNull final EcoPlugin plugin,
                                  @NotNull final String key,
                                  @NotNull final List<TestableItem> parts,
-                                 @NotNull final ItemStack output) {
+                                 @NotNull final ItemStack output,
+                                 @Nullable final String permission) {
         super(plugin);
 
         this.parts = parts;
         this.key = plugin.getNamespacedKeyFactory().create(key);
         this.displayedKey = plugin.getNamespacedKeyFactory().create(key + "_displayed");
         this.output = output;
+        this.permission = permission;
     }
 
     @Override
@@ -103,7 +111,7 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
                 List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
                 assert lore != null;
                 lore.add("");
-                String add = Eco.getHandler().getEcoPlugin().getLangYml().getString("multiple-in-craft");
+                String add = Eco.getHandler().getEcoPlugin().getLangYml().getFormattedString("multiple-in-craft");
                 add = add.replace("%amount%", String.valueOf(item.getAmount()));
                 lore.add(add);
                 meta.setLore(lore);
@@ -140,6 +148,8 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
      *
      * @return The parts.
      */
+    @NotNull
+    @Override
     public List<TestableItem> getParts() {
         return this.parts;
     }
@@ -149,6 +159,8 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
      *
      * @return The key.
      */
+    @NotNull
+    @Override
     public NamespacedKey getKey() {
         return this.key;
     }
@@ -158,6 +170,8 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
      *
      * @return The displayed key.
      */
+    @NotNull
+    @Override
     public NamespacedKey getDisplayedKey() {
         return this.displayedKey;
     }
@@ -167,10 +181,23 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
      *
      * @return The output.
      */
+    @NotNull
+    @Override
     public ItemStack getOutput() {
         return this.output;
     }
 
+    /**
+     * Get the permission.
+     *
+     * @return The permission.
+     */
+    @Nullable
+    @Override
+    public String getPermission() {
+        return permission;
+    }
+
     /**
      * Builder for recipes.
      */
@@ -185,6 +212,11 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
          */
         private ItemStack output = null;
 
+        /**
+         * The permission for the recipe.
+         */
+        private String permission = null;
+
         /**
          * The key of the recipe.
          */
@@ -244,6 +276,17 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
             return this;
         }
 
+        /**
+         * Set the permission required to craft the recipe.
+         *
+         * @param permission The permission.
+         * @return The builder.
+         */
+        public Builder setPermission(@Nullable final String permission) {
+            this.permission = permission;
+            return this;
+        }
+
         /**
          * Build the recipe.
          *
@@ -256,7 +299,7 @@ public final class ShapedCraftingRecipe extends PluginDependent<EcoPlugin> imple
                 }
             }
 
-            return new ShapedCraftingRecipe(plugin, key.toLowerCase(), recipeParts, output);
+            return new ShapedCraftingRecipe(plugin, key.toLowerCase(), recipeParts, output, permission);
         }
     }
 }

eco-api/src/main/java/com/willfp/eco/core/scheduling/Scheduler.java

@@ -18,6 +18,20 @@ public interface Scheduler {
     BukkitTask runLater(@NotNull Runnable runnable,
                         long ticksLater);
 
+    /**
+     * Run the task after a specified tick delay.
+     * <p>
+     * Reordered for better kotlin interop.
+     *
+     * @param runnable   The lambda to run.
+     * @param ticksLater The amount of ticks to wait before execution.
+     * @return The created {@link BukkitTask}.
+     */
+    default BukkitTask runLater(long ticksLater,
+                                @NotNull Runnable runnable) {
+        return runLater(runnable, ticksLater);
+    }
+
     /**
      * Run the task repeatedly on a timer.
      *
@@ -30,6 +44,22 @@ public interface Scheduler {
                         long delay,
                         long repeat);
 
+    /**
+     * Run the task repeatedly on a timer.
+     * <p>
+     * Reordered for better kotlin interop.
+     *
+     * @param runnable The lambda to run.
+     * @param delay    The amount of ticks to wait before the first execution.
+     * @param repeat   The amount of ticks to wait between executions.
+     * @return The created {@link BukkitTask}.
+     */
+    default BukkitTask runTimer(long delay,
+                                long repeat,
+                                @NotNull Runnable runnable) {
+        return runTimer(runnable, delay, repeat);
+    }
+
     /**
      * Run the task repeatedly and asynchronously on a timer.
      *
@@ -42,6 +72,22 @@ public interface Scheduler {
                              long delay,
                              long repeat);
 
+    /**
+     * Run the task repeatedly and asynchronously on a timer.
+     * <p>
+     * Reordered for better kotlin interop.
+     *
+     * @param runnable The lambda to run.
+     * @param delay    The amount of ticks to wait before the first execution.
+     * @param repeat   The amount of ticks to wait between executions.
+     * @return The created {@link BukkitTask}.
+     */
+    default BukkitTask runAsyncTimer(long delay,
+                                     long repeat,
+                                     @NotNull Runnable runnable) {
+        return runAsyncTimer(runnable, delay, repeat);
+    }
+
     /**
      * Run the task.
      *
@@ -70,6 +116,22 @@ public interface Scheduler {
                       long delay,
                       long repeat);
 
+    /**
+     * Schedule the task to be ran repeatedly on a timer.
+     * <p>
+     * Reordered for better kotlin interop.
+     *
+     * @param runnable The lambda to run.
+     * @param delay    The amount of ticks to wait before the first execution.
+     * @param repeat   The amount of ticks to wait between executions.
+     * @return The id of the task.
+     */
+    default int syncRepeating(long delay,
+                              long repeat,
+                              @NotNull Runnable runnable) {
+        return syncRepeating(runnable, delay, repeat);
+    }
+
     /**
      * Cancel all running tasks from the linked {@link EcoPlugin}.
      */

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

@@ -4,6 +4,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,7 +22,7 @@ public final class ListUtils {
      * @return The list, filled will null objects.
      */
     @NotNull
-    public static <@Nullable T> List<List<T>> create2DList(final int rows,
+    public static <T> List<List<T>> create2DList(final int rows,
                                                  final int columns) {
         List<List<T>> list = new ArrayList<>(rows);
         while (list.size() < rows) {
@@ -56,6 +57,58 @@ public final class ListUtils {
         return frequencyMap;
     }
 
+    /**
+     * Convert nullable object to either singleton list or empty list.
+     *
+     * @param object The object.
+     * @param <T>    The type of the object.
+     * @return The list.
+     */
+    @NotNull
+    public static <T> List<T> toSingletonList(@Nullable final T object) {
+        if (object == null) {
+            return Collections.emptyList();
+        } else {
+            return Collections.singletonList(object);
+        }
+    }
+
+    /**
+     * Get element from list or return null if out of bounds.
+     *
+     * @param list  The list.
+     * @param index The index.
+     * @param <T>   The type of the list.
+     * @return The found element, or null if out of bounds.
+     */
+    @Nullable
+    public static <T> T getOrNull(@Nullable final List<T> list,
+                                  final int index) {
+        if (list == null) {
+            return null;
+        }
+
+        return index >= 0 && index < list.size() ? list.get(index) : null;
+    }
+
+    /**
+     * Get if an iterable of strings contains a certain element regardless of case.
+     *
+     * @param list    The list.
+     * @param element The element.
+     * @return If contained.
+     */
+    public static boolean containsIgnoreCase(@NotNull final Iterable<String> list,
+                                             @NotNull final String element) {
+        for (String s : list) {
+            if (s.equalsIgnoreCase(element)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private ListUtils() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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

@@ -1,11 +1,16 @@
 package com.willfp.eco.util;
 
+import org.apache.commons.lang.Validate;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.text.DecimalFormat;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.function.BiFunction;
 
 /**
  * Utilities / API methods for numbers.
@@ -16,6 +21,11 @@ public final class NumberUtils {
      */
     private static final double[] SIN_LOOKUP = new double[65536];
 
+    /**
+     * Crunch handler.
+     */
+    private static BiFunction<String, Player, Double> crunch = null;
+
     /**
      * Set of roman numerals to look up.
      */
@@ -83,7 +93,9 @@ public final class NumberUtils {
      * @param toChange The value to test.
      * @param limit    The maximum.
      * @return The new value.
+     * @deprecated Pointless method.
      */
+    @Deprecated(since = "6.19.0")
     public static int equalIfOver(final int toChange,
                                   final int limit) {
         return Math.min(toChange, limit);
@@ -95,7 +107,9 @@ public final class NumberUtils {
      * @param toChange The value to test.
      * @param limit    The maximum.
      * @return The new value.
+     * @deprecated Pointless method.
      */
+    @Deprecated(since = "6.19.0")
     public static double equalIfOver(final double toChange,
                                      final double limit) {
         return Math.min(toChange, limit);
@@ -185,11 +199,23 @@ public final class NumberUtils {
     /**
      * Get Log base 2 of a number.
      *
-     * @param toLog The number.
+     * @param a The number.
      * @return The result.
      */
-    public static int log2(final int toLog) {
-        return (int) (Math.log(toLog) / Math.log(2));
+    public static int log2(final int a) {
+        return (int) logBase(a, 2);
+    }
+
+    /**
+     * Log with a base.
+     *
+     * @param a    The number.
+     * @param base The base.
+     * @return The logarithm.
+     */
+    public static double logBase(final double a,
+                                 final double base) {
+        return Math.log(a) / Math.log(base);
     }
 
     /**
@@ -206,6 +232,39 @@ public final class NumberUtils {
         return formatted.endsWith("00") ? String.valueOf((int) toFormat) : formatted;
     }
 
+    /**
+     * Evaluate an expression.
+     *
+     * @param expression The expression.
+     * @return The value of the expression, or zero if invalid.
+     */
+    public static double evaluateExpression(@NotNull final String expression) {
+        return evaluateExpression(expression, null);
+    }
+
+    /**
+     * Evaluate an expression with respect to a player (for placeholders).
+     *
+     * @param expression The expression.
+     * @param player     The player.
+     * @return The value of the expression, or zero if invalid.
+     */
+    public static double evaluateExpression(@NotNull final String expression,
+                                            @Nullable final Player player) {
+        return crunch.apply(expression, player);
+    }
+
+    /**
+     * Init crunch handler.
+     *
+     * @param handler The handler.
+     */
+    @ApiStatus.Internal
+    public static void initCrunch(@NotNull final BiFunction<String, Player, Double> handler) {
+        Validate.isTrue(crunch == null, "Already initialized!");
+        crunch = handler;
+    }
+
     private NumberUtils() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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

@@ -16,30 +16,45 @@ public final class PotionUtils {
     public static int getDuration(@NotNull final PotionData data) {
         if (data.isExtended()) {
             return switch (data.getType()) {
-                case INSTANT_DAMAGE, INSTANT_HEAL: yield 0;
-                case POISON, REGEN: yield 1800;
-                case SLOW_FALLING, WEAKNESS, SLOWNESS: yield 4800;
-                case TURTLE_MASTER: yield 800;
-                default: yield 9600;
+                case INSTANT_DAMAGE, INSTANT_HEAL:
+                    yield 0;
+                case POISON, REGEN:
+                    yield 1800;
+                case SLOW_FALLING, WEAKNESS, SLOWNESS:
+                    yield 4800;
+                case TURTLE_MASTER:
+                    yield 800;
+                default:
+                    yield 9600;
             };
         }
 
         if (data.isUpgraded()) {
             return switch (data.getType()) {
-                case INSTANT_DAMAGE, INSTANT_HEAL: yield 0;
-                case POISON, REGEN: yield 420;
-                case SLOW_FALLING, WEAKNESS, SLOWNESS: yield 440;
-                case TURTLE_MASTER: yield 400;
-                default: yield 1800;
+                case INSTANT_DAMAGE, INSTANT_HEAL:
+                    yield 0;
+                case POISON, REGEN:
+                    yield 420;
+                case SLOW_FALLING, WEAKNESS, SLOWNESS:
+                    yield 440;
+                case TURTLE_MASTER:
+                    yield 400;
+                default:
+                    yield 1800;
             };
         }
 
         return switch (data.getType()) {
-            case INSTANT_DAMAGE, INSTANT_HEAL: yield 0;
-            case POISON, REGEN: yield 900;
-            case SLOW_FALLING, WEAKNESS, SLOWNESS: yield 400;
-            case TURTLE_MASTER: yield 1800;
-            default: yield 3600;
+            case INSTANT_DAMAGE, INSTANT_HEAL:
+                yield 0;
+            case POISON, REGEN:
+                yield 900;
+            case SLOW_FALLING, WEAKNESS, SLOWNESS:
+                yield 400;
+            case TURTLE_MASTER:
+                yield 1800;
+            default:
+                yield 3600;
         };
     }
 

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

@@ -2,6 +2,7 @@ package com.willfp.eco.util;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.gson.JsonSyntaxException;
 import com.willfp.eco.core.Prerequisite;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
 import net.kyori.adventure.text.Component;
@@ -14,7 +15,7 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.awt.*;
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -58,6 +59,13 @@ public final class StringUtils {
             .hexColors()
             .build();
 
+    /**
+     * GSON serializer.
+     */
+    private static final GsonComponentSerializer GSON_COMPONENT_SERIALIZER = GsonComponentSerializer.builder()
+            .emitLegacyHoverEvent()
+            .build();
+
     /**
      * Color map.
      */
@@ -415,7 +423,7 @@ public final class StringUtils {
         if (legacy == null) {
             processed = "";
         }
-        return GsonComponentSerializer.gson().serialize(
+        return GSON_COMPONENT_SERIALIZER.serialize(
                 Component.empty().decoration(TextDecoration.ITALIC, false).append(
                         LEGACY_COMPONENT_SERIALIZER.deserialize(processed)
                 )
@@ -429,10 +437,17 @@ public final class StringUtils {
      * @return The legacy string.
      */
     @NotNull
-    public static String jsonToLegacy(@NotNull final String json) {
-        return LEGACY_COMPONENT_SERIALIZER.serialize(
-                GsonComponentSerializer.gson().deserialize(json)
-        );
+    public static String jsonToLegacy(@Nullable final String json) {
+        if (json == null || json.isEmpty()) {
+            return "";
+        }
+
+        try {
+            Component component = GSON_COMPONENT_SERIALIZER.deserialize(json);
+            return LEGACY_COMPONENT_SERIALIZER.serialize(component);
+        } catch (JsonSyntaxException e) {
+            return json;
+        }
     }
 
     /**
@@ -462,6 +477,53 @@ public final class StringUtils {
         return LEGACY_COMPONENT_SERIALIZER.serialize(component);
     }
 
+    /**
+     * Parse string into tokens.
+     * <p>
+     * Handles quoted strings for names.
+     *
+     * @param lookup The lookup string.
+     * @return An array of tokens to be processed.
+     * @author Shawn (https://stackoverflow.com/questions/70606170/split-a-list-on-spaces-and-group-quoted-characters/70606653#70606653)
+     */
+    @NotNull
+    public static String[] parseTokens(@NotNull final String lookup) {
+        char[] chars = lookup.toCharArray();
+        List<String> tokens = new ArrayList<>();
+        StringBuilder tokenBuilder = new StringBuilder();
+        for (int i = 0; i < chars.length; i++) {
+            if (chars[i] == ' ') {
+                /*
+                Take the current value of the argument builder, append it to the
+                list of found tokens, and then clear it for the next argument.
+                 */
+                tokens.add(tokenBuilder.toString());
+                tokenBuilder.setLength(0);
+            } else if (chars[i] == '"') {
+                /*
+                Work until the next unescaped quote to handle quotes with
+                spaces in them - assumes the input string is well-formatted
+                 */
+                for (i++; chars[i] != '"'; i++) {
+                    /*
+                    If the found quote is escaped, ignore it in the parsing
+                     */
+                    if (chars[i] == '\\') {
+                        i++;
+                    }
+                    tokenBuilder.append(chars[i]);
+                }
+            } else {
+                /*
+                If it's a regular character, just append it to the current argument.
+                 */
+                tokenBuilder.append(chars[i]);
+            }
+        }
+        tokens.add(tokenBuilder.toString()); // Adds the last argument to the tokens.
+        return tokens.toArray(new String[0]);
+    }
+
     /**
      * Options for formatting.
      */

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

@@ -1,87 +1,93 @@
 package com.willfp.eco.internal.config
 
 import com.willfp.eco.core.PluginLike
+import com.willfp.eco.core.config.ConfigType
 import com.willfp.eco.core.config.interfaces.Config
-import com.willfp.eco.core.config.interfaces.JSONConfig
+import com.willfp.eco.core.config.interfaces.LoadableConfig
 import com.willfp.eco.core.config.wrapper.ConfigFactory
 import com.willfp.eco.internal.config.json.EcoJSONConfigSection
+import com.willfp.eco.internal.config.json.EcoJSONConfigWrapper
 import com.willfp.eco.internal.config.json.EcoLoadableJSONConfig
 import com.willfp.eco.internal.config.json.EcoUpdatableJSONConfig
 import com.willfp.eco.internal.config.yaml.EcoLoadableYamlConfig
 import com.willfp.eco.internal.config.yaml.EcoUpdatableYamlConfig
 import com.willfp.eco.internal.config.yaml.EcoYamlConfigSection
 import org.bukkit.configuration.file.YamlConfiguration
+import java.io.StringReader
 
 class EcoConfigFactory : ConfigFactory {
-    override fun createUpdatableYamlConfig(
-        configName: String,
-        plugin: PluginLike,
-        subDirectoryPath: String,
-        source: Class<*>,
-        removeUnused: Boolean,
-        vararg updateBlacklist: String
-    ): Config {
-        return EcoUpdatableYamlConfig(
-            configName,
-            plugin,
-            subDirectoryPath,
-            source,
-            removeUnused,
-            *updateBlacklist
-        )
-    }
-
-    override fun createUpdatableJSONConfig(
-        configName: String,
-        plugin: PluginLike,
-        subDirectoryPath: String,
-        source: Class<*>,
-        removeUnused: Boolean,
-        vararg updateBlacklist: String
-    ): JSONConfig {
-        return EcoUpdatableJSONConfig(
-            configName,
-            plugin,
-            subDirectoryPath,
-            source,
-            removeUnused,
-            *updateBlacklist
-        )
-    }
-
-    override fun createLoadableJSONConfig(
-        configName: String,
-        plugin: PluginLike,
-        subDirectoryPath: String,
-        source: Class<*>
-    ): JSONConfig {
-        return EcoLoadableJSONConfig(
-            configName,
-            plugin,
-            subDirectoryPath,
-            source
-        )
-    }
-
-    override fun createLoadableYamlConfig(
-        configName: String,
-        plugin: PluginLike,
-        subDirectoryPath: String,
-        source: Class<*>
-    ): Config {
-        return EcoLoadableYamlConfig(
-            configName,
-            plugin,
-            subDirectoryPath,
-            source
-        )
-    }
-
-    override fun createYamlConfig(config: YamlConfiguration): Config {
+    override fun createConfig(config: YamlConfiguration): Config {
         return EcoYamlConfigSection(config)
     }
 
-    override fun createJSONConfig(values: Map<String, Any>): JSONConfig {
+    override fun createConfig(values: MutableMap<String, Any>): Config {
         return EcoJSONConfigSection(values)
     }
+
+    override fun createConfig(contents: String, type: ConfigType): Config {
+        return if (type == ConfigType.JSON) {
+            @Suppress("UNCHECKED_CAST")
+            EcoJSONConfigSection(
+                EcoJSONConfigWrapper.gson.fromJson(
+                    StringReader(contents), Map::class.java
+                ) as MutableMap<String, Any>
+            )
+        } else {
+            EcoYamlConfigSection(YamlConfiguration.loadConfiguration(StringReader(contents)))
+        }
+    }
+
+    override fun createLoadableConfig(
+        configName: String,
+        plugin: PluginLike,
+        subDirectoryPath: String,
+        source: Class<*>,
+        type: ConfigType
+    ): LoadableConfig {
+        return if (type == ConfigType.JSON) {
+            EcoLoadableJSONConfig(
+                configName,
+                plugin,
+                subDirectoryPath,
+                source
+            )
+        } else {
+            EcoLoadableYamlConfig(
+                configName,
+                plugin,
+                subDirectoryPath,
+                source
+            )
+        }
+    }
+
+    override fun createUpdatableConfig(
+        configName: String,
+        plugin: PluginLike,
+        subDirectoryPath: String,
+        source: Class<*>,
+        removeUnused: Boolean,
+        type: ConfigType,
+        vararg updateBlacklist: String
+    ): LoadableConfig {
+        return if (type == ConfigType.JSON) {
+            EcoUpdatableJSONConfig(
+                configName,
+                plugin,
+                subDirectoryPath,
+                source,
+                removeUnused,
+                *updateBlacklist
+            )
+        } else {
+            EcoUpdatableYamlConfig(
+                configName,
+                plugin,
+                subDirectoryPath,
+                source,
+                removeUnused,
+                *updateBlacklist
+            )
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.internal.config.json
 
+@Suppress("UNCHECKED_CAST")
 class EcoJSONConfigSection(values: Map<String, Any?>) : EcoJSONConfigWrapper() {
     init {
         init(values)

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

@@ -1,7 +1,10 @@
+@file:Suppress("DEPRECATION")
+
 package com.willfp.eco.internal.config.json
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import com.willfp.eco.core.config.ConfigType
 import com.willfp.eco.core.config.interfaces.JSONConfig
 import com.willfp.eco.util.StringUtils
 import java.util.Objects
@@ -9,10 +12,12 @@ import java.util.concurrent.ConcurrentHashMap
 
 @Suppress("UNCHECKED_CAST")
 open class EcoJSONConfigWrapper : JSONConfig {
-    val handle: Gson = GsonBuilder()
+    companion object {
+        val gson: Gson = GsonBuilder()
             .setPrettyPrinting()
             .disableHtmlEscaping()
             .create()
+    }
 
     val values = ConcurrentHashMap<String, Any?>()
 
@@ -28,14 +33,14 @@ open class EcoJSONConfigWrapper : JSONConfig {
     }
 
     override fun toPlaintext(): String {
-        return this.handle.toJson(this.values)
+        return gson.toJson(this.values)
     }
 
     override fun has(path: String): Boolean {
         return getOfKnownType(path, Any::class.java) != null
     }
 
-    private fun <T: Any?> getOfKnownType(
+    private fun <T : Any?> getOfKnownType(
         path: String,
         clazz: Class<T>
     ): T? {
@@ -125,24 +130,18 @@ open class EcoJSONConfigWrapper : JSONConfig {
     }
 
     override fun getSubsection(path: String): JSONConfig {
-        val subsection = getSubsectionOrNull(path)
-        return subsection ?: EcoJSONConfigSection(emptyMap())
+        return getSubsectionOrNull(path) ?: EcoJSONConfigSection(mutableMapOf())
     }
 
     override fun getSubsectionOrNull(path: String): JSONConfig? {
         return if (values.containsKey(path)) {
-            val subsection = values[path] as Map<String, Any>?
-            EcoJSONConfigSection(subsection!!)
+            val subsection = values[path] as Map<String, Any>
+            EcoJSONConfigSection(subsection)
         } else {
             null
         }
     }
 
-    override fun getSubsections(path: String): List<JSONConfig> {
-        val subsections = getSubsectionsOrNull(path)
-        return subsections ?: mutableListOf()
-    }
-
     override fun getSubsectionsOrNull(path: String): List<JSONConfig>? {
         val maps = getOfKnownType(path, Any::class.java) as List<Map<String, Any>>?
             ?: return null
@@ -153,68 +152,20 @@ open class EcoJSONConfigWrapper : JSONConfig {
         return configs.toMutableList()
     }
 
-    override fun getInt(path: String): Int {
-        return (getOfKnownType(path, Double::class.java) ?: 0.0).toInt()
-    }
-
     override fun getIntOrNull(path: String): Int? {
-        return if (has(path)) {
-            getInt(path)
-        } else {
-            null
-        }
-    }
-
-    override fun getInt(
-        path: String,
-        def: Int
-    ): Int {
-        return Objects.requireNonNullElse(getOfKnownType(path, Int::class.java), def)
-    }
-
-    override fun getInts(path: String): MutableList<Int> {
-        return (Objects.requireNonNullElse(getOfKnownType(path, Any::class.java), emptyList<Int>()) as List<Int>).toMutableList()
+        return getOfKnownType(path, Double::class.java)?.toInt()
     }
 
     override fun getIntsOrNull(path: String): MutableList<Int>? {
-        return if (has(path)) {
-            getInts(path)
-        } else {
-            null
-        }
-    }
-
-    override fun getBool(path: String): Boolean {
-        return Objects.requireNonNullElse(getOfKnownType(path, Boolean::class.java), false)
+        return (getOfKnownType(path, Any::class.java) as Collection<Int>?)?.toMutableList()
     }
 
     override fun getBoolOrNull(path: String): Boolean? {
-        return if (has(path)) {
-            getBool(path)
-        } else {
-            null
-        }
-    }
-
-    override fun getBools(path: String): MutableList<Boolean> {
-        return (Objects.requireNonNullElse(getOfKnownType(path, Any::class.java), emptyList<Boolean>()) as List<Boolean>).toMutableList()
+        return getOfKnownType(path, Boolean::class.java)
     }
 
     override fun getBoolsOrNull(path: String): MutableList<Boolean>? {
-        return if (has(path)) {
-            getBools(path)
-        } else {
-            null
-        }
-    }
-
-    override fun getString(
-        path: String,
-        format: Boolean,
-        option: StringUtils.FormatOption
-    ): String {
-        val string = getOfKnownType(path, String::class.java) ?: ""
-        return if (format) StringUtils.format(string, option) else string
+        return (getOfKnownType(path, Any::class.java) as Collection<Boolean>?)?.toMutableList()
     }
 
     override fun getStringOrNull(
@@ -223,56 +174,40 @@ open class EcoJSONConfigWrapper : JSONConfig {
         option: StringUtils.FormatOption
     ): String? {
         return if (has(path)) {
-            getString(path, format, option)
+            val string = getOfKnownType(path, String::class.java) ?: ""
+            return if (format) StringUtils.format(string, option) else string
         } else {
             null
         }
     }
 
-    override fun getStrings(
-        path: String,
-        format: Boolean,
-        option: StringUtils.FormatOption
-    ): MutableList<String> {
-        val strings =
-            (Objects.requireNonNullElse(getOfKnownType(path, Any::class.java), emptyList<String>()) as List<String>).toMutableList()
-        return if (format) StringUtils.formatList(strings, option) else strings
-    }
-
     override fun getStringsOrNull(
         path: String,
         format: Boolean,
         option: StringUtils.FormatOption
     ): MutableList<String>? {
         return if (has(path)) {
-            getStrings(path, format, option)
+            val strings =
+                (Objects.requireNonNullElse(
+                    getOfKnownType(path, Any::class.java),
+                    emptyList<String>()
+                ) as List<String>).toMutableList()
+            return if (format) StringUtils.formatList(strings, option) else strings
         } else {
             null
         }
     }
 
-    override fun getDouble(path: String): Double {
-        return Objects.requireNonNullElse(getOfKnownType(path, Double::class.java), 0.0)
-    }
-
     override fun getDoubleOrNull(path: String): Double? {
-        return if (has(path)) {
-            getDouble(path)
-        } else {
-            null
-        }
-    }
-
-    override fun getDoubles(path: String): MutableList<Double> {
-        return (Objects.requireNonNullElse(getOfKnownType(path, Any::class.java), emptyList<Double>()) as List<Double>).toMutableList()
+        return getOfKnownType(path, Double::class.java)
     }
 
     override fun getDoublesOrNull(path: String): MutableList<Double>? {
-        return if (has(path)) {
-            getDoubles(path)
-        } else {
-            null
+        return (getOfKnownType(path, Any::class.java) as Collection<Double>?)?.toMutableList()
     }
+
+    override fun getType(): ConfigType {
+        return ConfigType.JSON
     }
 
     override fun clone(): JSONConfig {

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

@@ -2,6 +2,7 @@ package com.willfp.eco.internal.config.json
 
 import com.willfp.eco.core.PluginLike
 import com.willfp.eco.core.config.interfaces.LoadableConfig
+import org.bukkit.configuration.file.YamlConfiguration
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.FileOutputStream
@@ -23,14 +24,10 @@ open class EcoLoadableJSONConfig(
     private val name: String = "$configName.json"
 
     fun reloadFromFile() {
-        try {
-            init(configFile)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
+        runCatching { init(configFile) }.onFailure { it.printStackTrace() }
     }
 
-    override fun createFile() {
+    final override fun createFile() {
         val inputStream = source.getResourceAsStream(resourcePath)!!
         val outFile = File(this.plugin.dataFolder, resourcePath)
         val lastIndex = resourcePath.lastIndexOf('/')
@@ -40,7 +37,7 @@ open class EcoLoadableJSONConfig(
         }
         if (!outFile.exists()) {
             val out: OutputStream = FileOutputStream(outFile)
-            inputStream.copyTo(out, 1024)
+            inputStream.copyTo(out)
             out.close()
             inputStream.close()
         }
@@ -69,7 +66,7 @@ open class EcoLoadableJSONConfig(
 
     @Throws(FileNotFoundException::class)
     fun init(file: File) {
-        super.init(handle.fromJson(FileReader(file), Map::class.java) as MutableMap<String, Any>)
+        super.init(gson.fromJson(FileReader(file), Map::class.java) as MutableMap<String, Any>)
     }
 
     override fun getName(): String {
@@ -80,6 +77,10 @@ open class EcoLoadableJSONConfig(
         return configFile
     }
 
+    override fun getBukkitHandle(): YamlConfiguration? {
+        return null
+    }
+
     init {
         val directory = File(this.plugin.dataFolder, subDirectoryPath)
         if (!directory.exists()) {
@@ -89,11 +90,7 @@ open class EcoLoadableJSONConfig(
             createFile()
         }
         configFile = File(directory, name)
-        try {
         init(configFile)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
         plugin.configHandler.addConfig(this)
     }
 }

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoUpdatableJSONConfig.kt

@@ -1,10 +1,8 @@
 package com.willfp.eco.internal.config.json
 
 import com.willfp.eco.core.PluginLike
-import org.bukkit.configuration.InvalidConfigurationException
 import org.bukkit.configuration.file.YamlConfiguration
 import java.io.BufferedReader
-import java.io.IOException
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
 
@@ -21,7 +19,6 @@ open class EcoUpdatableJSONConfig(
 
     fun update() {
         super.clearCache()
-        try {
         this.init(configFile)
         val newConfig = configInJar
         if (newConfig.getKeys(true) == this.getKeys(true)) {
@@ -44,11 +41,6 @@ open class EcoUpdatableJSONConfig(
             }
         }
         this.save()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } catch (e: InvalidConfigurationException) {
-            e.printStackTrace()
-        }
     }
 
     private val configInJar: YamlConfiguration
@@ -56,13 +48,7 @@ open class EcoUpdatableJSONConfig(
             val newIn = this.source.getResourceAsStream(resourcePath) ?: throw NullPointerException("$name is null?")
             val reader = BufferedReader(InputStreamReader(newIn, StandardCharsets.UTF_8))
             val newConfig = YamlConfiguration()
-            try {
             newConfig.load(reader)
-            } catch (e: IOException) {
-                e.printStackTrace()
-            } catch (e: InvalidConfigurationException) {
-                e.printStackTrace()
-            }
             return newConfig
         }
 

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

@@ -24,15 +24,15 @@ class EcoConfigHandler(
 
     override fun callUpdate() {
         for (method in reflections.getMethodsAnnotatedWith(ConfigUpdater::class.java)) {
-            try {
+            kotlin.runCatching {
                 when (method.parameterCount) {
                     0 -> method.invoke(null)
                     1 -> method.invoke(null, this.plugin)
                     else -> throw InvalidUpdateMethodException("Update method must have 0 parameters or a plugin parameter.")
                 }
-            } catch (e: ReflectiveOperationException) {
-                e.printStackTrace()
-                throw InvalidUpdateMethodException("Update method generated an exception")
+            }.onFailure {
+                it.printStackTrace()
+                plugin.logger.severe("Update method ${method.toGenericString()} generated an exception")
             }
         }
     }

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

@@ -1,9 +1,10 @@
+@file:Suppress("DEPRECATION")
+
 package com.willfp.eco.internal.config.yaml
 
 import com.willfp.eco.core.PluginLike
 import com.willfp.eco.core.config.interfaces.LoadableConfig
 import com.willfp.eco.core.config.interfaces.WrappedYamlConfiguration
-import org.bukkit.configuration.InvalidConfigurationException
 import org.bukkit.configuration.file.YamlConfiguration
 import java.io.File
 import java.io.FileOutputStream
@@ -21,13 +22,7 @@ open class EcoLoadableYamlConfig(
     private val name: String = "$configName.yml"
 
     fun reloadFromFile() {
-        try {
         handle.load(getConfigFile())
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } catch (e: InvalidConfigurationException) {
-            e.printStackTrace()
-        }
     }
 
     final override fun createFile() {
@@ -40,11 +35,10 @@ open class EcoLoadableYamlConfig(
         }
         if (!outFile.exists()) {
             val out: OutputStream = FileOutputStream(outFile)
-            inputStream.copyTo(out, 1024)
+            inputStream.copyTo(out)
             out.close()
             inputStream.close()
         }
-        plugin.configHandler.addConfig(this)
     }
 
     override fun getResourcePath(): String {
@@ -61,10 +55,6 @@ open class EcoLoadableYamlConfig(
         handle.save(getConfigFile())
     }
 
-    override fun getBukkitHandle(): YamlConfiguration {
-        return handle
-    }
-
     override fun getName(): String {
         return name
     }
@@ -73,6 +63,10 @@ open class EcoLoadableYamlConfig(
         return configFile
     }
 
+    override fun getBukkitHandle(): YamlConfiguration? {
+        return handle
+    }
+
     init {
         val directory = File(this.plugin.dataFolder, subDirectoryPath)
         if (!directory.exists()) {

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

@@ -1,10 +1,8 @@
 package com.willfp.eco.internal.config.yaml
 
 import com.willfp.eco.core.PluginLike
-import org.bukkit.configuration.InvalidConfigurationException
 import org.bukkit.configuration.file.YamlConfiguration
 import java.io.BufferedReader
-import java.io.IOException
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
 
@@ -21,7 +19,6 @@ class EcoUpdatableYamlConfig(
 
     fun update() {
         super.clearCache()
-        try {
         this.handle.load(configFile)
         val newConfig = configInJar
         if (newConfig.getKeys(true) == this.handle.getKeys(true)) {
@@ -44,11 +41,6 @@ class EcoUpdatableYamlConfig(
             }
         }
         this.handle.save(configFile)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } catch (e: InvalidConfigurationException) {
-            e.printStackTrace()
-        }
     }
 
     private val configInJar: YamlConfiguration
@@ -56,13 +48,7 @@ class EcoUpdatableYamlConfig(
             val newIn = source.getResourceAsStream(resourcePath) ?: throw NullPointerException("$name is null?")
             val reader = BufferedReader(InputStreamReader(newIn, StandardCharsets.UTF_8))
             val newConfig = YamlConfiguration()
-            try {
             newConfig.load(reader)
-            } catch (e: IOException) {
-                e.printStackTrace()
-            } catch (e: InvalidConfigurationException) {
-                e.printStackTrace()
-            }
             return newConfig
         }
 

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

@@ -1,16 +1,16 @@
 package com.willfp.eco.internal.config.yaml
 
+import com.willfp.eco.core.config.ConfigType
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.util.StringUtils
 import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.configuration.file.YamlConfiguration
 import java.io.StringReader
-import java.util.concurrent.ConcurrentHashMap
 
 @Suppress("UNCHECKED_CAST")
 open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
     lateinit var handle: T
-    private val cache = ConcurrentHashMap<String, Any?>()
+    private val cache = mutableMapOf<String, Any?>()
 
     protected fun init(config: T): Config {
         handle = config
@@ -49,11 +49,6 @@ open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
         handle[path] = obj
     }
 
-    override fun getSubsection(path: String): Config {
-        val subsection = getSubsectionOrNull(path)
-        return subsection ?: EcoYamlConfigSection(YamlConfiguration())
-    }
-
     override fun getSubsectionOrNull(path: String): Config? {
         return if (cache.containsKey(path)) {
             cache[path] as Config?
@@ -68,92 +63,64 @@ open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
         }
     }
 
-    override fun getInt(path: String): Int {
-        return if (cache.containsKey(path)) {
-            cache[path] as Int
-        } else {
-            cache[path] = handle.getInt(path, 0)
-            getInt(path)
-        }
-    }
-
     override fun getIntOrNull(path: String): Int? {
-        return if (has(path)) {
-            getInt(path)
-        } else {
-            null
-        }
-    }
-
-    override fun getInt(
-        path: String,
-        def: Int
-    ): Int {
         return if (cache.containsKey(path)) {
-            cache[path] as Int
+            (cache[path] as Number).toInt()
         } else {
-            cache[path] = handle.getInt(path, def)
-            getInt(path)
-        }
-    }
-
-    override fun getInts(path: String): MutableList<Int> {
-        return if (cache.containsKey(path)) {
-            (cache[path] as MutableList<Int>).toMutableList()
+            if (has(path)) {
+                cache[path] = handle.getDouble(path).toInt()
             } else {
-            cache[path] = if (has(path)) ArrayList(handle.getIntegerList(path)) else mutableListOf<Int>()
-            getInts(path)
+                return null
+            }
+            getIntOrNull(path)
         }
     }
 
     override fun getIntsOrNull(path: String): MutableList<Int>? {
-        return if (has(path)) {
-            getInts(path)
-        } else {
-            null
-        }
-    }
-
-    override fun getBool(path: String): Boolean {
         return if (cache.containsKey(path)) {
-            cache[path] as Boolean
+            (cache[path] as Collection<Int>).toMutableList()
         } else {
-            cache[path] = handle.getBoolean(path)
-            getBool(path)
+            if (has(path)) {
+                cache[path] = handle.getIntegerList(path).toMutableList()
+            } else {
+                return null
+            }
+            getIntsOrNull(path)
         }
     }
 
     override fun getBoolOrNull(path: String): Boolean? {
-        return if (has(path)) {
-            getBool(path)
-        } else {
-            null
-        }
-    }
-
-    override fun getBools(path: String): MutableList<Boolean> {
         return if (cache.containsKey(path)) {
-            (cache[path] as MutableList<Boolean>).toMutableList()
+            cache[path] as Boolean
         } else {
-            cache[path] =
-                if (has(path)) ArrayList(handle.getBooleanList(path)) else mutableListOf<Boolean>()
-            getBools(path)
+            if (has(path)) {
+                cache[path] = handle.getBoolean(path)
+            } else {
+                return null
+            }
+            getBoolOrNull(path)
         }
     }
 
     override fun getBoolsOrNull(path: String): MutableList<Boolean>? {
-        return if (has(path)) {
-            getBools(path)
+        return if (cache.containsKey(path)) {
+            (cache[path] as Collection<Boolean>).toMutableList()
         } else {
-            null
+            if (has(path)) {
+                cache[path] = handle.getBooleanList(path).toMutableList()
+            } else {
+                return null
+            }
+            getBoolsOrNull(path)
         }
     }
 
-    override fun getString(
+    override fun getStringOrNull(
         path: String,
         format: Boolean,
         option: StringUtils.FormatOption
-    ): String {
+    ): String? {
+        return if (has(path)) {
             if (format && option == StringUtils.FormatOption.WITHOUT_PLACEHOLDERS) {
                 return if (cache.containsKey("$path\$FMT")) {
                     cache["$path\$FMT"] as String
@@ -172,25 +139,17 @@ open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
 
                 return if (format) StringUtils.format(string) else string
             }
-    }
-
-    override fun getStringOrNull(
-        path: String,
-        format: Boolean,
-        option: StringUtils.FormatOption
-    ): String? {
-        return if (has(path)) {
-            getString(path, format, option)
         } else {
             null
         }
     }
 
-    override fun getStrings(
+    override fun getStringsOrNull(
         path: String,
         format: Boolean,
         option: StringUtils.FormatOption
-    ): MutableList<String> {
+    ): MutableList<String>? {
+        return if (has(path)) {
             if (format && option == StringUtils.FormatOption.WITHOUT_PLACEHOLDERS) {
                 return if (cache.containsKey("$path\$FMT")) {
                     (cache["$path\$FMT"] as MutableList<String>).toMutableList()
@@ -214,54 +173,62 @@ open class EcoYamlConfigWrapper<T : ConfigurationSection> : Config {
                     strings
                 }
             }
-    }
-
-    override fun getStringsOrNull(
-        path: String,
-        format: Boolean,
-        option: StringUtils.FormatOption
-    ): MutableList<String>? {
-        return if (has(path)) {
-            getStrings(path, format, option)
         } else {
             null
         }
     }
 
-    override fun getDouble(path: String): Double {
-        return if (cache.containsKey(path)) {
-            cache[path] as Double
-        } else {
-            cache[path] = handle.getDouble(path)
-            getDouble(path)
-        }
-    }
-
     override fun getDoubleOrNull(path: String): Double? {
-        return if (has(path)) {
-            getDouble(path)
-        } else {
-            null
-        }
-    }
-
-    override fun getDoubles(path: String): MutableList<Double> {
         return if (cache.containsKey(path)) {
-            (cache[path] as MutableList<Double>).toMutableList()
+            (cache[path] as Number).toDouble()
         } else {
-            cache[path] = if (has(path)) ArrayList(handle.getDoubleList(path)) else emptyList<Double>()
-            getDoubles(path)
+            if (has(path)) {
+                cache[path] = handle.getDouble(path)
+            } else {
+                return null
+            }
+            getDoubleOrNull(path)
         }
     }
 
     override fun getDoublesOrNull(path: String): MutableList<Double>? {
+        return if (cache.containsKey(path)) {
+            (cache[path] as Collection<Double>).toMutableList()
+        } else {
+            if (has(path)) {
+                cache[path] = handle.getDoubleList(path).toMutableList()
+            } else {
+                return null
+            }
+            getDoublesOrNull(path)
+        }
+    }
+
+    override fun getSubsectionsOrNull(path: String): MutableList<out Config>? {
         return if (has(path)) {
-            getDoubles(path)
+            return if (cache.containsKey(path)) {
+                (cache[path] as Collection<Config>).toMutableList()
+            } else {
+                val mapList = ArrayList(handle.getMapList(path)) as List<Map<String, Any?>>
+                val configList = mutableListOf<Config>()
+                for (map in mapList) {
+                    val temp = YamlConfiguration.loadConfiguration(StringReader(""))
+                    temp.createSection("a", map)
+                    configList.add(EcoYamlConfigSection(temp.getConfigurationSection("a")!!))
+                }
+
+                cache[path] = if (has(path)) configList else emptyList()
+                getSubsections(path)
+            }
         } else {
             null
         }
     }
 
+    override fun getType(): ConfigType {
+        return ConfigType.JSON
+    }
+
     override fun clone(): Config {
         return EcoYamlConfigSection(
             YamlConfiguration.loadConfiguration(

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

@@ -1,6 +1,8 @@
 package com.willfp.eco.internal.drops.impl
 
 import com.willfp.eco.core.drops.InternalDropQueue
+import com.willfp.eco.core.events.DropQueuePushEvent
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager
 import com.willfp.eco.util.TelekinesisUtils
 import org.bukkit.Bukkit
 import org.bukkit.Location
@@ -15,7 +17,7 @@ import org.bukkit.util.Vector
 open class EcoDropQueue(val player: Player) : InternalDropQueue {
     val items = mutableListOf<ItemStack>()
     var xp: Int = 0
-    var loc: Location
+    var location: Location
     var hasTelekinesis = false
 
     override fun addItem(item: ItemStack): InternalDropQueue {
@@ -34,7 +36,7 @@ open class EcoDropQueue(val player: Player) : InternalDropQueue {
     }
 
     override fun setLocation(location: Location): InternalDropQueue {
-        loc = location
+        this.location = location
         return this
     }
 
@@ -47,8 +49,20 @@ open class EcoDropQueue(val player: Player) : InternalDropQueue {
         if (!hasTelekinesis) {
             hasTelekinesis = TelekinesisUtils.testPlayer(player)
         }
-        val world = loc.world!!
-        loc = loc.add(0.5, 0.5, 0.5)
+
+        if (hasTelekinesis && !AntigriefManager.canPickupItem(player, location)) {
+            hasTelekinesis = false
+        }
+
+        val pushEvent = DropQueuePushEvent(player, items, location, xp, hasTelekinesis)
+        Bukkit.getServer().pluginManager.callEvent(pushEvent)
+
+        if (pushEvent.isCancelled) {
+            return
+        }
+
+        val world = location.world!!
+        location = location.add(0.5, 0.5, 0.5)
         items.removeIf { itemStack: ItemStack -> itemStack.type == Material.AIR }
         if (items.isEmpty()) {
             return
@@ -56,7 +70,7 @@ open class EcoDropQueue(val player: Player) : InternalDropQueue {
         if (hasTelekinesis) {
             val leftover = player.inventory.addItem(*items.toTypedArray())
             for (drop in leftover.values) {
-                world.dropItem(loc, drop!!).velocity = Vector()
+                world.dropItem(location, drop!!).velocity = Vector()
             }
             if (xp > 0) {
                 val event = PlayerExpChangeEvent(player, xp)
@@ -68,16 +82,16 @@ open class EcoDropQueue(val player: Player) : InternalDropQueue {
             }
         } else {
             for (drop in items) {
-                world.dropItem(loc, drop).velocity = Vector()
+                world.dropItem(location, drop).velocity = Vector()
             }
             if (xp > 0) {
-                val orb = world.spawnEntity(loc, EntityType.EXPERIENCE_ORB) as ExperienceOrb
+                val orb = world.spawnEntity(location, EntityType.EXPERIENCE_ORB) as ExperienceOrb
                 orb.experience = xp
             }
         }
     }
 
     init {
-        loc = player.location
+        location = player.location
     }
 }

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

@@ -10,10 +10,10 @@ class EcoFastCollatedDropQueue(player: Player) : EcoDropQueue(player) {
         val fetched = COLLATED_MAP[player]
 
         if (fetched == null) {
-            COLLATED_MAP[player] = CollatedDrops(items, loc, xp, hasTelekinesis)
+            COLLATED_MAP[player] = CollatedDrops(items, location, xp, hasTelekinesis)
         } else {
             fetched.addDrops(items)
-            fetched.location = loc
+            fetched.location = location
             fetched.addXp(xp)
             if (this.hasTelekinesis) {
                 fetched.forceTelekinesis()

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserAdult.kt

@@ -0,0 +1,34 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.entity.Animals
+
+class EntityArgParserAdult : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var baby = false
+
+        for (arg in args) {
+            if (arg.equals("adult", true)) {
+                baby = true
+            }
+        }
+
+        if (!baby) {
+            return null
+        }
+
+        return EntityArgParseResult(
+            {
+                if (it !is Animals) {
+                    return@EntityArgParseResult false
+                }
+
+                it.isAdult
+            },
+            {
+                (it as? Animals)?.setAdult()
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserAttackDamage.kt

@@ -0,0 +1,43 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.attribute.Attribute
+import org.bukkit.entity.LivingEntity
+
+class EntityArgParserAttackDamage : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var attributeValue: Double? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("attack-damage", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            attributeValue = argSplit[1].toDoubleOrNull()
+        }
+
+        attributeValue ?: return null
+
+        return EntityArgParseResult(
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult false
+                }
+
+                val inst = it.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE) ?: return@EntityArgParseResult false
+                inst.value >= attributeValue
+            },
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult
+                }
+
+                it.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE)?.baseValue = attributeValue
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserAttackSpeed.kt

@@ -0,0 +1,43 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.attribute.Attribute
+import org.bukkit.entity.LivingEntity
+
+class EntityArgParserAttackSpeed : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var attributeValue: Double? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("attack-speed", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            attributeValue = argSplit[1].toDoubleOrNull()
+        }
+
+        attributeValue ?: return null
+
+        return EntityArgParseResult(
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult false
+                }
+
+                val inst = it.getAttribute(Attribute.GENERIC_ATTACK_SPEED) ?: return@EntityArgParseResult false
+                inst.value >= attributeValue
+            },
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult
+                }
+
+                it.getAttribute(Attribute.GENERIC_ATTACK_SPEED)?.baseValue = attributeValue
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserBaby.kt

@@ -0,0 +1,34 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.entity.Animals
+
+class EntityArgParserBaby : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var baby = false
+
+        for (arg in args) {
+            if (arg.equals("baby", true)) {
+                baby = true
+            }
+        }
+
+        if (!baby) {
+            return null
+        }
+
+        return EntityArgParseResult(
+            {
+                if (it !is Animals) {
+                    return@EntityArgParseResult false
+                }
+
+                !it.isAdult
+            },
+            {
+                (it as? Animals)?.setBaby()
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserCharged.kt

@@ -0,0 +1,34 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.entity.Creeper
+
+class EntityArgParserCharged : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var noAI = false
+
+        for (arg in args) {
+            if (arg.equals("charged", true)) {
+                noAI = true
+            }
+        }
+
+        if (!noAI) {
+            return null
+        }
+
+        return EntityArgParseResult(
+            {
+                if (it !is Creeper) {
+                    return@EntityArgParseResult false
+                }
+
+                it.isPowered
+            },
+            {
+                (it as? Creeper)?.isPowered = true
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserExplosionRadius.kt

@@ -0,0 +1,38 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.entity.Creeper
+
+class EntityArgParserExplosionRadius : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var size: Int? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("explosion-radius", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            size = argSplit[1].toIntOrNull()
+        }
+
+        size ?: return null
+
+        return EntityArgParseResult(
+            {
+                when (it) {
+                    is Creeper -> it.explosionRadius == size
+                    else -> false
+                }
+            },
+            {
+                when (it) {
+                    is Creeper -> it.explosionRadius = size
+                }
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserFlySpeed.kt

@@ -0,0 +1,43 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.attribute.Attribute
+import org.bukkit.entity.LivingEntity
+
+class EntityArgParserFlySpeed : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var attributeValue: Double? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("fly-speed", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            attributeValue = argSplit[1].toDoubleOrNull()
+        }
+
+        attributeValue ?: return null
+
+        return EntityArgParseResult(
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult false
+                }
+
+                val inst = it.getAttribute(Attribute.GENERIC_FLYING_SPEED) ?: return@EntityArgParseResult false
+                inst.value >= attributeValue
+            },
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult
+                }
+
+                it.getAttribute(Attribute.GENERIC_FLYING_SPEED)?.baseValue = attributeValue
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserFollowRange.kt

@@ -0,0 +1,43 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.attribute.Attribute
+import org.bukkit.entity.LivingEntity
+
+class EntityArgParserFollowRange : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var attributeValue: Double? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("follow-range", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            attributeValue = argSplit[1].toDoubleOrNull()
+        }
+
+        attributeValue ?: return null
+
+        return EntityArgParseResult(
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult false
+                }
+
+                val inst = it.getAttribute(Attribute.GENERIC_FOLLOW_RANGE) ?: return@EntityArgParseResult false
+                inst.value >= attributeValue
+            },
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult
+                }
+
+                it.getAttribute(Attribute.GENERIC_FOLLOW_RANGE)?.baseValue = attributeValue
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserHealth.kt

@@ -0,0 +1,43 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.attribute.Attribute
+import org.bukkit.entity.LivingEntity
+
+class EntityArgParserHealth : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var health: Double? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("health", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            health = argSplit[1].toDoubleOrNull()
+        }
+
+        health ?: return null
+
+        return EntityArgParseResult(
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult false
+                }
+
+                it.health >= health
+            },
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult
+                }
+
+                it.getAttribute(Attribute.GENERIC_MAX_HEALTH)?.baseValue = health
+                it.health = health
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserJumpStrength.kt

@@ -0,0 +1,43 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.attribute.Attribute
+import org.bukkit.entity.LivingEntity
+
+class EntityArgParserJumpStrength : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var attributeValue: Double? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("jump-strength", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            attributeValue = argSplit[1].toDoubleOrNull()
+        }
+
+        attributeValue ?: return null
+
+        return EntityArgParseResult(
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult false
+                }
+
+                val inst = it.getAttribute(Attribute.HORSE_JUMP_STRENGTH) ?: return@EntityArgParseResult false
+                inst.value >= attributeValue
+            },
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult
+                }
+
+                it.getAttribute(Attribute.HORSE_JUMP_STRENGTH)?.baseValue = attributeValue
+            }
+        )
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserKnockback.kt

@@ -0,0 +1,43 @@
+package com.willfp.eco.internal.entities
+
+import com.willfp.eco.core.entities.args.EntityArgParseResult
+import com.willfp.eco.core.entities.args.EntityArgParser
+import org.bukkit.attribute.Attribute
+import org.bukkit.entity.LivingEntity
+
+class EntityArgParserKnockback : EntityArgParser {
+    override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
+        var attributeValue: Double? = null
+
+        for (arg in args) {
+            val argSplit = arg.split(":")
+            if (!argSplit[0].equals("knockback", ignoreCase = true)) {
+                continue
+            }
+            if (argSplit.size < 2) {
+                continue
+            }
+            attributeValue = argSplit[1].toDoubleOrNull()
+        }
+
+        attributeValue ?: return null
+
+        return EntityArgParseResult(
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult false
+                }
+
+                val inst = it.getAttribute(Attribute.GENERIC_ATTACK_KNOCKBACK) ?: return@EntityArgParseResult false
+                inst.value >= attributeValue
+            },
+            {
+                if (it !is LivingEntity) {
+                    return@EntityArgParseResult
+                }
+
+                it.getAttribute(Attribute.GENERIC_ATTACK_KNOCKBACK)?.baseValue = attributeValue
+            }
+        )
+    }
+}