Removed unused param

build.gradle.kts

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
     }
 }
 
@@ -13,7 +13,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
     id("maven-publish")
     id("java")
-    kotlin("jvm") version "1.6.10"
+    kotlin("jvm") version "1.6.21"
 }
 
 dependencies {
@@ -71,9 +71,6 @@ allprojects {
         // CombatLogX
         maven("https://nexus.sirblobman.xyz/repository/public/")
 
-        // IridiumSkyblock
-        maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
-
         // MythicMobs
         maven("https://mvn.lumine.io/repository/maven-public/")
 
@@ -85,21 +82,27 @@ allprojects {
     }
 
     dependencies {
-        compileOnly(kotlin("stdlib", version = "1.6.10"))
+        // Kotlin
+        implementation(kotlin("stdlib", version = "1.6.21"))
+
+        // Included in spigot jar, no need to move to implementation
         compileOnly("org.jetbrains:annotations:23.0.0")
+        compileOnly("com.google.guava:guava:31.1-jre")
 
         // Test
         testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
-        
+
         // Adventure
-        compileOnly("net.kyori:adventure-api:4.10.0")
-        compileOnly("net.kyori:adventure-text-serializer-gson:4.10.0")
-        compileOnly("net.kyori:adventure-text-serializer-legacy:4.10.0")
+        implementation("net.kyori:adventure-api:4.10.1")
+        implementation("net.kyori:adventure-text-serializer-gson:4.10.1") {
+            exclude("com.google.code.gson", "gson") // Prevent shading into the jar
+        }
+        implementation("net.kyori:adventure-text-serializer-legacy:4.10.1")
 
         // Other
-        compileOnly("com.google.guava:guava:31.1-jre")
-        compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.5")
+        implementation("com.github.ben-manes.caffeine:caffeine:3.0.6")
+        implementation("org.apache.maven:maven-artifact:3.8.5")
     }
 
     tasks.withType<JavaCompile> {
@@ -115,10 +118,11 @@ allprojects {
         exclude(group = "com.darkblade12", module = "particleeffect")
         exclude(group = "com.github.cryptomorin", module = "XSeries")
         exclude(group = "net.wesjd", module = "anvilgui")
+        exclude(group = "org.slf4j", module = "slf4j-api")
     }
 
     configurations.testImplementation {
-        setExtendsFrom(listOf(configurations.compileOnly.get()))
+        setExtendsFrom(listOf(configurations.compileOnly.get(), configurations.implementation.get()))
     }
 
     tasks {
@@ -133,6 +137,28 @@ allprojects {
         shadowJar {
             relocate("org.bstats", "com.willfp.eco.libs.bstats")
             relocate("redempt.crunch", "com.willfp.eco.libs.crunch")
+            relocate("org.apache.commons.lang3", "com.willfp.eco.libs.lang3")
+            relocate("org.apache.maven", "com.willfp.eco.libs.maven")
+            relocate("org.checkerframework", "com.willfp.eco.libs.checkerframework")
+            relocate("org.intellij", "com.willfp.eco.libs.intellij")
+            relocate("org.jetbrains.annotations", "com.willfp.eco.libs.jetbrains.annotations")
+            //relocate("org.jetbrains.exposed", "com.willfp.eco.libs.exposed")
+            relocate("org.objenesis", "com.willfp.eco.libs.objenesis")
+            relocate("org.reflections", "com.willfp.eco.libs.reflections")
+            relocate("javassist", "com.willfp.eco.libs.javassist")
+            relocate("javax.annotation", "com.willfp.eco.libs.annotation")
+            relocate("com.google.errorprone", "com.willfp.eco.libs.errorprone")
+            relocate("com.google.j2objc", "com.willfp.eco.libs.j2objc")
+            relocate("com.google.thirdparty", "com.willfp.eco.libs.google.thirdparty")
+            relocate("com.google.protobuf", "com.willfp.eco.libs.google.protobuf") // No I don't know either
+            relocate("google.protobuf", "com.willfp.eco.libs.protobuf") // Still don't know
+            relocate("com.zaxxer.hikari", "com.willfp.eco.libs.hikari")
+            //relocate("com.mysql", "com.willfp.eco.libs.mysql")
+
+            /*
+            Kotlin and caffeine are not shaded so that they can be accessed directly by eco plugins.
+            Also, not relocating adventure, because it's a pain in the ass, and it doesn't *seem* to be causing loader constraint violations.
+             */
         }
 
         compileJava {

eco-api/build.gradle

@@ -4,7 +4,6 @@ dependencies {
 
     // Other
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
-    compileOnly 'org.apache.maven:maven-artifact:3.8.1'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
     compileOnly 'com.google.code.gson:gson:2.8.8'
 }

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

@@ -319,6 +319,8 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
 
         Eco.getHandler().addNewPlugin(this);
 
+        this.getLogger().info("Initializing " + this.getColor() + this.getName());
+
         /*
         The minimum eco version check was moved here because it's very common
         to add a lot of code in the constructor of plugins; meaning that the plugin
@@ -353,9 +355,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.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!");
+                    this.getLogger().warning(this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
+                    this.getLogger().warning("The newest version is " + version);
+                    this.getLogger().warning("Download the new version!");
                 }
             });
         }
@@ -489,9 +491,9 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
     public final void reload() {
         this.getConfigHandler().updateConfigs();
 
+        this.getScheduler().cancelAll();
         this.getConfigHandler().callUpdate();
         this.getConfigHandler().callUpdate(); // Call twice to fix issues
-        this.getScheduler().cancelAll();
 
         this.handleReload();
 
@@ -694,7 +696,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 Objects.requireNonNull(this.getConfigYml().getBukkitHandle());
+        return Objects.requireNonNull(this.getConfigYml().toBukkit());
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.willfp.eco.core;
 
 import com.willfp.eco.core.config.updating.ConfigHandler;
 import com.willfp.eco.core.config.wrapper.ConfigFactory;
+import com.willfp.eco.core.data.ExtendedPersistentDataContainer;
 import com.willfp.eco.core.data.ProfileHandler;
 import com.willfp.eco.core.data.keys.KeyRegistry;
 import com.willfp.eco.core.drops.DropQueueFactory;
@@ -23,6 +24,7 @@ import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Mob;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.persistence.PersistentDataContainer;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -282,4 +284,21 @@ public interface Handler {
      */
     @NotNull
     <T extends Mob> EntityController<T> createEntityController(@NotNull T mob);
+
+    /**
+     * Adapt base PDC to extended PDC.
+     *
+     * @param container The container.
+     * @return The extended container.
+     */
+    @NotNull
+    ExtendedPersistentDataContainer adaptPdc(@NotNull PersistentDataContainer container);
+
+    /**
+     * Create new PDC.
+     *
+     * @return The container.
+     */
+    @NotNull
+    PersistentDataContainer newPdc();
 }

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

@@ -1,6 +1,5 @@
 package com.willfp.eco.core;
 
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -234,7 +233,6 @@ public final class PluginProps {
      * @param supportsExtensions If the plugin should attempt to look for extensions.
      * @return The props.
      */
-    @ApiStatus.Internal
     static PluginProps createSimple(final int resourceId,
                                     final int bStatsId,
                                     @NotNull final String proxyPackage,

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

@@ -35,7 +35,7 @@ public class Prerequisite {
      *
      * @deprecated Use {@link EconomyManager#hasRegistrations()} instead.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public static final Prerequisite HAS_VAULT = new Prerequisite(
             () -> ClassUtils.exists("net.milkbowl.vault.economy.Economy"),
             "Requires server to have vault"
@@ -54,7 +54,7 @@ public class Prerequisite {
      *
      * @deprecated eco no longer supports versions before 1.17.
      */
-    @Deprecated(since = "6.25.2")
+    @Deprecated(since = "6.25.2", forRemoval = true)
     public static final Prerequisite HAS_1_17 = new Prerequisite(
             () -> ProxyConstants.NMS_VERSION.contains("17") || HAS_1_18.isMet(),
             "Requires server to be running 1.17+"

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

@@ -10,6 +10,7 @@ import java.util.List;
 /**
  * Interface for all command implementations.
  */
+@SuppressWarnings("removal")
 public interface CommandBase {
     /**
      * Get command name.
@@ -81,7 +82,7 @@ public interface CommandBase {
      * @see CommandHandler
      * @deprecated Use {@link CommandBase#onExecute(CommandSender, List)} instead.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     CommandHandler getHandler();
 
     /**
@@ -91,7 +92,7 @@ public interface CommandBase {
      * @see CommandHandler
      * @deprecated Handlers have been deprecated.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     void setHandler(@NotNull CommandHandler handler);
 
     /**
@@ -101,7 +102,7 @@ public interface CommandBase {
      * @see TabCompleteHandler
      * @deprecated Use {@link CommandBase#tabComplete(CommandSender, List)} instead.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     TabCompleteHandler getTabCompleter();
 
     /**
@@ -111,6 +112,6 @@ public interface CommandBase {
      * @see TabCompleteHandler
      * @deprecated Handlers have been deprecated.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     void setTabCompleter(@NotNull TabCompleteHandler handler);
 }

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

@@ -16,7 +16,7 @@ import java.util.List;
  * update to use the new system: {@link CommandBase#onExecute(CommandSender, List)}.
  */
 @FunctionalInterface
-@Deprecated(since = "6.17.0")
+@Deprecated(since = "6.17.0", forRemoval = true)
 public interface CommandHandler {
     /**
      * The code to be called on execution.

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

@@ -16,7 +16,7 @@ import java.util.List;
  * update to use the new system: {@link CommandBase#tabComplete(CommandSender, List)}
  */
 @FunctionalInterface
-@Deprecated(since = "6.17.0")
+@Deprecated(since = "6.17.0", forRemoval = true)
 public interface TabCompleteHandler {
     /**
      * Handle Tab Completion.

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

@@ -2,8 +2,6 @@ package com.willfp.eco.core.command.impl;
 
 import com.willfp.eco.core.EcoPlugin;
 import com.willfp.eco.core.command.CommandBase;
-import com.willfp.eco.core.command.CommandHandler;
-import com.willfp.eco.core.command.TabCompleteHandler;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
@@ -23,7 +21,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"})
+@SuppressWarnings({"DeprecatedIsStillUsed", "removal"})
 abstract class HandledCommand implements CommandBase {
     /**
      * The plugin.
@@ -54,14 +52,14 @@ abstract class HandledCommand implements CommandBase {
      */
     @Deprecated
     @Nullable
-    private CommandHandler handler = null;
+    private com.willfp.eco.core.command.CommandHandler handler = null;
 
     /**
      * The tab completion code to be executed in the command.
      */
     @Deprecated
     @Nullable
-    private TabCompleteHandler tabCompleter = null;
+    private com.willfp.eco.core.command.TabCompleteHandler tabCompleter = null;
 
     /**
      * All subcommands for the command.
@@ -256,27 +254,27 @@ abstract class HandledCommand implements CommandBase {
         return this.subcommands;
     }
 
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @Override
-    public @Nullable CommandHandler getHandler() {
+    public @Nullable com.willfp.eco.core.command.CommandHandler getHandler() {
         return this.handler;
     }
 
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @Override
-    public @Nullable TabCompleteHandler getTabCompleter() {
+    public @Nullable com.willfp.eco.core.command.TabCompleteHandler getTabCompleter() {
         return this.tabCompleter;
     }
 
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @Override
-    public void setHandler(@Nullable final CommandHandler handler) {
+    public void setHandler(@Nullable final com.willfp.eco.core.command.CommandHandler handler) {
         this.handler = handler;
     }
 
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @Override
-    public void setTabCompleter(@Nullable final TabCompleteHandler tabCompleter) {
+    public void setTabCompleter(@Nullable final com.willfp.eco.core.command.TabCompleteHandler tabCompleter) {
         this.tabCompleter = tabCompleter;
     }
 }

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

@@ -23,13 +23,31 @@ public abstract class BaseConfig extends LoadableConfigWrapper {
                          @NotNull final PluginLike plugin,
                          final boolean removeUnused,
                          @NotNull final ConfigType type) {
+        this(configName, plugin, removeUnused, type, true);
+    }
+
+    /**
+     * 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.
+     * @param requiresChangeToSave If changes must be applied to save the config.
+     */
+    protected BaseConfig(@NotNull final String configName,
+                         @NotNull final PluginLike plugin,
+                         final boolean removeUnused,
+                         @NotNull final ConfigType type,
+                         final boolean requiresChangeToSave) {
         super(Eco.getHandler().getConfigFactory().createUpdatableConfig(
                 configName,
                 plugin,
                 "",
                 plugin.getClass(),
                 removeUnused,
-                type
+                type,
+                requiresChangeToSave
         ));
     }
 }

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

@@ -0,0 +1,29 @@
+package com.willfp.eco.core.config;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Builder for configs to create them programmatically.
+ */
+public class BuildableConfig extends TransientConfig {
+    /**
+     * Create a new empty config builder.
+     */
+    public BuildableConfig() {
+        super();
+    }
+
+    /**
+     * Add to the config builder.
+     *
+     * @param path   The path.
+     * @param object The object.
+     * @return The builder.
+     */
+    public BuildableConfig add(@NotNull final String path,
+                               @Nullable final Object object) {
+        set(path, object);
+        return this;
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.willfp.eco.core.config;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * Config types, classified by file extension.
  */
@@ -7,10 +9,28 @@ public enum ConfigType {
     /**
      * .json config.
      */
-    JSON,
+    JSON("json"),
 
     /**
      * .yml config.
      */
-    YAML
+    YAML("yml");
+
+    /**
+     * The file extension.
+     */
+    private final String extension;
+
+    ConfigType(@NotNull final String extension) {
+        this.extension = extension;
+    }
+
+    /**
+     * Get the file extension.
+     *
+     * @return The extension.
+     */
+    public String getExtension() {
+        return extension;
+    }
 }

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

@@ -38,6 +38,7 @@ public abstract class ExtendableConfig extends LoadableConfigWrapper {
                 source,
                 removeUnused,
                 type,
+                true,
                 updateBlacklist
         ));
     }

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

@@ -26,7 +26,8 @@ public abstract class StaticBaseConfig extends LoadableConfigWrapper {
                 plugin,
                 "",
                 plugin.getClass(),
-                type
+                type,
+                true
         ));
     }
 }

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

@@ -3,12 +3,17 @@ 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.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -18,10 +23,19 @@ import java.util.Map;
  */
 public class TransientConfig extends ConfigWrapper<Config> {
     /**
+     * @param config The ConfigurationSection handle.
+     */
+    public TransientConfig(@NotNull final ConfigurationSection config) {
+        super(Eco.getHandler().getConfigFactory().createConfig(config));
+    }
+
+    /**
+     * Exists for backwards compatibility, YamlConfigurations are ConfigurationSections.
+     *
      * @param config The YamlConfiguration handle.
      */
     public TransientConfig(@NotNull final YamlConfiguration config) {
-        super(Eco.getHandler().getConfigFactory().createConfig(config));
+        this((ConfigurationSection) config);
     }
 
     /**
@@ -33,20 +47,50 @@ public class TransientConfig extends ConfigWrapper<Config> {
         )) : new TransientConfig());
     }
 
+    /**
+     * @param file The File.
+     * @deprecated Specify the config type to prevent bugs.
+     */
+    @Deprecated(since = "6.30.0", forRemoval = true)
+    public TransientConfig(@Nullable final File file) {
+        this(file, ConfigType.YAML);
+    }
+
+    /**
+     * @param file The file.
+     * @param type The config type to try read from.
+     */
+    public TransientConfig(@Nullable final File file,
+                           @NotNull final ConfigType type) {
+        super(file != null ? Eco.getHandler().getConfigFactory().createConfig(readFile(file), type)
+                : new TransientConfig());
+    }
+
     /**
      * Create a new empty transient config.
      *
      * @param values The values.
      */
     public TransientConfig(@NotNull final Map<String, Object> values) {
-        super(Eco.getHandler().getConfigFactory().createConfig(values));
+        super(Eco.getHandler().getConfigFactory().createConfig(values, ConfigType.YAML));
+    }
+
+    /**
+     * Create a new empty transient config.
+     *
+     * @param values The values.
+     * @param type   The type.
+     */
+    public TransientConfig(@NotNull final Map<String, Object> values,
+                           @NotNull final ConfigType type) {
+        super(Eco.getHandler().getConfigFactory().createConfig(values, type));
     }
 
     /**
      * Create a new empty transient config.
      */
     public TransientConfig() {
-        super(Eco.getHandler().getConfigFactory().createConfig("", ConfigType.YAML));
+        this(new HashMap<>(), ConfigType.JSON);
     }
 
     /**
@@ -57,4 +101,22 @@ public class TransientConfig extends ConfigWrapper<Config> {
                            @NotNull final ConfigType type) {
         super(Eco.getHandler().getConfigFactory().createConfig(contents, type));
     }
+
+    /**
+     * Read a file to a string.
+     *
+     * @param file The file.
+     * @return The string.
+     */
+    private static String readFile(@Nullable final File file) {
+        if (file == null) {
+            return "";
+        }
+
+        try {
+            return Files.readString(file.toPath());
+        } catch (IOException e) {
+            return "";
+        }
+    }
 }

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

@@ -1,19 +1,25 @@
 package com.willfp.eco.core.config.interfaces;
 
+import com.willfp.eco.core.config.BuildableConfig;
 import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.TransientConfig;
+import com.willfp.eco.core.placeholder.InjectablePlaceholder;
 import com.willfp.eco.core.placeholder.PlaceholderInjectable;
-import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.StringUtils;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 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;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * All configs implement this interface.
@@ -24,8 +30,13 @@ import java.util.Objects;
 public interface Config extends Cloneable, PlaceholderInjectable {
     /**
      * Clears cache.
+     * <p>
+     * Configs no longer have caches as they have in previous versions.
      */
-    void clearCache();
+    @Deprecated(since = "6.31.1", forRemoval = true)
+    default void clearCache() {
+        // Do nothing.
+    }
 
     /**
      * Convert the config into readable text.
@@ -51,6 +62,19 @@ public interface Config extends Cloneable, PlaceholderInjectable {
     @NotNull
     List<String> getKeys(boolean deep);
 
+    /**
+     * Recurse config keys.
+     *
+     * @param found The found keys.
+     * @param root  The root.
+     * @return The keys.
+     */
+    @NotNull
+    default List<String> recurseKeys(@NotNull Set<String> found,
+                                     @NotNull String root) {
+        return new ArrayList<>();
+    }
+
     /**
      * Get an object from config.
      * Default implementations call {@link org.bukkit.configuration.file.YamlConfiguration#get(String)}.
@@ -241,35 +265,6 @@ public interface Config extends Cloneable, PlaceholderInjectable {
         return getString(path, false, StringUtils.FormatOption.WITHOUT_PLACEHOLDERS);
     }
 
-    /**
-     * Get a string from config.
-     *
-     * @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);
-    }
-
-    /**
-     * Get a string from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param option The format option.
-     * @return The found value, or an empty string if not found.
-     * @deprecated Use {@link Config#getFormattedString(String, StringUtils.FormatOption)} instead.
-     */
-    @NotNull
-    @Deprecated
-    default String getString(@NotNull String path,
-                             @NotNull final StringUtils.FormatOption option) {
-        return this.getString(path, true, option);
-    }
-
     /**
      * Get a string from config.
      *
@@ -322,36 +317,6 @@ public interface Config extends Cloneable, PlaceholderInjectable {
         return getStringOrNull(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
-    /**
-     * Get a string from config.
-     *
-     * @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);
-    }
-
-    /**
-     * Get a string from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param option The format option.
-     * @return The found value, or null if not found.
-     * @deprecated Use {@link Config#getFormattedString(String, StringUtils.FormatOption)} instead.
-     */
-    @Nullable
-    @Deprecated
-    default String getStringOrNull(@NotNull String path,
-                                   @NotNull StringUtils.FormatOption option) {
-        return this.getStringOrNull(path, true, option);
-    }
-
     /**
      * Get a string from config.
      *
@@ -406,36 +371,6 @@ public interface Config extends Cloneable, PlaceholderInjectable {
         return getStrings(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
-    /**
-     * Get a list of strings from config.
-     *
-     * @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);
-    }
-
-    /**
-     * Get a list of strings from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param option The format option.
-     * @return The found value, or a blank {@link java.util.ArrayList} if not found.
-     * @deprecated Use {@link Config#getFormattedStrings(String, StringUtils.FormatOption)} instead.
-     */
-    @NotNull
-    @Deprecated
-    default List<String> getStrings(@NotNull String path,
-                                    @NotNull StringUtils.FormatOption option) {
-        return getStrings(path, false, option);
-    }
-
     /**
      * Get a list of strings from config.
      *
@@ -494,36 +429,6 @@ public interface Config extends Cloneable, PlaceholderInjectable {
         return getStringsOrNull(path, false, StringUtils.FormatOption.WITH_PLACEHOLDERS);
     }
 
-    /**
-     * Get a list of strings from config.
-     *
-     * @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);
-    }
-
-    /**
-     * Get a list of strings from config.
-     *
-     * @param path   The key to fetch the value from.
-     * @param option The format option.
-     * @return The found value, or null if not found.
-     * @deprecated Use {@link Config#getFormattedStringsOrNull(String, StringUtils.FormatOption)} instead.
-     */
-    @Nullable
-    @Deprecated
-    default List<String> getStringsOrNull(@NotNull String path,
-                                          @NotNull StringUtils.FormatOption option) {
-        return getStringsOrNull(path, false, option);
-    }
-
     /**
      * Get a list of strings from config.
      *
@@ -566,7 +471,7 @@ public interface Config extends Cloneable, PlaceholderInjectable {
      */
     default double getDoubleFromExpression(@NotNull String path,
                                            @Nullable Player player) {
-        return NumberUtils.evaluateExpression(this.getString(path), player, this.getInjectedPlaceholders());
+        return NumberUtils.evaluateExpression(this.getString(path), player, this);
     }
 
     /**
@@ -634,12 +539,12 @@ public interface Config extends Cloneable, PlaceholderInjectable {
     Config clone();
 
     @Override
-    default void injectPlaceholders(@NotNull Iterable<StaticPlaceholder> placeholders) {
+    default void addInjectablePlaceholder(@NotNull Iterable<InjectablePlaceholder> placeholders) {
         // Do nothing.
     }
 
     @Override
-    default List<StaticPlaceholder> getInjectedPlaceholders() {
+    default @NotNull List<InjectablePlaceholder> getPlaceholderInjections() {
         return Collections.emptyList();
     }
 
@@ -647,4 +552,33 @@ public interface Config extends Cloneable, PlaceholderInjectable {
     default void clearInjectedPlaceholders() {
         // Do nothing.
     }
+
+    /**
+     * Convert the config to a map of values.
+     *
+     * @return The values.
+     */
+    default Map<String, Object> toMap() {
+        return new HashMap<>();
+    }
+
+    /**
+     * Convert the config to a map of values.
+     *
+     * @return The values.
+     */
+    default ConfigurationSection toBukkit() {
+        YamlConfiguration empty = new YamlConfiguration();
+        empty.createSection("temp", this.toMap());
+        return empty.getConfigurationSection("temp");
+    }
+
+    /**
+     * Create a new config builder.
+     *
+     * @return The builder.
+     */
+    static BuildableConfig builder() {
+        return new BuildableConfig();
+    }
 }

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

@@ -1,63 +0,0 @@
-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 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.
-     *
-     * @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<JSONConfig> 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<JSONConfig> getSubsectionsOrNull(@NotNull String path);
-
-
-    /**
-     * Get subsection from config.
-     *
-     * @param path The key to check.
-     * @return The subsection. Throws NPE if not found.
-     */
-    @Override
-    @NotNull
-    JSONConfig getSubsection(@NotNull String path);
-
-    /**
-     * Get subsection from config.
-     *
-     * @param path The key to check.
-     * @return The subsection, or null if not found.
-     */
-    @Override
-    @Nullable
-    JSONConfig getSubsectionOrNull(@NotNull String path);
-
-    @Override
-    JSONConfig clone();
-}

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

@@ -1,7 +1,7 @@
 package com.willfp.eco.core.config.interfaces;
 
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -47,14 +47,21 @@ public interface LoadableConfig extends Config {
     /**
      * 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()}.
+     * This used to represent the underlying config, but since 6.30.0 configs use
+     * their own implementations internally, without relying on bukkit.
      *
      * @return The config, or null if config is not yaml-based.
+     * @deprecated Use toBukkit() instead.
      */
     @Nullable
-    YamlConfiguration getBukkitHandle();
+    @Deprecated(since = "6.30.0", forRemoval = true)
+    default YamlConfiguration getBukkitHandle() {
+        return this.toBukkit();
+    }
+
+    /**
+     * Convert the config to a bukkit {@link YamlConfiguration}.
+     */
+    @NotNull
+    YamlConfiguration toBukkit();
 }

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

@@ -1,21 +0,0 @@
-package com.willfp.eco.core.config.interfaces;
-
-import org.bukkit.configuration.file.YamlConfiguration;
-
-/**
- * Interface for configs that wrap an {@link YamlConfiguration}.
- *
- * @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.
-     *
-     * @return The handle.
-     */
-    YamlConfiguration getBukkitHandle();
-}

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

@@ -1,90 +0,0 @@
-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;
-
-/**
- * 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
-     * @param removeUnused    Whether keys not present in the default config should be removed on update.
-     * @param plugin          The plugin.
-     * @param updateBlacklist Substring of keys to not add/remove keys for.
-     */
-    protected JSONBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final PluginLike plugin,
-                             @NotNull final String... updateBlacklist) {
-        super(
-                (JSONConfig)
-                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                                configName,
-                                plugin,
-                                "",
-                                plugin.getClass(),
-                                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.
-     * @param plugin       The plugin.
-     */
-    protected JSONBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final PluginLike plugin) {
-        super(
-                (JSONConfig)
-                        Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                                configName,
-                                plugin,
-                                "",
-                                plugin.getClass(),
-                                removeUnused,
-                                ConfigType.JSON
-                        )
-        );
-    }
-
-    /**
-     * @param configName      The name of the config
-     * @param removeUnused    Whether keys not present in the default config should be removed on update.
-     * @param plugin          The plugin.
-     * @param updateBlacklist Substring of keys to not add/remove keys for.
-     */
-    protected JSONBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final EcoPlugin plugin,
-                             @NotNull final String... updateBlacklist) {
-        this(configName, removeUnused, (PluginLike) plugin, updateBlacklist);
-    }
-
-    /**
-     * @param configName   The name of the config
-     * @param removeUnused Whether keys not present in the default config should be removed on update.
-     * @param plugin       The plugin.
-     */
-    protected JSONBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final EcoPlugin plugin) {
-        this(configName, removeUnused, (PluginLike) plugin);
-    }
-}

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

@@ -1,70 +0,0 @@
-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;
-
-/**
- * Config implementation for configs present in one of two places:
- * <ul>
- *     <li>Plugin base directory (eg config.yml, lang.yml)</li>
- *     <li>Other extension's configs</li>
- * </ul>
- * <p>
- * Automatically updates.
- *
- * @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
-     * @param removeUnused     Whether keys not present in the default config should be removed on update.
-     * @param plugin           The plugin.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     */
-    protected JSONExtendableConfig(@NotNull final String configName,
-                                   final boolean removeUnused,
-                                   @NotNull final PluginLike plugin,
-                                   @NotNull final Class<?> source,
-                                   @NotNull final String subDirectoryPath,
-                                   @NotNull final String... updateBlacklist) {
-        super(
-                (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.
-     * @param plugin           The plugin.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     */
-    protected JSONExtendableConfig(@NotNull final String configName,
-                                   final boolean removeUnused,
-                                   @NotNull final EcoPlugin plugin,
-                                   @NotNull final Class<?> source,
-                                   @NotNull final String subDirectoryPath,
-                                   @NotNull final String... updateBlacklist) {
-        this(configName, removeUnused, (PluginLike) plugin, source, subDirectoryPath, updateBlacklist);
-    }
-}

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

@@ -1,45 +0,0 @@
-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).
-     * <p>
-     * Does not automatically update.
-     *
-     * @param configName The name of the config
-     * @param plugin     The plugin.
-     */
-    protected JSONStaticBaseConfig(@NotNull final String configName,
-                                   @NotNull final PluginLike plugin) {
-        super((JSONConfig) Eco.getHandler().getConfigFactory().createLoadableConfig(configName, plugin, "", plugin.getClass(), ConfigType.JSON));
-    }
-
-    /**
-     * Config implementation for configs present in the plugin's base directory (eg config.json, lang.json).
-     * <p>
-     * Does not automatically update.
-     *
-     * @param configName The name of the config
-     * @param plugin     The plugin.
-     */
-    protected JSONStaticBaseConfig(@NotNull final String configName,
-                                   @NotNull final EcoPlugin plugin) {
-        this(configName, (PluginLike) plugin);
-    }
-}

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

@@ -1,37 +0,0 @@
-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.
-     * <p>
-     * Does not automatically update.
-     *
-     * @param values The map of values.
-     */
-    public JSONTransientConfig(@NotNull final Map<String, Object> 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

@@ -1,53 +0,0 @@
-package com.willfp.eco.core.config.json.wrapper;
-
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.config.wrapper.ConfigWrapper;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-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.
-     *
-     * @param handle The handle.
-     */
-    protected JSONConfigWrapper(@NotNull final JSONConfig handle) {
-        super(handle);
-    }
-
-
-    @Override
-    public @NotNull List<JSONConfig> getSubsections(@NotNull final String path) {
-        return this.getHandle().getSubsections(path);
-    }
-
-    @Override
-    public @Nullable List<JSONConfig> getSubsectionsOrNull(@NotNull final String path) {
-        return this.getHandle().getSubsectionsOrNull(path);
-    }
-
-    @Override
-    public @NotNull JSONConfig getSubsection(@NotNull final String path) {
-        return this.getHandle().getSubsection(path);
-    }
-
-    @Override
-    public @Nullable JSONConfig getSubsectionOrNull(@NotNull final String path) {
-        return this.getHandle().getSubsectionOrNull(path);
-    }
-
-    @Override
-    public JSONConfig clone() {
-        return this.getHandle().clone();
-    }
-}

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

@@ -1,63 +0,0 @@
-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.
-     *
-     * @param handle The handle.
-     */
-    protected LoadableJSONConfigWrapper(@NotNull final JSONConfig handle) {
-        super(handle);
-
-        Validate.isTrue(handle instanceof LoadableConfig, "Wrapped config must be loadable!");
-    }
-
-
-    @Override
-    public void createFile() {
-        ((LoadableConfig) this.getHandle()).createFile();
-    }
-
-    @Override
-    public String getResourcePath() {
-        return ((LoadableConfig) this.getHandle()).getResourcePath();
-    }
-
-    @Override
-    public void save() throws IOException {
-        ((LoadableConfig) this.getHandle()).save();
-    }
-
-    @Override
-    public File getConfigFile() {
-        return ((LoadableConfig) this.getHandle()).getConfigFile();
-    }
-
-    @Override
-    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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.config.updating;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -29,7 +30,8 @@ import java.lang.annotation.Target;
  * }</pre>
  * <p>
  * If using kotlin, you have to annotate the method with {@code @JvmStatic}
- * in order to prevent null pointer exceptions.
+ * in order to prevent null pointer exceptions - this also means that you cannot
+ * have config updater methods in companion objects.
  * <p>
  * Config update methods in all classes in a plugin jar will be called
  * on reload.
@@ -39,5 +41,6 @@ import java.lang.annotation.Target;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Documented
 public @interface ConfigUpdater {
 }

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

@@ -5,7 +5,7 @@ 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.LoadableConfig;
-import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.ConfigurationSection;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,13 +20,14 @@ public interface ConfigFactory {
     /**
      * Updatable config.
      *
-     * @param configName       The name of the config
-     * @param plugin           The plugin.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     * @param removeUnused     Whether keys not present in the default config should be removed on update.
-     * @param type             The config type.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
+     * @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 type                  The config type.
+     * @param updateBlacklist       Substring of keys to not add/remove keys for.
+     * @param requiresChangesToSave If the config must be changed in order to save the config.
      * @return The config implementation.
      */
     LoadableConfig createUpdatableConfig(@NotNull String configName,
@@ -35,23 +36,26 @@ public interface ConfigFactory {
                                          @NotNull Class<?> source,
                                          boolean removeUnused,
                                          @NotNull ConfigType type,
+                                         boolean requiresChangesToSave,
                                          @NotNull String... updateBlacklist);
 
     /**
      * Loadable config.
      *
-     * @param configName       The name of the config
-     * @param plugin           The plugin.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     * @param type             The config type.
+     * @param configName            The name of the config
+     * @param plugin                The plugin.
+     * @param subDirectoryPath      The subdirectory path.
+     * @param source                The class that owns the resource.
+     * @param type                  The config type.
+     * @param requiresChangesToSave If the config must be changed in order to save the config.
      * @return The config implementation.
      */
     LoadableConfig createLoadableConfig(@NotNull String configName,
                                         @NotNull PluginLike plugin,
                                         @NotNull String subDirectoryPath,
                                         @NotNull Class<?> source,
-                                        @NotNull ConfigType type);
+                                        @NotNull ConfigType type,
+                                        boolean requiresChangesToSave);
 
     /**
      * Create config.
@@ -59,15 +63,17 @@ public interface ConfigFactory {
      * @param config The handle.
      * @return The config implementation.
      */
-    Config createConfig(@NotNull YamlConfiguration config);
+    Config createConfig(@NotNull ConfigurationSection config);
 
     /**
      * Create config.
      *
      * @param values The values.
+     * @param type   The config type.
      * @return The config implementation.
      */
-    Config createConfig(@NotNull Map<String, Object> values);
+    Config createConfig(@NotNull Map<String, Object> values,
+                        @NotNull ConfigType type);
 
     /**
      * Create config.

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

@@ -2,12 +2,14 @@ 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.core.placeholder.StaticPlaceholder;
+import com.willfp.eco.core.placeholder.InjectablePlaceholder;
 import com.willfp.eco.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Configs from eco have an internal implementation,
@@ -17,7 +19,7 @@ import java.util.List;
  *
  * @param <T> The type of the handle.
  */
-@SuppressWarnings("MethodDoesntCallSuperMethod")
+@SuppressWarnings({"MethodDoesntCallSuperMethod", "removal"})
 public abstract class ConfigWrapper<T extends Config> implements Config {
     /**
      * Configs from eco have an internal implementation,
@@ -41,6 +43,7 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
     }
 
     @Override
+    @Deprecated(since = "6.31.1", forRemoval = true)
     public void clearCache() {
         handle.clearCache();
     }
@@ -60,6 +63,12 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         return handle.getKeys(deep);
     }
 
+    @Override
+    public @NotNull List<String> recurseKeys(@NotNull final Set<String> found,
+                                             @NotNull final String root) {
+        return handle.recurseKeys(found, root);
+    }
+
     @Override
     public @Nullable Object get(@NotNull final String path) {
         return handle.get(path);
@@ -136,18 +145,13 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
     }
 
     @Override
-    public void injectPlaceholders(@NotNull final StaticPlaceholder... placeholders) {
-        handle.injectPlaceholders(placeholders);
+    public void addInjectablePlaceholder(@NotNull final Iterable<InjectablePlaceholder> placeholders) {
+        handle.addInjectablePlaceholder(placeholders);
     }
 
     @Override
-    public void injectPlaceholders(@NotNull final Iterable<StaticPlaceholder> placeholders) {
-        handle.injectPlaceholders(placeholders);
-    }
-
-    @Override
-    public List<StaticPlaceholder> getInjectedPlaceholders() {
-        return handle.getInjectedPlaceholders();
+    public @NotNull List<InjectablePlaceholder> getPlaceholderInjections() {
+        return handle.getPlaceholderInjections();
     }
 
     @Override
@@ -155,6 +159,11 @@ public abstract class ConfigWrapper<T extends Config> implements Config {
         handle.clearInjectedPlaceholders();
     }
 
+    @Override
+    public Map<String, Object> toMap() {
+        return this.handle.toMap();
+    }
+
     /**
      * Get the handle.
      *

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

@@ -3,7 +3,6 @@ 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;
@@ -47,7 +46,7 @@ public abstract class LoadableConfigWrapper extends ConfigWrapper<LoadableConfig
     }
 
     @Override
-    public @Nullable YamlConfiguration getBukkitHandle() {
-        return this.getHandle().getBukkitHandle();
+    public @NotNull YamlConfiguration toBukkit() {
+        return this.getHandle().toBukkit();
     }
 }

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

@@ -1,87 +0,0 @@
-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;
-
-/**
- * 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
-     * @param removeUnused    Whether keys not present in the default config should be removed on update.
-     * @param plugin          The plugin.
-     * @param updateBlacklist Substring of keys to not add/remove keys for.
-     */
-    protected YamlBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final PluginLike plugin,
-                             @NotNull final String... updateBlacklist) {
-        super(
-                Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                        configName,
-                        plugin,
-                        "",
-                        plugin.getClass(),
-                        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.
-     * @param plugin       The plugin.
-     */
-    protected YamlBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final PluginLike plugin) {
-        super(
-                Eco.getHandler().getConfigFactory().createUpdatableConfig(
-                        configName,
-                        plugin,
-                        "",
-                        plugin.getClass(),
-                        removeUnused,
-                        ConfigType.YAML
-                )
-        );
-    }
-
-    /**
-     * @param configName      The name of the config
-     * @param removeUnused    Whether keys not present in the default config should be removed on update.
-     * @param plugin          The plugin.
-     * @param updateBlacklist Substring of keys to not add/remove keys for.
-     */
-    protected YamlBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final EcoPlugin plugin,
-                             @NotNull final String... updateBlacklist) {
-        this(configName, removeUnused, (PluginLike) plugin, updateBlacklist);
-    }
-
-    /**
-     * @param configName   The name of the config
-     * @param removeUnused Whether keys not present in the default config should be removed on update.
-     * @param plugin       The plugin.
-     */
-    protected YamlBaseConfig(@NotNull final String configName,
-                             final boolean removeUnused,
-                             @NotNull final EcoPlugin plugin) {
-        this(configName, removeUnused, (PluginLike) plugin);
-    }
-}

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

@@ -1,68 +0,0 @@
-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;
-
-/**
- * Config implementation for configs present in one of two places:
- * <ul>
- *     <li>Plugin base directory (eg config.yml, lang.yml)</li>
- *     <li>Other extension's configs</li>
- * </ul>
- * <p>
- * Automatically updates.
- *
- * @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
-     * @param removeUnused     Whether keys not present in the default config should be removed on update.
-     * @param plugin           The plugin.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     */
-    protected YamlExtendableConfig(@NotNull final String configName,
-                                   final boolean removeUnused,
-                                   @NotNull final PluginLike plugin,
-                                   @NotNull final Class<?> source,
-                                   @NotNull final String subDirectoryPath,
-                                   @NotNull final String... updateBlacklist) {
-        super(
-                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.
-     * @param plugin           The plugin.
-     * @param updateBlacklist  Substring of keys to not add/remove keys for.
-     * @param subDirectoryPath The subdirectory path.
-     * @param source           The class that owns the resource.
-     */
-    protected YamlExtendableConfig(@NotNull final String configName,
-                                   final boolean removeUnused,
-                                   @NotNull final EcoPlugin plugin,
-                                   @NotNull final Class<?> source,
-                                   @NotNull final String subDirectoryPath,
-                                   @NotNull final String... updateBlacklist) {
-        this(configName, removeUnused, (PluginLike) plugin, source, subDirectoryPath, updateBlacklist);
-    }
-}

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

@@ -1,44 +0,0 @@
-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).
-     * <p>
-     * Does not automatically update.
-     *
-     * @param configName The name of the config
-     * @param plugin     The plugin.
-     */
-    protected YamlStaticBaseConfig(@NotNull final String configName,
-                                   @NotNull final PluginLike plugin) {
-        super(Eco.getHandler().getConfigFactory().createLoadableConfig(configName, plugin, "", plugin.getClass(), ConfigType.YAML));
-    }
-
-    /**
-     * 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.
-     */
-    protected YamlStaticBaseConfig(@NotNull final String configName,
-                                   @NotNull final EcoPlugin plugin) {
-        this(configName, (PluginLike) plugin);
-    }
-}

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

@@ -1,42 +0,0 @@
-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;
-
-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().createConfig(config));
-    }
-
-    /**
-     * @param contents The contents of the config.
-     */
-    public YamlTransientConfig(@NotNull final String 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

@@ -1,63 +0,0 @@
-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.
-     *
-     * @param handle The handle.
-     */
-    protected LoadableYamlConfigWrapper(@NotNull final Config handle) {
-        super(handle);
-
-        Validate.isTrue(handle instanceof LoadableConfig, "Wrapped config must be loadable!");
-    }
-
-
-    @Override
-    public void createFile() {
-        ((LoadableConfig) this.getHandle()).createFile();
-    }
-
-    @Override
-    public String getResourcePath() {
-        return ((LoadableConfig) this.getHandle()).getResourcePath();
-    }
-
-    @Override
-    public void save() throws IOException {
-        ((LoadableConfig) this.getHandle()).save();
-    }
-
-    @Override
-    public File getConfigFile() {
-        return ((LoadableConfig) this.getHandle()).getConfigFile();
-    }
-
-    @Override
-    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

@@ -1,31 +0,0 @@
-package com.willfp.eco.core.config.yaml.wrapper;
-
-import com.willfp.eco.core.config.interfaces.Config;
-import com.willfp.eco.core.config.interfaces.WrappedYamlConfiguration;
-import com.willfp.eco.core.config.wrapper.ConfigWrapper;
-import org.bukkit.configuration.file.YamlConfiguration;
-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.
-     *
-     * @param handle The handle.
-     */
-    protected YamlConfigWrapper(@NotNull final Config handle) {
-        super(handle);
-    }
-
-    @Override
-    public YamlConfiguration getBukkitHandle() {
-        return ((WrappedYamlConfiguration) this.getHandle()).getBukkitHandle();
-    }
-}

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

@@ -0,0 +1,101 @@
+package com.willfp.eco.core.data;
+
+import com.willfp.eco.core.Eco;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+
+/**
+ * Persistent data container wrapper that allows for full string (non-namespaced) keys.
+ */
+public interface ExtendedPersistentDataContainer {
+    /**
+     * Set a key.
+     *
+     * @param key      The key.
+     * @param dataType The data type.
+     * @param value    The value.
+     * @param <T>      The type.
+     * @param <Z>      The type.
+     */
+    <T, Z> void set(@NotNull String key, @NotNull PersistentDataType<T, Z> dataType, @NotNull Z value);
+
+    /**
+     * Get if there is a key.
+     *
+     * @param key      The key.
+     * @param dataType The data type.
+     * @param <T>      The type.
+     * @param <Z>      The type.
+     * @return If the key is present.
+     */
+    <T, Z> boolean has(@NotNull String key, @NotNull PersistentDataType<T, Z> dataType);
+
+    /**
+     * Get a value.
+     *
+     * @param key      The key.
+     * @param dataType The data type.
+     * @param <T>      The type.
+     * @param <Z>      The type.
+     * @return The value, or null if not found.
+     */
+    @Nullable <T, Z> Z get(@NotNull String key, @NotNull PersistentDataType<T, Z> dataType);
+
+    /**
+     * Get a value or default if not present.
+     *
+     * @param key          The key.
+     * @param dataType     The data type.
+     * @param defaultValue The default value.
+     * @param <T>          The type.
+     * @param <Z>          The type.
+     * @return The value, or the default if not found.
+     */
+    @NotNull <T, Z> Z getOrDefault(@NotNull String key, @NotNull PersistentDataType<T, Z> dataType, @NotNull Z defaultValue);
+
+    /**
+     * Get all keys, including namespaced keys.
+     *
+     * @return The keys.
+     */
+    @NotNull
+    Set<String> getAllKeys();
+
+    /**
+     * Remove a key.
+     *
+     * @param key The key.
+     */
+    void remove(@NotNull String key);
+
+    /**
+     * Get the base PDC.
+     *
+     * @return The base.
+     */
+    @NotNull
+    PersistentDataContainer getBase();
+
+    /**
+     * Get extension for PersistentDataContainers to add non-namespaced keys.
+     *
+     * @param base The base container.
+     * @return The extended container.
+     */
+    static ExtendedPersistentDataContainer extend(@NotNull PersistentDataContainer base) {
+        return Eco.getHandler().adaptPdc(base);
+    }
+
+    /**
+     * Create a new extended container.
+     *
+     * @return The extended container.
+     */
+    static ExtendedPersistentDataContainer create() {
+        return extend(Eco.getHandler().newPdc());
+    }
+}

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

@@ -5,6 +5,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * All storable data key types.
@@ -79,6 +80,22 @@ public final class PersistentDataKeyType<T> {
         this.name = name;
     }
 
+    @Override
+    public boolean equals(@Nullable final Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (!(that instanceof PersistentDataKeyType type)) {
+            return false;
+        }
+        return Objects.equals(this.name, type.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.name);
+    }
+
     /**
      * Get all registered {@link PersistentDataKeyType}s.
      *

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

@@ -113,52 +113,6 @@ public final class Display {
         handler.registerDisplayModule(module);
     }
 
-    /**
-     * Initialize the display system.
-     *
-     * @param handler The handler.
-     */
-    @ApiStatus.Internal
-    public static void init(@NotNull final DisplayHandler handler) {
-        if (Display.handler != null) {
-            throw new IllegalArgumentException("Already Initialized!");
-        }
-        Display.handler = handler;
-    }
-
-    /**
-     * Extremely janky method - also internal, so don't use it. <b>This method is
-     * NOT part of the API and may be removed at any time!</b>
-     * <p>
-     * This calls a display module with the specified parameters, now
-     * you might ask why I need a static java method when the DisplayHandler
-     * implementation could just call it itself? Well, kotlin doesn't really
-     * like dealing with vararg ambiguity, and so while kotlin can't figure out
-     * what is and isn't a vararg when I call display with a player, java can.
-     * <p>
-     * Because of this, I need to have this part of the code in java.
-     *
-     * <b>Don't call this method as part of your plugins!</b>
-     * <p>
-     * No, seriously - don't. This skips a bunch of checks and you'll almost
-     * definitely break something.
-     *
-     * @param module    The display module.
-     * @param itemStack The ItemStack.
-     * @param player    The player.
-     * @param args      The args.
-     */
-    @ApiStatus.Internal
-    public static void callDisplayModule(@NotNull final DisplayModule module,
-                                         @NotNull final ItemStack itemStack,
-                                         @Nullable final Player player,
-                                         @NotNull final Object... args) {
-        module.display(itemStack, args);
-        if (player != null) {
-            module.display(itemStack, player, args);
-        }
-    }
-
     /**
      * Set the display handler.
      * <p>

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

@@ -14,7 +14,7 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
     /**
      * The priority of the module.
      */
-    private final DisplayPriority priority;
+    private final int weight;
 
     /**
      * Create a new display module.
@@ -25,7 +25,19 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
     protected DisplayModule(@NotNull final EcoPlugin plugin,
                             @NotNull final DisplayPriority priority) {
         super(plugin);
-        this.priority = priority;
+        this.weight = priority.getWeight();
+    }
+
+    /**
+     * Create a new display module.
+     *
+     * @param plugin The plugin that the display is for.
+     * @param weight The weight/priority of the module.
+     */
+    protected DisplayModule(@NotNull final EcoPlugin plugin,
+                            final int weight) {
+        super(plugin);
+        this.weight = weight;
     }
 
     /**
@@ -84,8 +96,25 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      * Get the display priority.
      *
      * @return The priority.
+     * @deprecated Use getWeight instead.
      */
+    @Deprecated(since = "6.35.0", forRemoval = true)
     public DisplayPriority getPriority() {
-        return this.priority;
+        return switch (this.weight) {
+            case 100 -> DisplayPriority.LOWEST;
+            case 200 -> DisplayPriority.LOW;
+            case 300 -> DisplayPriority.HIGH;
+            case 400 -> DisplayPriority.HIGHEST;
+            default -> DisplayPriority.CUSTOM;
+        };
+    }
+
+    /**
+     * Get the display weight.
+     *
+     * @return The weight.
+     */
+    public int getWeight() {
+        return this.weight;
     }
 }

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

@@ -4,23 +4,51 @@ package com.willfp.eco.core.display;
  * The priority (order) of display modules.
  */
 public enum DisplayPriority {
+    /**
+     * Custom weight.
+     */
+    CUSTOM(250),
+
     /**
      * Ran first.
      */
-    LOWEST,
+    LOWEST(100),
 
     /**
      * Ran second.
      */
-    LOW,
+    LOW(200),
 
     /**
      * Ran third.
      */
-    HIGH,
+    HIGH(300),
 
     /**
      * Ran last.
      */
-    HIGHEST
+    HIGHEST(400);
+
+    /**
+     * The display priority weight.
+     */
+    private final int weight;
+
+    /**
+     * Create new display priority.
+     *
+     * @param weight The weight.
+     */
+    DisplayPriority(final int weight) {
+        this.weight = weight;
+    }
+
+    /**
+     * Get the weight.
+     *
+     * @return The weight.
+     */
+    public int getWeight() {
+        return weight;
+    }
 }

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

@@ -13,5 +13,6 @@ public interface NamespacedKeyFactory {
      * @param key The key in the {@link NamespacedKey}.
      * @return The created {@link NamespacedKey}.
      */
+    @NotNull
     NamespacedKey create(@NotNull String key);
 }

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

@@ -1,10 +1,13 @@
 package com.willfp.eco.core.fast;
 
 import com.willfp.eco.core.Eco;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataHolder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -16,7 +19,7 @@ import java.util.Set;
 /**
  * FastItemStack contains methods to modify and read items faster than in default bukkit.
  */
-public interface FastItemStack {
+public interface FastItemStack extends PersistentDataHolder {
     /**
      * Get all enchantments on an item.
      *
@@ -24,7 +27,7 @@ public interface FastItemStack {
      * @return A map of all enchantments.
      * @deprecated Poorly named method. Use getEnchants instead.
      */
-    @Deprecated(since = "6.24.0")
+    @Deprecated(since = "6.24.0", forRemoval = true)
     default Map<Enchantment, Integer> getEnchantmentsOnItem(boolean checkStored) {
         return getEnchants(checkStored);
     }
@@ -45,17 +48,54 @@ public interface FastItemStack {
      * @param checkStored If stored enchantments should be accounted for.
      * @return A map of all enchantments.
      */
+    @NotNull
     Map<Enchantment, Integer> getEnchants(boolean checkStored);
 
+    /**
+     * Get the level of an enchantment on an item.
+     *
+     * @param enchantment The enchantment.
+     * @return The enchantment level, or 0 if not found.
+     * @deprecated Poorly named method. Use getEnchantmentLevel instead.
+     */
+    @Deprecated(since = "6.34.0", forRemoval = true)
+    default int getLevelOnItem(@NotNull Enchantment enchantment) {
+        return getEnchantmentLevel(enchantment, false);
+    }
+
     /**
      * Get the level of an enchantment on an item.
      *
      * @param enchantment The enchantment.
      * @param checkStored If the stored NBT should also be checked.
      * @return The enchantment level, or 0 if not found.
+     * @deprecated Poorly named method. Use getEnchantmentLevel instead.
      */
-    int getLevelOnItem(@NotNull Enchantment enchantment,
-                       boolean checkStored);
+    @Deprecated(since = "6.34.0", forRemoval = true)
+    default int getLevelOnItem(@NotNull Enchantment enchantment,
+                               boolean checkStored) {
+        return getEnchantmentLevel(enchantment, checkStored);
+    }
+
+    /**
+     * Get the level of an enchantment.
+     *
+     * @param enchantment The enchantment.
+     * @return The enchantment level, or 0 if not found.
+     */
+    default int getEnchantmentLevel(@NotNull Enchantment enchantment) {
+        return getLevelOnItem(enchantment, false);
+    }
+
+    /**
+     * Get the level of an enchantment.
+     *
+     * @param enchantment The enchantment.
+     * @param checkStored If the stored NBT should also be checked.
+     * @return The enchantment level, or 0 if not found.
+     */
+    int getEnchantmentLevel(@NotNull Enchantment enchantment,
+                            boolean checkStored);
 
     /**
      * Set the item lore.
@@ -64,6 +104,13 @@ public interface FastItemStack {
      */
     void setLore(@Nullable List<String> lore);
 
+    /**
+     * Set the item lore.
+     *
+     * @param lore The lore.
+     */
+    void setLoreComponents(@Nullable List<Component> lore);
+
     /**
      * Get the item lore.
      *
@@ -71,6 +118,40 @@ public interface FastItemStack {
      */
     List<String> getLore();
 
+    /**
+     * Get the item lore.
+     *
+     * @return The lore.
+     */
+    List<Component> getLoreComponents();
+
+    /**
+     * Set the item name.
+     *
+     * @param name The name.
+     */
+    void setDisplayName(@Nullable Component name);
+
+    /**
+     * Set the item name.
+     *
+     * @param name The name.
+     */
+    void setDisplayName(@Nullable String name);
+
+    /**
+     * Get the item display name.
+     *
+     * @return The display name.
+     */
+    Component getDisplayNameComponent();
+
+    /**
+     * Get the item display name.
+     *
+     * @return The display name.
+     */
+    String getDisplayName();
 
     /**
      * Set the rework penalty.
@@ -81,7 +162,6 @@ public interface FastItemStack {
 
     /**
      * Get the rework penalty.
-     * .
      *
      * @return The rework penalty found on the item.
      */
@@ -116,11 +196,72 @@ public interface FastItemStack {
      */
     boolean hasItemFlag(@NotNull ItemFlag flag);
 
+    /**
+     * Get the base NBT tag (Not PublicBukkitValues, the base) as a PersistentDataContainer.
+     * <p>
+     * The returned PersistentDataContainer will not modify the item until the tag is set.
+     *
+     * @return The base NBT tag.
+     */
+    PersistentDataContainer getBaseTag();
+
+    /**
+     * Set the base NBT tag (Not PublicBukkitValues, the base) from a PersistentDataContainer.
+     *
+     * @param container The PersistentDataContainer.
+     */
+    void setBaseTag(@Nullable PersistentDataContainer container);
+
+    /**
+     * Get the type of the item.
+     *
+     * @return The type.
+     */
+    @NotNull
+    Material getType();
+
+    /**
+     * Set the type of the item.
+     *
+     * @param material The type.
+     */
+    void setType(@NotNull Material material);
+
+    /**
+     * Get the amount of the item.
+     *
+     * @return The amount.
+     */
+    int getAmount();
+
+    /**
+     * Set the amount of the item.
+     *
+     * @param amount The amount.
+     */
+    void setAmount(int amount);
+
+    /**
+     * Get the custom model data.
+     *
+     * @return The data, or null if none.
+     */
+    @Nullable
+    Integer getCustomModelData();
+
+    /**
+     * Set the custom model data.
+     *
+     * @param data The data, null to remove.
+     */
+    void setCustomModelData(@Nullable Integer data);
+
     /**
      * Get the Bukkit ItemStack again.
      *
      * @return The ItemStack.
      */
+    @NotNull
     ItemStack unwrap();
 
     /**

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

@@ -11,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -59,6 +60,53 @@ public interface Menu {
      */
     List<ItemStack> getCaptiveItems(@NotNull Player player);
 
+    /**
+     * Add state for a player.
+     *
+     * @param player The player.
+     * @param key    The key.
+     * @param value  The state.
+     */
+    void addState(@NotNull Player player,
+                  @NotNull String key,
+                  @Nullable Object value);
+
+    /**
+     * Remove state for a player.
+     *
+     * @param player The player.
+     * @param key    The key.
+     */
+    void removeState(@NotNull Player player,
+                     @NotNull String key);
+
+    /**
+     * Clear state for a player.
+     *
+     * @param player The player.
+     */
+    void clearState(@NotNull Player player);
+
+
+    /**
+     * Get state for a player.
+     *
+     * @param player The player.
+     * @param key    The key.
+     * @param <T>    The type of state.
+     * @return The value.
+     */
+    @Nullable <T> T getState(@NotNull Player player,
+                             @NotNull String key);
+
+    /**
+     * Get state for a player.
+     *
+     * @param player The player.
+     * @return The state.
+     */
+    Map<String, Object> getState(@NotNull Player player);
+
     /**
      * Write data.
      *
@@ -68,7 +116,9 @@ public interface Menu {
      * @param value  The value.
      * @param <T>    The type.
      * @param <Z>    The type.
+     * @deprecated Use addState instead.
      */
+    @Deprecated(since = "6.35.0", forRemoval = true)
     <T, Z> void writeData(@NotNull Player player,
                           @NotNull NamespacedKey key,
                           @NotNull PersistentDataType<T, Z> type,
@@ -83,7 +133,9 @@ public interface Menu {
      * @param <T>    The type.
      * @param <Z>    The type.
      * @return The data.
+     * @deprecated Use getState instead.
      */
+    @Deprecated(since = "6.35.0", forRemoval = true)
     @Nullable <T, Z> T readData(@NotNull Player player,
                                 @NotNull NamespacedKey key,
                                 @NotNull PersistentDataType<T, Z> type);
@@ -93,7 +145,9 @@ public interface Menu {
      *
      * @param player The player.
      * @return The keys.
+     * @deprecated Use getState instead.
      */
+    @Deprecated(since = "6.35.0", forRemoval = true)
     Set<NamespacedKey> getKeys(@NotNull Player player);
 
     /**

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

@@ -2,9 +2,11 @@ package com.willfp.eco.core.gui.menu;
 
 import com.willfp.eco.core.gui.slot.FillerMask;
 import com.willfp.eco.core.gui.slot.Slot;
+import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 /**
@@ -66,6 +68,14 @@ public interface MenuBuilder {
      */
     MenuBuilder onClose(@NotNull CloseHandler action);
 
+    /**
+     * Set the action to run on render.
+     *
+     * @param action The action.
+     * @return The builder.
+     */
+    MenuBuilder onRender(@NotNull BiConsumer<Player, Menu> action);
+
     /**
      * Build the menu.
      *

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

@@ -0,0 +1,18 @@
+package com.willfp.eco.core.integrations.afk;
+
+import com.willfp.eco.core.integrations.Integration;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * AFK Integration.
+ */
+public interface AFKIntegration extends Integration {
+    /**
+     * Get if a player is afk.
+     *
+     * @param player The player.
+     * @return If afk.
+     */
+    boolean isAfk(@NotNull Player player);
+}

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

@@ -13,14 +13,15 @@ public final class AFKManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<AFKWrapper> REGISTERED = new HashSet<>();
+    private static final Set<AFKIntegration> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public static void register(@NotNull final AFKWrapper integration) {
+    public static void register(@NotNull final AFKIntegration integration) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
         REGISTERED.add(integration);
     }
 
@@ -31,8 +32,8 @@ public final class AFKManager {
      * @return If afk.
      */
     public static boolean isAfk(@NotNull final Player player) {
-        for (AFKWrapper afkWrapper : REGISTERED) {
-            if (afkWrapper.isAfk(player)) {
+        for (AFKIntegration integration : REGISTERED) {
+            if (integration.isAfk(player)) {
                 return true;
             }
         }

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

@@ -1,18 +1,11 @@
 package com.willfp.eco.core.integrations.afk;
 
-import com.willfp.eco.core.integrations.Integration;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Wrapper class for afk integrations.
+ *
+ * @deprecated Use AFKIntegration instead.
  */
-public interface AFKWrapper extends Integration {
-    /**
-     * Get if a player is afk.
-     *
-     * @param player The player.
-     * @return If afk.
-     */
-    boolean isAfk(@NotNull Player player);
+@Deprecated(since = "6.35.0", forRemoval = true)
+public interface AFKWrapper extends AFKIntegration {
+
 }

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

@@ -0,0 +1,24 @@
+package com.willfp.eco.core.integrations.anticheat;
+
+import com.willfp.eco.core.integrations.Integration;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Wrapper class for anticheat integrations.
+ */
+public interface AnticheatIntegration extends Integration {
+    /**
+     * Exempt a player from checks.
+     *
+     * @param player The player to exempt.
+     */
+    void exempt(@NotNull Player player);
+
+    /**
+     * Unexempt a player from checks.
+     *
+     * @param player The player to unexempt.
+     */
+    void unexempt(@NotNull Player player);
+}

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.integrations.anticheat;
 
+import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
@@ -15,19 +16,31 @@ public final class AnticheatManager {
     /**
      * A set of all registered anticheats.
      */
-    private static final Set<AnticheatWrapper> ANTICHEATS = new HashSet<>();
+    private static final Set<AnticheatIntegration> ANTICHEATS = new HashSet<>();
 
     /**
      * Register a new anticheat.
      *
      * @param plugin    The plugin.
      * @param anticheat The anticheat to register.
+     * @deprecated Don't pass instance of eco.
      */
+    @Deprecated(since = "6.35.0", forRemoval = true)
     public static void register(@NotNull final EcoPlugin plugin,
-                                @NotNull final AnticheatWrapper anticheat) {
+                                @NotNull final AnticheatIntegration anticheat) {
+        register(anticheat);
+    }
+
+    /**
+     * Register a new anticheat.
+     *
+     * @param anticheat The anticheat to register.
+     */
+    public static void register(@NotNull final AnticheatIntegration anticheat) {
         if (anticheat instanceof Listener) {
-            plugin.getEventManager().registerListener((Listener) anticheat);
+            Eco.getHandler().getEcoPlugin().getEventManager().registerListener((Listener) anticheat);
         }
+        ANTICHEATS.removeIf(it -> it.getPluginName().equalsIgnoreCase(anticheat.getPluginName()));
         ANTICHEATS.add(anticheat);
     }
 

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

@@ -1,24 +1,11 @@
 package com.willfp.eco.core.integrations.anticheat;
 
-import com.willfp.eco.core.integrations.Integration;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Wrapper class for anticheat integrations.
+ *
+ * @deprecated Use AnticheatIntegration instead.
  */
-public interface AnticheatWrapper extends Integration {
-    /**
-     * Exempt a player from checks.
-     *
-     * @param player The player to exempt.
-     */
-    void exempt(@NotNull Player player);
+@Deprecated(since = "6.35.0", forRemoval = true)
+public interface AnticheatWrapper extends AnticheatIntegration {
 
-    /**
-     * Unexempt a player from checks.
-     *
-     * @param player The player to unexempt.
-     */
-    void unexempt(@NotNull Player player);
 }

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

@@ -0,0 +1,60 @@
+package com.willfp.eco.core.integrations.antigrief;
+
+import com.willfp.eco.core.integrations.Integration;
+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.
+ */
+public interface AntigriefIntegration extends Integration {
+    /**
+     * Can player break block.
+     *
+     * @param player The player.
+     * @param block  The block.
+     * @return If player can break block.
+     */
+    boolean canBreakBlock(@NotNull Player player, @NotNull Block block);
+
+    /**
+     * Can player create explosion at location.
+     *
+     * @param player   The player.
+     * @param location The location.
+     * @return If player can create explosion.
+     */
+    boolean canCreateExplosion(@NotNull Player player, @NotNull Location location);
+
+    /**
+     * Can player place block.
+     *
+     * @param player The player.
+     * @param block  The block.
+     * @return If player can place block.
+     */
+    boolean canPlaceBlock(@NotNull Player player, @NotNull Block block);
+
+    /**
+     * Can player injure living entity.
+     *
+     * @param player The player.
+     * @param victim The victim.
+     * @return If player can injure.
+     */
+    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/antigrief/AntigriefManager.java

@@ -16,14 +16,15 @@ public final class AntigriefManager {
     /**
      * Registered antigriefs.
      */
-    private static final Set<AntigriefWrapper> REGISTERED = new HashSet<>();
+    private static final Set<AntigriefIntegration> REGISTERED = new HashSet<>();
 
     /**
      * Register a new AntiGrief/Land Management integration.
      *
      * @param antigrief The integration to register.
      */
-    public static void register(@NotNull final AntigriefWrapper antigrief) {
+    public static void register(@NotNull final AntigriefIntegration antigrief) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(antigrief.getPluginName()));
         REGISTERED.add(antigrief);
     }
 
@@ -32,7 +33,7 @@ public final class AntigriefManager {
      *
      * @param antigrief The integration to unregister.
      */
-    public static void unregister(@NotNull final AntigriefWrapper antigrief) {
+    public static void unregister(@NotNull final AntigriefIntegration antigrief) {
         REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(antigrief.getPluginName()));
         REGISTERED.remove(antigrief);
     }
@@ -46,7 +47,7 @@ public final class AntigriefManager {
      */
     public static boolean canPickupItem(@NotNull final Player player,
                                         @NotNull final Location location) {
-        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canPickupItem(player, location));
+        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canPickupItem(player, location));
     }
 
     /**
@@ -58,7 +59,7 @@ public final class AntigriefManager {
      */
     public static boolean canBreakBlock(@NotNull final Player player,
                                         @NotNull final Block block) {
-        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canBreakBlock(player, block));
+        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canBreakBlock(player, block));
     }
 
     /**
@@ -70,7 +71,7 @@ public final class AntigriefManager {
      */
     public static boolean canCreateExplosion(@NotNull final Player player,
                                              @NotNull final Location location) {
-        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canCreateExplosion(player, location));
+        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canCreateExplosion(player, location));
     }
 
     /**
@@ -82,7 +83,7 @@ public final class AntigriefManager {
      */
     public static boolean canPlaceBlock(@NotNull final Player player,
                                         @NotNull final Block block) {
-        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canPlaceBlock(player, block));
+        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canPlaceBlock(player, block));
     }
 
     /**
@@ -94,7 +95,7 @@ public final class AntigriefManager {
      */
     public static boolean canInjure(@NotNull final Player player,
                                     @NotNull final LivingEntity victim) {
-        return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canInjure(player, victim));
+        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canInjure(player, victim));
     }
 
     private AntigriefManager() {

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

@@ -1,60 +1,11 @@
 package com.willfp.eco.core.integrations.antigrief;
 
-import com.willfp.eco.core.integrations.Integration;
-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.
+ *
+ * @deprecated Use AntigriefIntegration instead.
  */
-public interface AntigriefWrapper extends Integration {
-    /**
-     * Can player break block.
-     *
-     * @param player The player.
-     * @param block  The block.
-     * @return If player can break block.
-     */
-    boolean canBreakBlock(@NotNull Player player, @NotNull Block block);
+@Deprecated(since = "6.35.0", forRemoval = true)
+public interface AntigriefWrapper extends AntigriefIntegration {
 
-    /**
-     * Can player create explosion at location.
-     *
-     * @param player   The player.
-     * @param location The location.
-     * @return If player can create explosion.
-     */
-    boolean canCreateExplosion(@NotNull Player player, @NotNull Location location);
-
-    /**
-     * Can player place block.
-     *
-     * @param player The player.
-     * @param block  The block.
-     * @return If player can place block.
-     */
-    boolean canPlaceBlock(@NotNull Player player, @NotNull Block block);
-
-    /**
-     * Can player injure living entity.
-     *
-     * @param player The player.
-     * @param victim The victim.
-     * @return If player can injure.
-     */
-    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/CustomEntitiesIntegration.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 CustomEntitiesIntegration 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/customentities/CustomEntitiesManager.java

@@ -12,14 +12,15 @@ public final class CustomEntitiesManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<CustomEntitiesWrapper> REGISTERED = new HashSet<>();
+    private static final Set<CustomEntitiesIntegration> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public static void register(@NotNull final CustomEntitiesWrapper integration) {
+    public static void register(@NotNull final CustomEntitiesIntegration integration) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
         REGISTERED.add(integration);
     }
 
@@ -29,8 +30,8 @@ public final class CustomEntitiesManager {
      * @see com.willfp.eco.core.entities.Entities
      */
     public static void registerAllEntities() {
-        for (CustomEntitiesWrapper wrapper : REGISTERED) {
-            wrapper.registerAllEntities();
+        for (CustomEntitiesIntegration integration : REGISTERED) {
+            integration.registerAllEntities();
         }
     }
 

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

@@ -1,15 +1,11 @@
 package com.willfp.eco.core.integrations.customentities;
 
-import com.willfp.eco.core.integrations.Integration;
-
 /**
  * Wrapper class for custom item integrations.
+ *
+ * @deprecated Use CustomEntitiesIntegration instead.
  */
-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();
+@Deprecated(since = "6.35.0", forRemoval = true)
+public interface CustomEntitiesWrapper extends CustomEntitiesIntegration {
+
 }

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

@@ -0,0 +1,24 @@
+package com.willfp.eco.core.integrations.customitems;
+
+import com.willfp.eco.core.integrations.Integration;
+
+/**
+ * Wrapper class for custom item integrations.
+ */
+public interface CustomItemsIntegration extends Integration {
+    /**
+     * Register all the custom items for a specific plugin into eco.
+     *
+     * @see com.willfp.eco.core.items.Items
+     */
+    default void registerAllItems() {
+        // Override when needed.
+    }
+
+    /**
+     * Register {@link com.willfp.eco.core.items.provider.ItemProvider}s.
+     */
+    default void registerProvider() {
+        // Override when needed.
+    }
+}

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

@@ -12,14 +12,15 @@ public final class CustomItemsManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<CustomItemsWrapper> REGISTERED = new HashSet<>();
+    private static final Set<CustomItemsIntegration> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public static void register(@NotNull final CustomItemsWrapper integration) {
+    public static void register(@NotNull final CustomItemsIntegration integration) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
         REGISTERED.add(integration);
     }
 
@@ -29,8 +30,19 @@ public final class CustomItemsManager {
      * @see com.willfp.eco.core.items.Items
      */
     public static void registerAllItems() {
-        for (CustomItemsWrapper customItemsWrapper : REGISTERED) {
-            customItemsWrapper.registerAllItems();
+        for (CustomItemsIntegration customItemsIntegration : REGISTERED) {
+            customItemsIntegration.registerAllItems();
+        }
+    }
+
+    /**
+     * Register all the custom items for a specific plugin into eco.
+     *
+     * @see com.willfp.eco.core.items.Items
+     */
+    public static void registerProviders() {
+        for (CustomItemsIntegration customItemsIntegration : REGISTERED) {
+            customItemsIntegration.registerProvider();
         }
     }
 

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

@@ -1,15 +1,11 @@
 package com.willfp.eco.core.integrations.customitems;
 
-import com.willfp.eco.core.integrations.Integration;
-
 /**
  * Wrapper class for custom item integrations.
+ *
+ * @deprecated Use CustomItemsIntegration instead.
  */
-public interface CustomItemsWrapper extends Integration {
-    /**
-     * Register all the custom items for a specific plugin into eco.
-     *
-     * @see com.willfp.eco.core.items.Items
-     */
-    void registerAllItems();
+@Deprecated(since = "6.35.0", forRemoval = true)
+public interface CustomItemsWrapper extends CustomItemsIntegration {
+
 }

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

@@ -0,0 +1,48 @@
+package com.willfp.eco.core.integrations.economy;
+
+import com.willfp.eco.core.integrations.Integration;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Wrapper class for economy integrations.
+ */
+public interface EconomyIntegration extends Integration {
+    /**
+     * Get if a player has a certain amount.
+     *
+     * @param player The player.
+     * @param amount The amount.
+     * @return If the player has the amount.
+     */
+    boolean hasAmount(@NotNull OfflinePlayer player,
+                      double amount);
+
+    /**
+     * Give money to a player.
+     *
+     * @param player The player.
+     * @param amount The amount to give.
+     * @return If the transaction was a success.
+     */
+    boolean giveMoney(@NotNull OfflinePlayer player,
+                      double amount);
+
+    /**
+     * Remove money from a player.
+     *
+     * @param player The player.
+     * @param amount The amount to remove.
+     * @return If the transaction was a success.
+     */
+    boolean removeMoney(@NotNull OfflinePlayer player,
+                        double amount);
+
+    /**
+     * Get the balance of a player.
+     *
+     * @param player The player.
+     * @return The balance.
+     */
+    double getBalance(@NotNull OfflinePlayer player);
+}

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

@@ -13,14 +13,15 @@ public final class EconomyManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<EconomyWrapper> REGISTERED = new HashSet<>();
+    private static final Set<EconomyIntegration> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public static void register(@NotNull final EconomyWrapper integration) {
+    public static void register(@NotNull final EconomyIntegration integration) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
         REGISTERED.add(integration);
     }
 
@@ -42,8 +43,8 @@ public final class EconomyManager {
      */
     public static boolean hasAmount(@NotNull final OfflinePlayer player,
                                     final double amount) {
-        for (EconomyWrapper wrapper : REGISTERED) {
-            return wrapper.hasAmount(player, amount);
+        for (EconomyIntegration integration : REGISTERED) {
+            return integration.hasAmount(player, amount);
         }
 
         return false;
@@ -58,8 +59,8 @@ public final class EconomyManager {
      */
     public static boolean giveMoney(@NotNull final OfflinePlayer player,
                                     final double amount) {
-        for (EconomyWrapper wrapper : REGISTERED) {
-            return wrapper.giveMoney(player, amount);
+        for (EconomyIntegration integration : REGISTERED) {
+            return integration.giveMoney(player, amount);
         }
 
         return false;
@@ -74,8 +75,8 @@ public final class EconomyManager {
      */
     public static boolean removeMoney(@NotNull final OfflinePlayer player,
                                       final double amount) {
-        for (EconomyWrapper wrapper : REGISTERED) {
-            return wrapper.removeMoney(player, amount);
+        for (EconomyIntegration integration : REGISTERED) {
+            return integration.removeMoney(player, amount);
         }
 
         return false;
@@ -88,8 +89,8 @@ public final class EconomyManager {
      * @return The balance.
      */
     public static double getBalance(@NotNull final OfflinePlayer player) {
-        for (EconomyWrapper wrapper : REGISTERED) {
-            return wrapper.getBalance(player);
+        for (EconomyIntegration integration : REGISTERED) {
+            return integration.getBalance(player);
         }
 
         return 0;

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

@@ -1,48 +1,11 @@
 package com.willfp.eco.core.integrations.economy;
 
-import com.willfp.eco.core.integrations.Integration;
-import org.bukkit.OfflinePlayer;
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Wrapper class for economy integrations.
+ *
+ * @deprecated Use EconomyIntegration instead.
  */
-public interface EconomyWrapper extends Integration {
-    /**
-     * Get if a player has a certain amount.
-     *
-     * @param player The player.
-     * @param amount The amount.
-     * @return If the player has the amount.
-     */
-    boolean hasAmount(@NotNull OfflinePlayer player,
-                      double amount);
+@Deprecated(since = "6.35.0", forRemoval = true)
+public interface EconomyWrapper extends EconomyIntegration {
 
-    /**
-     * Give money to a player.
-     *
-     * @param player The player.
-     * @param amount The amount to give.
-     * @return If the transaction was a success.
-     */
-    boolean giveMoney(@NotNull OfflinePlayer player,
-                      double amount);
-
-    /**
-     * Remove money from a player.
-     *
-     * @param player The player.
-     * @param amount The amount to remove.
-     * @return If the transaction was a success.
-     */
-    boolean removeMoney(@NotNull OfflinePlayer player,
-                        double amount);
-
-    /**
-     * Get the balance of a player.
-     *
-     * @param player The player.
-     * @return The balance.
-     */
-    double getBalance(@NotNull OfflinePlayer player);
 }

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

@@ -0,0 +1,22 @@
+package com.willfp.eco.core.integrations.hologram;
+
+import com.willfp.eco.core.integrations.Integration;
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Wrapper class for hologram integrations.
+ */
+public interface HologramIntegration extends Integration {
+    /**
+     * Create hologram.
+     *
+     * @param location The location.
+     * @param contents The contents for the hologram.
+     * @return The hologram.
+     */
+    Hologram createHologram(@NotNull Location location,
+                            @NotNull List<String> contents);
+}

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

@@ -14,14 +14,15 @@ public final class HologramManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<HologramWrapper> REGISTERED = new HashSet<>();
+    private static final Set<HologramIntegration> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public static void register(@NotNull final HologramWrapper integration) {
+    public static void register(@NotNull final HologramIntegration integration) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
         REGISTERED.add(integration);
     }
 
@@ -34,8 +35,8 @@ public final class HologramManager {
      */
     public static Hologram createHologram(@NotNull final Location location,
                                           @NotNull final List<String> contents) {
-        for (HologramWrapper wrapper : REGISTERED) {
-            return wrapper.createHologram(location, contents);
+        for (HologramIntegration integration : REGISTERED) {
+            return integration.createHologram(location, contents);
         }
 
         return new DummyHologram();

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

@@ -1,22 +1,11 @@
 package com.willfp.eco.core.integrations.hologram;
 
-import com.willfp.eco.core.integrations.Integration;
-import org.bukkit.Location;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
 /**
  * Wrapper class for hologram integrations.
+ *
+ * @deprecated Use HologramIntegration instead.
  */
-public interface HologramWrapper extends Integration {
-    /**
-     * Create hologram.
-     *
-     * @param location The location.
-     * @param contents The contents for the hologram.
-     * @return The hologram.
-     */
-    Hologram createHologram(@NotNull Location location,
-                            @NotNull List<String> contents);
+@Deprecated(since = "6.35.0", forRemoval = true)
+public interface HologramWrapper extends HologramIntegration {
+
 }

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

@@ -0,0 +1,27 @@
+package com.willfp.eco.core.integrations.mcmmo;
+
+import com.willfp.eco.core.integrations.Integration;
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Wrapper class for mcmmo integrations.
+ */
+public interface McmmoIntegration extends Integration {
+    /**
+     * Get bonus drop count of block.
+     *
+     * @param block The block.
+     * @return The drop multiplier.
+     */
+    int getBonusDropCount(@NotNull Block block);
+
+    /**
+     * Get if event is fake.
+     *
+     * @param event The event.
+     * @return If is fake.
+     */
+    boolean isFake(@NotNull Event event);
+}

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

@@ -14,14 +14,15 @@ public final class McmmoManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<McmmoWrapper> REGISTERED = new HashSet<>();
+    private static final Set<McmmoIntegration> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public static void register(@NotNull final McmmoWrapper integration) {
+    public static void register(@NotNull final McmmoIntegration integration) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
         REGISTERED.add(integration);
     }
 
@@ -32,8 +33,8 @@ public final class McmmoManager {
      * @return The bonus drop count.
      */
     public static int getBonusDropCount(@NotNull final Block block) {
-        for (McmmoWrapper mcmmoWrapper : REGISTERED) {
-            return mcmmoWrapper.getBonusDropCount(block);
+        for (McmmoIntegration mcmmoIntegration : REGISTERED) {
+            return mcmmoIntegration.getBonusDropCount(block);
         }
         return 0;
     }
@@ -45,8 +46,8 @@ public final class McmmoManager {
      * @return If the event is fake.
      */
     public static boolean isFake(@NotNull final Event event) {
-        for (McmmoWrapper mcmmoWrapper : REGISTERED) {
-            return mcmmoWrapper.isFake(event);
+        for (McmmoIntegration mcmmoIntegration : REGISTERED) {
+            return mcmmoIntegration.isFake(event);
         }
         return false;
     }

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

@@ -1,27 +1,11 @@
 package com.willfp.eco.core.integrations.mcmmo;
 
-import com.willfp.eco.core.integrations.Integration;
-import org.bukkit.block.Block;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Wrapper class for mcmmo integrations.
+ *
+ * @deprecated Use McmmoIntegration instead.
  */
-public interface McmmoWrapper extends Integration {
-    /**
-     * Get bonus drop count of block.
-     *
-     * @param block The block.
-     * @return The drop multiplier.
-     */
-    int getBonusDropCount(@NotNull Block block);
+@Deprecated(since = "6.35.0", forRemoval = true)
+public interface McmmoWrapper extends McmmoIntegration {
 
-    /**
-     * Get if event is fake.
-     *
-     * @param event The event.
-     * @return If is fake.
-     */
-    boolean isFake(@NotNull Event event);
 }

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

@@ -4,8 +4,11 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.placeholder.InjectablePlaceholder;
 import com.willfp.eco.core.placeholder.Placeholder;
+import com.willfp.eco.core.placeholder.PlaceholderInjectable;
 import com.willfp.eco.core.placeholder.PlayerPlaceholder;
+import com.willfp.eco.core.placeholder.PlayerStaticPlaceholder;
 import com.willfp.eco.core.placeholder.PlayerlessPlaceholder;
 import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import org.bukkit.entity.Player;
@@ -43,6 +46,21 @@ public final class PlaceholderManager {
             .expireAfterWrite(50, TimeUnit.MILLISECONDS)
             .build(key -> key.entry.getValue(key.player));
 
+    /**
+     * Empty injectable object.
+     */
+    private static final PlaceholderInjectable EMPTY_INJECTABLE = new PlaceholderInjectable() {
+        @Override
+        public void clearInjectedPlaceholders() {
+            // Do nothing.
+        }
+
+        @Override
+        public @NotNull List<InjectablePlaceholder> getPlaceholderInjections() {
+            return Collections.emptyList();
+        }
+    };
+
     /**
      * Register a new placeholder integration.
      *
@@ -144,7 +162,7 @@ public final class PlaceholderManager {
      */
     public static String translatePlaceholders(@NotNull final String text,
                                                @Nullable final Player player) {
-        return translatePlaceholders(text, player, Collections.emptyList());
+        return translatePlaceholders(text, player, EMPTY_INJECTABLE);
     }
 
     /**
@@ -154,17 +172,37 @@ public final class PlaceholderManager {
      * @param player  The player to translate the placeholders with respect to.
      * @param statics Extra static placeholders.
      * @return The text, translated.
+     * @deprecated Use new static system.
      */
+    @Deprecated(since = "6.35.0", forRemoval = true)
     public static String translatePlaceholders(@NotNull final String text,
                                                @Nullable final Player player,
                                                @NotNull final List<StaticPlaceholder> statics) {
+        return translatePlaceholders(text, player, EMPTY_INJECTABLE);
+    }
+
+    /**
+     * Translate all placeholders with respect to a player.
+     *
+     * @param text    The text that may contain placeholders to translate.
+     * @param player  The player to translate the placeholders with respect to.
+     * @param context The injectable context.
+     * @return The text, translated.
+     */
+    public static String translatePlaceholders(@NotNull final String text,
+                                               @Nullable final Player player,
+                                               @NotNull final PlaceholderInjectable context) {
         String processed = text;
         for (PlaceholderIntegration integration : REGISTERED_INTEGRATIONS) {
             processed = integration.translate(processed, player);
         }
-        for (StaticPlaceholder placeholder : statics) {
+        for (InjectablePlaceholder injection : context.getPlaceholderInjections()) {
             // Do I know this is a bad way of doing this? Yes.
-            processed = processed.replace("%" + placeholder.getIdentifier() + "%", placeholder.getValue());
+            if (injection instanceof StaticPlaceholder placeholder) {
+                processed = processed.replace("%" + placeholder.getIdentifier() + "%", placeholder.getValue());
+            } else if (injection instanceof PlayerStaticPlaceholder placeholder && player != null) {
+                processed = processed.replace("%" + placeholder.getIdentifier() + "%", placeholder.getValue(player));
+            }
         }
         return processed;
     }

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

@@ -0,0 +1,28 @@
+package com.willfp.eco.core.integrations.shop;
+
+import com.willfp.eco.core.integrations.Integration;
+import org.bukkit.event.Listener;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Wrapper class for shop integrations.
+ */
+public interface ShopIntegration extends Integration {
+    /**
+     * Register eco item provider for shop plugins.
+     */
+    default void registerEcoProvider() {
+        // Do nothing unless overridden.
+    }
+
+    /**
+     * Get the sell event adapter.
+     *
+     * @return The listener.
+     */
+    @Nullable
+    default Listener getSellEventAdapter() {
+        // Do nothing unless overridden.
+        return null;
+    }
+}

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

@@ -1,5 +1,8 @@
 package com.willfp.eco.core.integrations.shop;
 
+import com.willfp.eco.core.EcoPlugin;
+import org.bukkit.event.Listener;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
@@ -12,23 +15,40 @@ public final class ShopManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<ShopWrapper> REGISTERED = new HashSet<>();
+    private static final Set<ShopIntegration> REGISTERED = new HashSet<>();
 
     /**
      * Register a new integration.
      *
      * @param integration The integration to register.
      */
-    public static void register(@NotNull final ShopWrapper integration) {
+    public static void register(@NotNull final ShopIntegration integration) {
+        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
         REGISTERED.add(integration);
     }
 
+    /**
+     * Register the events with eco.
+     *
+     * @param plugin Instance of eco.
+     */
+    @ApiStatus.Internal
+    public static void registerEvents(@NotNull final EcoPlugin plugin) {
+        for (ShopIntegration integration : REGISTERED) {
+            Listener listener = integration.getSellEventAdapter();
+
+            if (listener != null) {
+                plugin.getEventManager().registerListener(listener);
+            }
+        }
+    }
+
     /**
      * Register eco item provider for shop plugins.
      */
     public static void registerEcoProvider() {
-        for (ShopWrapper shopWrapper : REGISTERED) {
-            shopWrapper.registerEcoProvider();
+        for (ShopIntegration shopIntegration : REGISTERED) {
+            shopIntegration.registerEcoProvider();
         }
     }
 

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

@@ -0,0 +1,104 @@
+package com.willfp.eco.core.integrations.shop;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Unified event for shop plugins to fire in order to have sell multipliers.
+ */
+public class ShopSellEvent extends PlayerEvent {
+    /**
+     * The event handler list.
+     */
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    /**
+     * The sell price.
+     */
+    private double price;
+
+    /**
+     * The item to be sold.
+     */
+    @Nullable
+    private final ItemStack item;
+
+    /**
+     * Create new shop sell event.
+     *
+     * @param who   The player.
+     * @param price The price.
+     * @param item  The item.
+     */
+    public ShopSellEvent(@NotNull final Player who,
+                         final double price,
+                         @Nullable final ItemStack item) {
+        super(who);
+
+        this.price = price;
+        this.item = item;
+    }
+
+    /**
+     * Get the price.
+     *
+     * @return The price.
+     */
+    public double getPrice() {
+        return this.price;
+    }
+
+    /**
+     * Set the price.
+     *
+     * @param price The price.
+     */
+    public void setPrice(final double price) {
+        this.price = price;
+    }
+
+    /**
+     * Get the item to be sold.
+     *
+     * @return The item. Can be null for some plugins, so check hasKnownItem first!
+     */
+    @Nullable
+    public ItemStack getItem() {
+        return item;
+    }
+
+    /**
+     * Get if the item is known. Some shop plugins are lacking this in their event,
+     * so always check this before getItem(), as getItem() may be null.
+     *
+     * @return If the item is known.
+     */
+    public boolean hasKnownItem() {
+        return item != null;
+    }
+
+    /**
+     * Bukkit parity.
+     *
+     * @return The handlers.
+     */
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    /**
+     * Bukkit parity.
+     *
+     * @return The handlers.
+     */
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+}

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

@@ -1,13 +1,11 @@
 package com.willfp.eco.core.integrations.shop;
 
-import com.willfp.eco.core.integrations.Integration;
-
 /**
  * Wrapper class for shop integrations.
+ *
+ * @deprecated Use ShopIntegration instead.
  */
-public interface ShopWrapper extends Integration {
-    /**
-     * Register eco item provider for shop plugins.
-     */
-    void registerEcoProvider();
+@Deprecated(since = "6.35.0", forRemoval = true)
+public interface ShopWrapper extends ShopIntegration {
+
 }

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

@@ -48,6 +48,11 @@ public class CustomItem implements TestableItem {
         this.test = test;
         this.item = item;
 
+        /*
+        This runs the next tick, because it's very likely that the test can't return true
+        immediately after due to registration order; so eco waits until the item should be
+        working in order to check.
+         */
         Eco.getHandler().getEcoPlugin().getScheduler().runLater(() -> {
             if (!matches(getItem())) {
                 Bukkit.getLogger().severe("Item with key " + key + " is invalid!");

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

@@ -2,6 +2,7 @@ package com.willfp.eco.core.items;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
+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;
@@ -13,8 +14,10 @@ import com.willfp.eco.util.NamespacedKeyUtils;
 import com.willfp.eco.util.NumberUtils;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -115,6 +118,48 @@ public final class Items {
         REGISTRY.remove(key);
     }
 
+    /**
+     * Turn an ItemStack back into a lookup string.
+     *
+     * @param itemStack The ItemStack.
+     * @return The lookup string.
+     */
+    @NotNull
+    public static String toLookupString(@Nullable final ItemStack itemStack) {
+        if (itemStack == null) {
+            return "";
+        }
+
+        StringBuilder builder = new StringBuilder();
+
+        CustomItem customItem = getCustomItem(itemStack);
+
+        if (customItem != null) {
+            builder.append(customItem.getKey());
+        } else {
+            builder.append(itemStack.getType().name().toLowerCase());
+        }
+
+        if (itemStack.getAmount() > 1) {
+            builder.append(" ")
+                    .append(itemStack.getAmount());
+        }
+
+        ItemMeta meta = itemStack.getItemMeta();
+
+        if (meta != null) {
+            for (LookupArgParser parser : ARG_PARSERS) {
+                String parsed = parser.serializeBack(meta);
+                if (parsed != null) {
+                    builder.append(" ")
+                            .append(parsed);
+                }
+            }
+        }
+
+        return builder.toString();
+    }
+
     /**
      * This is the backbone of the entire eco item system.
      * <p>
@@ -388,6 +433,90 @@ public final class Items {
         return items;
     }
 
+    /**
+     * Merge ItemStack onto another ItemStack.
+     *
+     * @param from The ItemStack to merge from.
+     * @param to   The ItemStack to merge onto.
+     * @return The ItemStack, merged (same instance as to).
+     */
+    @NotNull
+    public static ItemStack mergeFrom(@NotNull final ItemStack from,
+                                      @NotNull final ItemStack to) {
+        ItemMeta fromMeta = from.getItemMeta();
+        ItemMeta toMeta = to.getItemMeta();
+
+        if (fromMeta == null || toMeta == null) {
+            return to;
+        }
+
+        ItemMeta newMeta = mergeFrom(fromMeta, toMeta);
+
+        to.setItemMeta(newMeta);
+        to.setType(from.getType());
+        to.setAmount(from.getAmount());
+        return to;
+    }
+
+    /**
+     * Merge ItemMeta onto other ItemMeta.
+     *
+     * @param from The ItemMeta to merge from.
+     * @param to   The ItemMeta to merge onto.
+     * @return The ItemMeta, merged (same instance as to).
+     */
+    @NotNull
+    public static ItemMeta mergeFrom(@NotNull final ItemMeta from,
+                                     @NotNull final ItemMeta to) {
+        if (from.hasDisplayName()) {
+            to.setDisplayName(from.getDisplayName());
+        }
+
+        to.setLore(from.getLore());
+
+        for (Enchantment enchant : to.getEnchants().keySet()) {
+            to.removeEnchant(enchant);
+        }
+
+        for (Map.Entry<Enchantment, Integer> entry : from.getEnchants().entrySet()) {
+            to.addEnchant(entry.getKey(), entry.getValue(), true);
+        }
+
+        if (from.hasCustomModelData()) {
+            to.setCustomModelData(from.getCustomModelData());
+        } else {
+            to.setCustomModelData(null);
+        }
+
+        return to;
+    }
+
+    /**
+     * Get the base NBT tag on an item.
+     *
+     * @param itemStack The ItemStack.
+     * @return The base NBT.
+     */
+    @NotNull
+    public static PersistentDataContainer getBaseNBT(@NotNull final ItemStack itemStack) {
+        return FastItemStack.wrap(itemStack).getBaseTag();
+    }
+
+    /**
+     * Set the base NBT tag on an item.
+     *
+     * @param itemStack The ItemStack.
+     * @param container The base NBT tag.
+     * @return The ItemStack, modified. Not required to use, as this modifies the instance.¬
+     */
+    @NotNull
+    public static ItemStack setBaseNBT(@NotNull final ItemStack itemStack,
+                                       @Nullable final PersistentDataContainer container) {
+        FastItemStack fis = FastItemStack.wrap(itemStack);
+        fis.setBaseTag(container);
+        return fis.unwrap();
+    }
+
     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/LookupArgParser.java

@@ -22,4 +22,14 @@ public interface LookupArgParser {
      */
     @Nullable Predicate<ItemStack> parseArguments(@NotNull String[] args,
                                                   @NotNull ItemMeta meta);
+
+    /**
+     * Serialize the item back to a string.
+     *
+     * @param meta The ItemMeta.
+     * @return The string, or null if not required.
+     */
+    default @Nullable String serializeBack(@NotNull final ItemMeta meta) {
+        return null;
+    }
 }

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

@@ -59,6 +59,10 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
      * @param base The ItemStack to start with.
      */
     protected AbstractItemStackBuilder(@NotNull final ItemStack base) {
+        if (base.getType() == Material.AIR) {
+            base.setType(Material.STONE); // Prevents NPEs.
+        }
+
         this.base = base;
         this.meta = (T) base.getItemMeta();
         assert meta != null;

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

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

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

@@ -5,7 +5,7 @@ import com.willfp.eco.core.EcoPlugin;
 /**
  * A placeholder represents a string that can hold a value.
  */
-public sealed interface Placeholder permits PlayerPlaceholder, PlayerlessPlaceholder, StaticPlaceholder {
+public sealed interface Placeholder permits PlayerPlaceholder, PlayerlessPlaceholder, InjectablePlaceholder {
     /**
      * Get the plugin that holds the placeholder.
      *

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

@@ -2,6 +2,7 @@ package com.willfp.eco.core.placeholder;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -22,7 +23,40 @@ public interface PlaceholderInjectable {
      *
      * @param placeholders The placeholders.
      */
-    void injectPlaceholders(@NotNull Iterable<StaticPlaceholder> placeholders);
+    default void injectPlaceholders(@NotNull InjectablePlaceholder... placeholders) {
+        this.addInjectablePlaceholder(List.of(placeholders));
+    }
+
+    /**
+     * Inject placeholder.
+     *
+     * @param placeholders The placeholders.
+     */
+    @Deprecated(since = "6.35.0", forRemoval = true)
+    default void injectPlaceholders(@NotNull Iterable<StaticPlaceholder> placeholders) {
+        List<InjectablePlaceholder> toInject = new ArrayList<>();
+        for (StaticPlaceholder placeholder : placeholders) {
+            toInject.add(placeholder);
+        }
+        this.addInjectablePlaceholder(toInject);
+    }
+
+    /**
+     * Inject placeholders.
+     * <p>
+     * When implementing a PlaceholderInjectable object, override this method.
+     *
+     * @param placeholders The placeholders.
+     */
+    default void addInjectablePlaceholder(@NotNull Iterable<InjectablePlaceholder> placeholders) {
+        List<StaticPlaceholder> toInject = new ArrayList<>();
+        for (InjectablePlaceholder placeholder : placeholders) {
+            if (placeholder instanceof StaticPlaceholder staticPlaceholder) {
+                toInject.add(staticPlaceholder);
+            }
+        }
+        this.injectPlaceholders(toInject);
+    }
 
     /**
      * Clear injected placeholders.
@@ -33,6 +67,31 @@ public interface PlaceholderInjectable {
      * Get injected placeholders.
      *
      * @return Injected placeholders.
+     * @deprecated Use getPlaceholderInjections.
      */
-    List<StaticPlaceholder> getInjectedPlaceholders();
+    @Deprecated(since = "6.35.0", forRemoval = true)
+    @NotNull
+    default List<StaticPlaceholder> getInjectedPlaceholders() {
+        List<StaticPlaceholder> found = new ArrayList<>();
+
+        for (InjectablePlaceholder placeholder : getPlaceholderInjections()) {
+            if (placeholder instanceof StaticPlaceholder staticPlaceholder) {
+                found.add(staticPlaceholder);
+            }
+        }
+
+        return found;
+    }
+
+    /**
+     * Get injected placeholders.
+     * <p>
+     * Override this method in implementations.
+     *
+     * @return Injected placeholders.
+     */
+    @NotNull
+    default List<InjectablePlaceholder> getPlaceholderInjections() {
+        return new ArrayList<>(getInjectedPlaceholders());
+    }
 }

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

@@ -78,7 +78,7 @@ public final class PlayerPlaceholder implements Placeholder {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof StaticPlaceholder that)) {
+        if (!(o instanceof PlayerPlaceholder that)) {
             return false;
         }
         return Objects.equals(this.getIdentifier(), that.getIdentifier())

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

@@ -0,0 +1,66 @@
+package com.willfp.eco.core.placeholder;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.function.Function;
+
+/**
+ * A placeholder that cannot be registered, and exists purely in injection.
+ */
+public final class PlayerStaticPlaceholder implements InjectablePlaceholder {
+    /**
+     * The name of the placeholder.
+     */
+    private final String identifier;
+
+    /**
+     * The function to retrieve the output of the placeholder.
+     */
+    private final Function<Player, String> function;
+
+    /**
+     * Create a new player placeholder.
+     *
+     * @param identifier The identifier.
+     * @param function   The function to retrieve the value.
+     */
+    public PlayerStaticPlaceholder(@NotNull final String identifier,
+                                   @NotNull final Function<Player, String> function) {
+        this.identifier = identifier;
+        this.function = function;
+    }
+
+    /**
+     * Get the value of the placeholder.
+     *
+     * @param player The player.
+     * @return The value.
+     */
+    public String getValue(@NotNull final Player player) {
+        return function.apply(player);
+    }
+
+    @Override
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof PlayerStaticPlaceholder that)) {
+            return false;
+        }
+        return Objects.equals(this.getIdentifier(), that.getIdentifier());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.getIdentifier());
+    }
+}

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

@@ -76,7 +76,7 @@ public final class PlayerlessPlaceholder implements Placeholder {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof StaticPlaceholder that)) {
+        if (!(o instanceof PlayerlessPlaceholder that)) {
             return false;
         }
         return Objects.equals(this.getIdentifier(), that.getIdentifier())

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

@@ -1,7 +1,5 @@
 package com.willfp.eco.core.placeholder;
 
-import com.willfp.eco.core.Eco;
-import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -11,7 +9,7 @@ import java.util.function.Supplier;
 /**
  * A placeholder that cannot be registered, and exists purely in injection.
  */
-public final class StaticPlaceholder implements Placeholder {
+public final class StaticPlaceholder implements InjectablePlaceholder {
     /**
      * The name of the placeholder.
      */
@@ -43,11 +41,6 @@ public final class StaticPlaceholder implements Placeholder {
         return function.get();
     }
 
-    @Override
-    public EcoPlugin getPlugin() {
-        return Eco.getHandler().getEcoPlugin();
-    }
-
     @Override
     public String getIdentifier() {
         return this.identifier;

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

@@ -23,7 +23,7 @@ public class ProxyError extends Error {
      * @param message The message to send.
      * @deprecated Proxy Errors should include a cause.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public ProxyError(@NotNull final String message) {
         super(message);
     }

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

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.NotNull;
  *
  * @deprecated Poorly named, exception when it's actually an error, contains doubly nested errors.
  */
+@SuppressWarnings("removal")
 @Deprecated(since = "6.24.0", forRemoval = true)
 public class UnsupportedVersionException extends ProxyError {
     /**
@@ -16,7 +17,7 @@ public class UnsupportedVersionException extends ProxyError {
      * @param message The message to send.
      * @deprecated Use the default constructor.
      */
-    @Deprecated(since = "6.24.0")
+    @Deprecated(since = "6.24.0", forRemoval = true)
     public UnsupportedVersionException(@NotNull final String message) {
         super(message);
     }

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

@@ -18,25 +18,31 @@ import java.util.Set;
  * Utilities / API methods for blocks.
  */
 public final class BlockUtils {
-    private static Set<Block> getNearbyBlocks(@NotNull final Block start,
+    /**
+     * Max blocks to mine (yes, this is to prevent a stack overflow).
+     */
+    private static final int MAX_BLOCKS = 2500;
+
+    private static Set<Block> getNearbyBlocks(@NotNull final Block origin,
                                               @NotNull final List<Material> allowedMaterials,
                                               @NotNull final Set<Block> blocks,
                                               final int limit) {
         for (BlockFace face : BlockFace.values()) {
-            Block block = start.getRelative(face);
+            Block block = origin.getRelative(face);
+
+            if (!allowedMaterials.contains(block.getType())) {
+                continue;
+            }
+
             if (blocks.contains(block)) {
                 continue;
             }
 
-            if (allowedMaterials.contains(block.getType())) {
-                blocks.add(block);
-
-                if (blocks.size() > limit || blocks.size() > 2500) {
-                    return blocks;
-                }
-
-                blocks.addAll(getNearbyBlocks(block, allowedMaterials, blocks, limit));
+            if (blocks.size() >= limit || blocks.size() > MAX_BLOCKS) {
+                return blocks;
             }
+
+            blocks.addAll(getNearbyBlocks(block, allowedMaterials, blocks, limit));
         }
 
         return blocks;

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

@@ -28,7 +28,7 @@ public final class DurabilityUtils {
      * @param slot   The slot in the inventory of the item.
      * @deprecated The slot is not required.
      */
-    @Deprecated(since = "6.24.0")
+    @Deprecated(since = "6.24.0", forRemoval = true)
     public static void damageItem(@NotNull final Player player,
                                   @NotNull final ItemStack item,
                                   final int damage,
@@ -109,8 +109,8 @@ public final class DurabilityUtils {
             return;
         }
 
-
-        Damageable meta = (Damageable) item.getItemMeta();
+        // Suppression because when I fix it, it causes weird compile bugs.
+        @SuppressWarnings("PatternVariableCanBeUsed") Damageable meta = (Damageable) item.getItemMeta();
         meta.setDamage(meta.getDamage() + damage);
 
         if (meta.getDamage() >= item.getType().getMaxDurability()) {

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

@@ -1,5 +1,7 @@
 package com.willfp.eco.util;
 
+import com.willfp.eco.core.placeholder.InjectablePlaceholder;
+import com.willfp.eco.core.placeholder.PlaceholderInjectable;
 import com.willfp.eco.core.placeholder.StaticPlaceholder;
 import org.apache.commons.lang.Validate;
 import org.bukkit.entity.Player;
@@ -8,7 +10,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.text.DecimalFormat;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ThreadLocalRandom;
@@ -110,7 +114,7 @@ public final class NumberUtils {
      * @return The new value.
      * @deprecated Pointless method.
      */
-    @Deprecated(since = "6.19.0")
+    @Deprecated(since = "6.19.0", forRemoval = true)
     public static double equalIfOver(final double toChange,
                                      final double limit) {
         return Math.min(toChange, limit);
@@ -252,7 +256,17 @@ public final class NumberUtils {
      */
     public static double evaluateExpression(@NotNull final String expression,
                                             @Nullable final Player player) {
-        return evaluateExpression(expression, player, Collections.emptyList());
+        return evaluateExpression(expression, player, new PlaceholderInjectable() {
+            @Override
+            public void clearInjectedPlaceholders() {
+                // Nothing.
+            }
+
+            @Override
+            public @NotNull List<InjectablePlaceholder> getPlaceholderInjections() {
+                return Collections.emptyList();
+            }
+        });
     }
 
     /**
@@ -262,11 +276,41 @@ public final class NumberUtils {
      * @param player     The player.
      * @param statics    The static placeholders.
      * @return The value of the expression, or zero if invalid.
+     * @deprecated Use new statics system.
      */
+    @Deprecated(since = "6.35.0", forRemoval = true)
     public static double evaluateExpression(@NotNull final String expression,
                                             @Nullable final Player player,
                                             @NotNull final Iterable<StaticPlaceholder> statics) {
-        return crunch.evaluate(expression, player, statics);
+        return crunch.evaluate(expression, player, new PlaceholderInjectable() {
+            @Override
+            public void clearInjectedPlaceholders() {
+                // Do nothing.
+            }
+
+            @Override
+            public @NotNull List<InjectablePlaceholder> getPlaceholderInjections() {
+                List<InjectablePlaceholder> injections = new ArrayList<>();
+                for (StaticPlaceholder placeholder : statics) {
+                    injections.add(placeholder);
+                }
+                return injections;
+            }
+        });
+    }
+
+    /**
+     * Evaluate an expression with respect to a player (for placeholders).
+     *
+     * @param expression The expression.
+     * @param player     The player.
+     * @param context The injectable placeholders.
+     * @return The value of the expression, or zero if invalid.
+     */
+    public static double evaluateExpression(@NotNull final String expression,
+                                            @Nullable final Player player,
+                                            @NotNull final PlaceholderInjectable context) {
+        return crunch.evaluate(expression, player, context);
     }
 
     /**
@@ -290,12 +334,12 @@ public final class NumberUtils {
          *
          * @param expression The expression.
          * @param player     The player.
-         * @param statics    The statics.
+         * @param injectable The injectable placeholders.
          * @return The value of the expression, or zero if invalid.
          */
         double evaluate(@NotNull String expression,
                         @Nullable Player player,
-                        @NotNull Iterable<StaticPlaceholder> statics);
+                        @NotNull PlaceholderInjectable injectable);
     }
 
     private NumberUtils() {

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

@@ -10,8 +10,14 @@ import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.AnimalTamer;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Tameable;
+import org.bukkit.projectiles.ProjectileSource;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
 
@@ -142,6 +148,39 @@ public final class PlayerUtils {
         }
     }
 
+    /**
+     * Try an entity as a player.
+     *
+     * @param entity The entity.
+     * @return The player, or null if no player could be found.
+     */
+    @Nullable
+    public static Player tryAsPlayer(@Nullable final Entity entity) {
+        if (entity == null) {
+            return null;
+        }
+
+        if (entity instanceof Player player) {
+            return player;
+        }
+
+        if (entity instanceof Projectile projectile) {
+            ProjectileSource shooter = projectile.getShooter();
+            if (shooter instanceof Player player) {
+                return player;
+            }
+        }
+
+        if (entity instanceof Tameable tameable) {
+            AnimalTamer tamer = tameable.getOwner();
+            if (tamer instanceof Player player) {
+                return player;
+            }
+        }
+
+        return null;
+    }
+
     private PlayerUtils() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.util;
 
+import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.collect.ImmutableList;
@@ -12,6 +13,7 @@ import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.md_5.bungee.api.ChatColor;
+import org.apache.commons.lang.Validate;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -76,33 +78,37 @@ public final class StringUtils {
             .build(StringUtils::processFormatting);
 
     /**
-     * Json -> Legacy Cache.
+     * Json -> Component Cache.
      */
-    private static final LoadingCache<String, String> JSON_TO_LEGACY = Caffeine.newBuilder()
+    private static final Cache<String, Component> JSON_TO_COMPONENT = Caffeine.newBuilder()
             .expireAfterAccess(10, TimeUnit.SECONDS)
-            .build(
-                    json -> {
-                        try {
-                            Component component = GSON_COMPONENT_SERIALIZER.deserialize(json);
-                            return LEGACY_COMPONENT_SERIALIZER.serialize(component);
-                        } catch (JsonSyntaxException e) {
-                            return json;
-                        }
-                    }
-            );
+            .build();
 
     /**
-     * Legacy -> Json Cache.
+     * Component -> Json Cache.
      */
-    private static final LoadingCache<String, String> LEGACY_TO_JSON = Caffeine.newBuilder()
+    private static final Cache<Component, String> COMPONENT_TO_JSON = Caffeine.newBuilder()
             .expireAfterAccess(10, TimeUnit.SECONDS)
-            .build(
-                    legacy -> GSON_COMPONENT_SERIALIZER.serialize(
-                            Component.empty().decoration(TextDecoration.ITALIC, false).append(
-                                    LEGACY_COMPONENT_SERIALIZER.deserialize(legacy)
-                            )
-                    )
-            );
+            .build();
+
+    /**
+     * Legacy -> Component Cache.
+     */
+    private static final Cache<String, Component> LEGACY_TO_COMPONENT = Caffeine.newBuilder()
+            .expireAfterAccess(10, TimeUnit.SECONDS)
+            .build();
+
+    /**
+     * Component -> Legacy Cache.
+     */
+    private static final Cache<Component, String> COMPONENT_TO_LEGACY = Caffeine.newBuilder()
+            .expireAfterAccess(10, TimeUnit.SECONDS)
+            .build();
+
+    /**
+     * Empty JSON.
+     */
+    private static final String EMPTY_JSON = GSON_COMPONENT_SERIALIZER.serialize(Component.empty());
 
     /**
      * Color map.
@@ -483,12 +489,7 @@ public final class StringUtils {
      */
     @NotNull
     public static String legacyToJson(@Nullable final String legacy) {
-        String processed = legacy;
-        if (legacy == null) {
-            processed = "";
-        }
-
-        return LEGACY_TO_JSON.get(processed);
+        return componentToJson(toComponent(legacy));
     }
 
     /**
@@ -499,11 +500,53 @@ public final class StringUtils {
      */
     @NotNull
     public static String jsonToLegacy(@Nullable final String json) {
-        if (json == null || json.isEmpty()) {
-            return "";
+        return toLegacy(jsonToComponent(json));
+    }
+
+    /**
+     * Convert Component to JSON String.
+     *
+     * @param component The Component.
+     * @return The JSON string.
+     */
+    @NotNull
+    public static String componentToJson(@Nullable final Component component) {
+        if (component == null) {
+            return EMPTY_JSON;
         }
 
-        return JSON_TO_LEGACY.get(json);
+        return COMPONENT_TO_JSON.get(component, it -> {
+            try {
+                return GSON_COMPONENT_SERIALIZER.serialize(
+                        Component.empty().decoration(TextDecoration.ITALIC, false).append(
+                                it
+                        )
+                );
+            } catch (JsonSyntaxException e) {
+                return GSON_COMPONENT_SERIALIZER.serialize(Component.empty());
+            }
+        });
+    }
+
+    /**
+     * Convert JSON String to Component.
+     *
+     * @param json The JSON String.
+     * @return The component.
+     */
+    @NotNull
+    public static Component jsonToComponent(@Nullable final String json) {
+        if (json == null || json.isEmpty()) {
+            return Component.empty();
+        }
+
+        return JSON_TO_COMPONENT.get(json, it -> {
+            try {
+                return GSON_COMPONENT_SERIALIZER.deserialize(it);
+            } catch (JsonSyntaxException e) {
+                return Component.empty();
+            }
+        });
     }
 
     /**
@@ -514,12 +557,7 @@ public final class StringUtils {
      */
     @NotNull
     public static Component toComponent(@Nullable final String legacy) {
-        String processed = legacy;
-        if (legacy == null) {
-            processed = "";
-        }
-
-        return LEGACY_COMPONENT_SERIALIZER.deserialize(processed);
+        return LEGACY_TO_COMPONENT.get(legacy == null ? "" : legacy, LEGACY_COMPONENT_SERIALIZER::deserialize);
     }
 
     /**
@@ -530,7 +568,7 @@ public final class StringUtils {
      */
     @NotNull
     public static String toLegacy(@NotNull final Component component) {
-        return LEGACY_COMPONENT_SERIALIZER.serialize(component);
+        return COMPONENT_TO_LEGACY.get(component, LEGACY_COMPONENT_SERIALIZER::serialize);
     }
 
     /**
@@ -596,6 +634,59 @@ public final class StringUtils {
         return SPACE_AROUND_CHARACTER.get(separator).split(input);
     }
 
+    /**
+     * Create progress bar.
+     *
+     * @param character        The bar character.
+     * @param bars             The number of bars.
+     * @param progress         The bar progress, between 0 and 1.
+     * @param completeFormat   The color of a complete bar section.
+     * @param inProgressFormat The color of an in-progress bar section.
+     * @param incompleteFormat The color of an incomplete bar section.
+     * @return The progress bar.
+     */
+    @NotNull
+    public static String createProgressBar(final char character,
+                                           final int bars,
+                                           final double progress,
+                                           @NotNull final String completeFormat,
+                                           @NotNull final String inProgressFormat,
+                                           @NotNull final String incompleteFormat) {
+        Validate.isTrue(progress >= 0 && progress <= 1, "Progress must be between 0 and 1!");
+        Validate.isTrue(bars > 1, "Must have at least 2 bars!");
+
+        String completeColor = format(completeFormat);
+        String inProgressColor = format(inProgressFormat);
+        String incompleteColor = format(incompleteFormat);
+
+        StringBuilder builder = new StringBuilder();
+
+        // Full bar special case.
+        if (progress == 1) {
+            builder.append(completeColor);
+            builder.append(String.valueOf(character).repeat(bars));
+            return builder.toString();
+        }
+
+        int completeBars = (int) Math.floor(progress * bars);
+        int incompleteBars = bars - completeBars - 1;
+
+        if (completeBars > 0) {
+            builder.append(completeColor)
+                    .append(String.valueOf(character).repeat(completeBars));
+        }
+
+        builder.append(inProgressColor)
+                .append(character);
+
+        if (incompleteBars > 0) {
+            builder.append(incompleteColor)
+                    .append(String.valueOf(character).repeat(incompleteBars));
+        }
+
+        return builder.toString();
+    }
+
     /**
      * Options for formatting.
      */

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

@@ -12,7 +12,6 @@ import org.jetbrains.annotations.NotNull;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * Utilities / API methods for teams.
@@ -49,7 +48,7 @@ public final class TeamUtils {
 
         Team team;
 
-        if (!SCOREBOARD.getTeams().stream().map(Team::getName).collect(Collectors.toList()).contains("EC-" + color.name())) {
+        if (!SCOREBOARD.getTeams().stream().map(Team::getName).toList().contains("EC-" + color.name())) {
             team = SCOREBOARD.registerNewTeam("EC-" + color.name());
         } else {
             team = SCOREBOARD.getTeam("EC-" + color.name());
@@ -71,7 +70,7 @@ public final class TeamUtils {
      * @deprecated Stupid method.
      */
     @NotNull
-    @Deprecated(since = "6.24.0")
+    @Deprecated(since = "6.24.0", forRemoval = true)
     public static Team getMaterialColorTeam(@NotNull final Material material) {
         return fromChatColor(MATERIAL_COLORS.getOrDefault(material, ChatColor.WHITE));
     }

eco-api/src/main/kotlin/com/willfp/eco/core/config/ConfigHelpers.kt

@@ -0,0 +1,38 @@
+@file:JvmName("ConfigExtensions")
+
+package com.willfp.eco.core.config
+
+import com.willfp.eco.core.config.interfaces.Config
+
+/**
+ * Helper class to create configs with a kotlin DSL.
+ */
+class DSLConfig internal constructor(type: ConfigType) : TransientConfig(emptyMap(), type) {
+    /**
+     * Map a key to a value.
+     *
+     * @param value The value.
+     */
+    infix fun String.to(value: Any?) =
+        set(this, value)
+
+    /**
+     * Helper function to create configs with a kotlin DSL.
+     *
+     * Inherits the config type of the sub-builder.
+     *
+     * @param builder The builder.
+     * @return The config.
+     */
+    fun config(builder: DSLConfig.() -> Unit): Config =
+        DSLConfig(type).apply(builder)
+}
+
+/**
+ * Helper function to create configs with a kotlin DSL.
+ *
+ * @param builder The builder.
+ * @return The config.
+ */
+fun config(type: ConfigType = ConfigType.YAML, builder: DSLConfig.() -> Unit): Config =
+    DSLConfig(type).apply(builder)

eco-api/src/main/kotlin/com/willfp/eco/core/data/PersistentDataContainers.kt

@@ -0,0 +1,51 @@
+@file:JvmName("PersistentDataContainerExtensions")
+
+package com.willfp.eco.core.data
+
+import org.bukkit.persistence.PersistentDataContainer
+import org.bukkit.persistence.PersistentDataType
+
+/**
+ * @see ExtendedPersistentDataContainer.set
+ */
+fun <T : Any, Z : Any> PersistentDataContainer.set(key: String, dataType: PersistentDataType<T, Z>, value: Z) =
+    ExtendedPersistentDataContainer.extend(this).set(key, dataType, value)
+
+/**
+ * @see ExtendedPersistentDataContainer.has
+ */
+fun <T : Any, Z : Any> PersistentDataContainer.has(key: String, dataType: PersistentDataType<T, Z>): Boolean =
+    ExtendedPersistentDataContainer.extend(this).has(key, dataType)
+
+/**
+ * @see ExtendedPersistentDataContainer.get
+ */
+fun <T : Any, Z : Any> PersistentDataContainer.get(key: String, dataType: PersistentDataType<T, Z>): Z? =
+    ExtendedPersistentDataContainer.extend(this).get(key, dataType)
+
+/**
+ * @see ExtendedPersistentDataContainer.getOrDefault
+ */
+fun <T : Any, Z : Any> PersistentDataContainer.getOrDefault(
+    key: String,
+    dataType: PersistentDataType<T, Z>,
+    defaultValue: Z
+): Z = ExtendedPersistentDataContainer.extend(this).getOrDefault(key, dataType, defaultValue)
+
+/**
+ * @see ExtendedPersistentDataContainer.getAllKeys
+ */
+fun PersistentDataContainer.getAllKeys(): Set<String> =
+    ExtendedPersistentDataContainer.extend(this).allKeys
+
+/**
+ * @see ExtendedPersistentDataContainer.remove
+ */
+fun PersistentDataContainer.remove(key: String) =
+    ExtendedPersistentDataContainer.extend(this).remove(key)
+
+/**
+ * Create a new PDC without the need for an adapter context.
+ */
+fun newPersistentDataContainer() =
+    ExtendedPersistentDataContainer.create().base

eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt

@@ -92,6 +92,12 @@ fun MenuBuilder.onClose(action: (InventoryCloseEvent, Menu) -> Unit): MenuBuilde
 fun MenuBuilder.modify(modifier: (MenuBuilder) -> Unit): MenuBuilder =
     this.modfiy { modifier(it) }
 
+/**
+ * @see MenuBuilder.onRender
+ */
+fun MenuBuilder.onRender(action: (Player, Menu) -> Unit): MenuBuilder =
+    this.onRender { a, b -> action(a, b) }
+
 /**
  * Kotlin builder for menus.
  */

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

@@ -0,0 +1,41 @@
+@file:JvmName("ItemsExtensions")
+
+package com.willfp.eco.core.items
+
+import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.meta.ItemMeta
+import org.bukkit.persistence.PersistentDataContainer
+
+/**
+ * @see Items.toLookupString
+ */
+fun ItemStack?.toLookupString(): String =
+    Items.toLookupString(this)
+
+/**
+ * @see Items.mergeFrom
+ */
+fun ItemStack.mergeFrom(other: ItemStack): ItemStack =
+    Items.mergeFrom(other, this)
+
+/**
+ * @see Items.mergeFrom
+ */
+fun ItemMeta.mergeFrom(other: ItemMeta): ItemMeta =
+    Items.mergeFrom(other, this)
+
+/**
+ * @see Items.getBaseNBT
+ * @see Items.setBaseNBT
+ */
+var ItemStack.baseNBT: PersistentDataContainer
+    get() = Items.getBaseNBT(this)
+    set(value) {
+        Items.setBaseNBT(this, value)
+    }
+
+/**
+ * @see Items.setBaseNBT
+ */
+fun ItemStack.clearNBT() =
+    Items.setBaseNBT(this, null)

eco-api/src/main/kotlin/com/willfp/eco/util/PlayerUtils.kt

@@ -5,6 +5,7 @@ package com.willfp.eco.util
 import net.kyori.adventure.audience.Audience
 import org.bukkit.OfflinePlayer
 import org.bukkit.command.CommandSender
+import org.bukkit.entity.Entity
 import org.bukkit.entity.Player
 
 /**
@@ -30,3 +31,15 @@ fun CommandSender.asAudience(): Audience =
  */
 fun Player.runExempted(action: () -> Unit) =
     PlayerUtils.runExempted(this, action)
+
+/**
+ * @see PlayerUtils.runExempted
+ */
+fun Player.runExempted(action: (Player) -> Unit) =
+    PlayerUtils.runExempted(this, action)
+
+/**
+ * @see PlayerUtils.tryAsPlayer
+ */
+fun Entity?.tryAsPlayer(): Player? =
+    PlayerUtils.tryAsPlayer(this)

eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt

@@ -11,12 +11,24 @@ import org.bukkit.entity.Player
 fun String.toComponent(): Component =
     StringUtils.toComponent(this)
 
+/**
+ * @see StringUtils.jsonToComponent
+ */
+fun String.jsonToComponent(): Component =
+    StringUtils.jsonToComponent(this)
+
 /**
  * @see StringUtils.toLegacy
  */
 fun Component.toLegacy(): String =
     StringUtils.toLegacy(this)
 
+/**
+ * @see StringUtils.componentToJson
+ */
+fun Component.toJSON(): String =
+    StringUtils.componentToJson(this)
+
 /**
  * @see StringUtils.format
  */

eco-core/core-backend/build.gradle

@@ -2,10 +2,12 @@ group 'com.willfp'
 version rootProject.version
 
 dependencies {
+    // Libraries
+    implementation 'org.reflections:reflections:0.9.12'
+    implementation 'org.objenesis:objenesis:3.2'
+
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
     compileOnly 'me.clip:placeholderapi:2.10.10'
-    compileOnly 'org.reflections:reflections:0.9.12'
     compileOnly 'net.kyori:adventure-text-minimessage:4.10.0'
     compileOnly 'net.kyori:adventure-platform-bukkit:4.1.0'
-    compileOnly 'org.objenesis:objenesis:3.2'
 }