Updated to 6.8.2

# Conflicts:
#	gradle.properties

README.md

@@ -16,7 +16,7 @@
 # Information for development
 
 ## Javadoc
-The 6.0.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.0.0/javadoc/)
+The 6.8.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.8.0/javadoc/)
 
 ## Plugin Information
 
@@ -31,7 +31,6 @@ depend:
 eco is available from any of these places:
 
 - [GitHub](https://github.com/Auxilor/eco/releases)
-- [Spigot](https://www.spigotmc.org/resources/eco.87955/)
 - [Polymart](https://polymart.org/resource/eco.773)
 - [Build it locally](https://github.com/Auxilor/eco#build-locally).
 
@@ -72,7 +71,7 @@ Maven:
 </dependency>
 ```
 
-Replace `Tag` with a release tag for eco, eg `6.0.0`.
+Replace `Tag` with a release tag for eco, eg `6.8.0`.
 
 ## Build locally:
 

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

@@ -54,7 +54,7 @@ import java.util.stream.Collectors;
 @SuppressWarnings("unused")
 public abstract class EcoPlugin extends JavaPlugin {
     /**
-     * The spigot resource ID of the plugin.
+     * The polymart resource ID of the plugin.
      */
     @Getter
     private final int resourceId;
@@ -169,14 +169,14 @@ public abstract class EcoPlugin extends JavaPlugin {
     private final ProxyFactory proxyFactory;
 
     /**
-     * Create a new plugin without a specified color, proxy support, spigot, or bStats.
+     * Create a new plugin without a specified color, proxy support, polymart, or bStats.
      */
     protected EcoPlugin() {
         this("&f");
     }
 
     /**
-     * Create a new plugin without proxy support, spigot, or bStats.
+     * Create a new plugin without proxy support, polymart, or bStats.
      *
      * @param color The color.
      */
@@ -186,7 +186,7 @@ public abstract class EcoPlugin extends JavaPlugin {
 
 
     /**
-     * Create a new plugin unlinked to spigot and bStats.
+     * Create a new plugin unlinked to polymart and bStats.
      *
      * @param proxyPackage The package where proxy implementations are stored.
      * @param color        The color of the plugin (used in messages, using standard formatting)
@@ -199,7 +199,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     /**
      * Create a new plugin without proxy or extension support.
      *
-     * @param resourceId The spigot resource ID for the plugin.
+     * @param resourceId The polymart resource ID for the plugin.
      * @param bStatsId   The bStats resource ID for the plugin.
      * @param color      The color of the plugin (used in messages, using standard formatting)
      */
@@ -212,7 +212,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     /**
      * Create a new plugin without proxy support.
      *
-     * @param resourceId           The spigot resource ID for the plugin.
+     * @param resourceId           The polymart resource ID for the plugin.
      * @param bStatsId             The bStats resource ID for the plugin.
      * @param color                The color of the plugin (used in messages, using standard formatting)
      * @param supportingExtensions If the plugin supports extensions.
@@ -227,7 +227,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     /**
      * Create a new plugin without extension support.
      *
-     * @param resourceId   The spigot resource ID for the plugin.
+     * @param resourceId   The polymart resource ID for the plugin.
      * @param bStatsId     The bStats resource ID for the plugin.
      * @param proxyPackage The package where proxy implementations are stored.
      * @param color        The color of the plugin (used in messages, using standard formatting)
@@ -242,7 +242,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     /**
      * Create a new plugin.
      *
-     * @param resourceId           The spigot resource ID for the plugin.
+     * @param resourceId           The polymart resource ID for the plugin.
      * @param bStatsId             The bStats resource ID for the plugin.
      * @param proxyPackage         The package where proxy implementations are stored.
      * @param color                The color of the plugin (used in messages, using standard formatting)
@@ -357,15 +357,18 @@ public abstract class EcoPlugin extends JavaPlugin {
             Eco.getHandler().registerBStats(this);
         }
 
-        Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(Plugin::getName).collect(Collectors.toSet());
+        Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins())
+                .map(Plugin::getName)
+                .map(String::toLowerCase)
+                .collect(Collectors.toSet());
 
-        if (enabledPlugins.contains("PlaceholderAPI")) {
+        if (enabledPlugins.contains("PlaceholderAPI".toLowerCase())) {
             this.loadedIntegrations.add("PlaceholderAPI");
             PlaceholderManager.addIntegration(Eco.getHandler().createPAPIIntegration(this));
         }
 
         this.loadIntegrationLoaders().forEach((integrationLoader -> {
-            if (enabledPlugins.contains(integrationLoader.getPluginName())) {
+            if (enabledPlugins.contains(integrationLoader.getPluginName().toLowerCase())) {
                 this.loadedIntegrations.add(integrationLoader.getPluginName());
                 integrationLoader.load();
             }

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

@@ -13,6 +13,7 @@ import com.willfp.eco.core.gui.GUIFactory;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderIntegration;
 import com.willfp.eco.core.proxy.Cleaner;
 import com.willfp.eco.core.proxy.ProxyFactory;
+import com.willfp.eco.core.requirement.RequirementFactory;
 import com.willfp.eco.core.scheduling.Scheduler;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -194,4 +195,11 @@ public interface Handler {
      * @param plugin The plugin.
      */
     void registerBStats(@NotNull EcoPlugin plugin);
+
+    /**
+     * Get the requirement factory.
+     *
+     * @return The factory.
+     */
+    RequirementFactory getRequirementFactory();
 }

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

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

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

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

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

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

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

@@ -1,22 +1,12 @@
 package com.willfp.eco.core.display;
 
 import lombok.experimental.UtilityClass;
-import org.apache.commons.lang.Validate;
-import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Utility class to manage client-side item display.
  */
@@ -28,29 +18,9 @@ public class Display {
     public static final String PREFIX = "§z";
 
     /**
-     * All registered display modules.
+     * The display handler.
      */
-    private static final Map<DisplayPriority, List<DisplayModule>> MODULES = new HashMap<>();
+    public static DisplayHandler handler = null;
-
-    /**
-     * NamespacedKey for finalizing.
-     */
-    private static NamespacedKey finalizeKey = null;
-
-    /**
-     * Register display module.
-     *
-     * @param module The module.
-     */
-    public void registerDisplayModule(@NotNull final DisplayModule module) {
-        List<DisplayModule> modules = MODULES.get(module.getPriority());
-
-        modules.removeIf(module1 -> module1.getPluginName().equalsIgnoreCase(module.getPluginName()));
-
-        modules.add(module);
-
-        MODULES.put(module.getPriority(), modules);
-    }
 
     /**
      * Display on ItemStacks.
@@ -71,35 +41,7 @@ public class Display {
      */
     public ItemStack display(@NotNull final ItemStack itemStack,
                              @Nullable final Player player) {
-        Map<String, Object[]> pluginVarArgs = new HashMap<>();
+        return handler.display(itemStack, player);
-
-        for (DisplayPriority priority : DisplayPriority.values()) {
-            List<DisplayModule> modules = MODULES.get(priority);
-            for (DisplayModule module : modules) {
-                pluginVarArgs.put(module.getPluginName(), module.generateVarArgs(itemStack));
-            }
-        }
-
-        revert(itemStack);
-
-        ItemMeta meta = itemStack.getItemMeta();
-
-        if (meta == null) {
-            return itemStack;
-        }
-
-        for (DisplayPriority priority : DisplayPriority.values()) {
-            List<DisplayModule> modules = MODULES.get(priority);
-            for (DisplayModule module : modules) {
-                Object[] varargs = pluginVarArgs.get(module.getPluginName());
-                module.display(itemStack, varargs);
-                if (player != null) {
-                    module.display(itemStack, player, varargs);
-                }
-            }
-        }
-
-        return itemStack;
     }
 
     /**
@@ -131,31 +73,7 @@ public class Display {
      * @return The ItemStack.
      */
     public ItemStack revert(@NotNull final ItemStack itemStack) {
-        if (Display.isFinalized(itemStack)) {
+        return handler.revert(itemStack);
-            unfinalize(itemStack);
-        }
-
-        ItemMeta meta = itemStack.getItemMeta();
-
-        if (meta == null) {
-            return itemStack;
-        }
-
-        List<String> lore = meta.getLore();
-
-        if (lore != null && lore.removeIf(line -> line.startsWith(Display.PREFIX))) { // only apply lore modification if needed
-            meta.setLore(lore);
-            itemStack.setItemMeta(meta);
-        }
-
-        for (DisplayPriority priority : DisplayPriority.values()) {
-            List<DisplayModule> modules = MODULES.get(priority);
-            for (DisplayModule module : modules) {
-                module.revert(itemStack);
-            }
-        }
-
-        return itemStack;
     }
 
     /**
@@ -165,21 +83,7 @@ public class Display {
      * @return The ItemStack.
      */
     public ItemStack finalize(@NotNull final ItemStack itemStack) {
-        Validate.notNull(finalizeKey, "Key cannot be null!");
+        return handler.finalize(itemStack);
-
-        if (itemStack.getType().getMaxStackSize() > 1) {
-            return itemStack;
-        }
-
-        ItemMeta meta = itemStack.getItemMeta();
-        if (meta == null) {
-            return itemStack;
-        }
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        container.set(finalizeKey, PersistentDataType.INTEGER, 1);
-        itemStack.setItemMeta(meta);
-        return itemStack;
     }
 
     /**
@@ -189,18 +93,7 @@ public class Display {
      * @return The ItemStack.
      */
     public ItemStack unfinalize(@NotNull final ItemStack itemStack) {
-        Validate.notNull(finalizeKey, "Key cannot be null!");
+        return handler.unfinalize(itemStack);
-
-        ItemMeta meta = itemStack.getItemMeta();
-
-        if (meta == null) {
-            return itemStack;
-        }
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        container.remove(finalizeKey);
-        itemStack.setItemMeta(meta);
-        return itemStack;
     }
 
     /**
@@ -210,31 +103,62 @@ public class Display {
      * @return If finalized.
      */
     public boolean isFinalized(@NotNull final ItemStack itemStack) {
-        Validate.notNull(finalizeKey, "Key cannot be null!");
+        return handler.isFinalized(itemStack);
-
-        ItemMeta meta = itemStack.getItemMeta();
-
-        if (meta == null) {
-            return false;
-        }
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        return container.has(finalizeKey, PersistentDataType.INTEGER);
     }
 
     /**
-     * Set key to be used for finalization.
+     * Register a new display module.
      *
-     * @param finalizeKey The key.
+     * @param module The module.
      */
-    @ApiStatus.Internal
+    public void registerDisplayModule(@NotNull final DisplayModule module) {
-    public static void setFinalizeKey(@NotNull final NamespacedKey finalizeKey) {
+        handler.registerDisplayModule(module);
-        Display.finalizeKey = finalizeKey;
     }
 
-    static {
+    /**
-        for (DisplayPriority priority : DisplayPriority.values()) {
+     * Initialize the display system.
-            MODULES.put(priority, new ArrayList<>());
+     *
+     * @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.
+     */
+    @SuppressWarnings("checkstyle:FinalParameters")
+    @ApiStatus.Internal
+    public static void callDisplayModule(@NotNull final DisplayModule module,
+                                         @NotNull final ItemStack itemStack,
+                                         @Nullable final Player player,
+                                         @NotNull final Object... args) {
+        module.display(itemStack, args);
+        if (player != null) {
+            module.display(itemStack, player, args);
         }
     }
 }

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

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

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

@@ -36,8 +36,8 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      * @param itemStack The item.
      * @param args      Optional args for display.
      */
-    protected void display(@NotNull final ItemStack itemStack,
+    public void display(@NotNull final ItemStack itemStack,
-                           @NotNull final Object... args) {
+                        @NotNull final Object... args) {
         // Technically optional.
     }
 
@@ -48,9 +48,9 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      * @param player    The player.
      * @param args      Optional args for display.
      */
-    protected void display(@NotNull final ItemStack itemStack,
+    public void display(@NotNull final ItemStack itemStack,
-                           @Nullable final Player player,
+                        @Nullable final Player player,
-                           @NotNull final Object... args) {
+                        @NotNull final Object... args) {
         // Technically optional.
     }
 
@@ -59,7 +59,7 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      *
      * @param itemStack The item.
      */
-    protected void revert(@NotNull final ItemStack itemStack) {
+    public void revert(@NotNull final ItemStack itemStack) {
         // Technically optional.
     }
 
@@ -69,7 +69,7 @@ public abstract class DisplayModule extends PluginDependent<EcoPlugin> {
      * @param itemStack The itemStack.
      * @return The plugin-specific varargs.
      */
-    protected Object[] generateVarArgs(@NotNull final ItemStack itemStack) {
+    public Object[] generateVarArgs(@NotNull final ItemStack itemStack) {
         return new Object[0];
     }
 

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

@@ -1,9 +1,11 @@
 package com.willfp.eco.core.integrations.shop;
 
+import com.willfp.eco.core.integrations.Integration;
+
 /**
  * Wrapper class for shop integrations.
  */
-public interface ShopWrapper {
+public interface ShopWrapper extends Integration {
     /**
      * Register eco item provider for shop plugins.
      */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -26,7 +26,7 @@ import static net.md_5.bungee.api.ChatColor.COLOR_CHAR;
  * Utilities / API methods for strings.
  */
 @UtilityClass
-public class StringUtils {
+public class  StringUtils {
     /**
      * Regexes for gradients.
      */
@@ -34,6 +34,8 @@ public class StringUtils {
             .add(Pattern.compile("<GRADIENT:([0-9A-Fa-f]{6})>(.*?)</GRADIENT:([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
             .add(Pattern.compile("<GRADIENT:#([0-9A-Fa-f]{6})>(.*?)</GRADIENT:#([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
             .add(Pattern.compile("<G:([0-9A-Fa-f]{6})>(.*?)</G:([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
+            .add(Pattern.compile("<G:#([0-9A-Fa-f]{6})>(.*?)</G:#([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
+            .add(Pattern.compile("<G#([0-9A-Fa-f]{6})>(.*?)</G#([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
             .add(Pattern.compile("<#:([0-9A-Fa-f]{6})>(.*?)</#:([0-9A-Fa-f]{6})>"))
             .add(Pattern.compile("\\{#:([0-9A-Fa-f]{6})}(.*?)\\{/#:([0-9A-Fa-f]{6})}"))
             .build();

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

@@ -6,6 +6,7 @@ import com.willfp.eco.core.config.interfaces.JSONConfig
 import com.willfp.eco.core.config.wrapper.ConfigFactory
 import com.willfp.eco.internal.config.json.EcoJSONConfigSection
 import com.willfp.eco.internal.config.json.EcoLoadableJSONConfig
+import com.willfp.eco.internal.config.json.EcoUpdatableJSONConfig
 import com.willfp.eco.internal.config.yaml.EcoLoadableYamlConfig
 import com.willfp.eco.internal.config.yaml.EcoUpdatableYamlConfig
 import com.willfp.eco.internal.config.yaml.EcoYamlConfigSection
@@ -30,6 +31,24 @@ class EcoConfigFactory : ConfigFactory {
         )
     }
 
+    override fun createUpdatableJSONConfig(
+        configName: String,
+        plugin: EcoPlugin,
+        subDirectoryPath: String,
+        source: Class<*>,
+        removeUnused: Boolean,
+        vararg updateBlacklist: String
+    ): JSONConfig {
+        return EcoUpdatableJSONConfig(
+            configName,
+            plugin,
+            subDirectoryPath,
+            source,
+            removeUnused,
+            *updateBlacklist
+        )
+    }
+
     override fun createLoadableJSONConfig(
         configName: String,
         plugin: EcoPlugin,

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

@@ -8,11 +8,11 @@ import java.nio.file.Files
 import java.nio.file.StandardOpenOption
 
 @Suppress("UNCHECKED_CAST")
-class EcoLoadableJSONConfig(
+open class EcoLoadableJSONConfig(
     configName: String,
     private val plugin: EcoPlugin,
     private val subDirectoryPath: String,
-    private val source: Class<*>
+    val source: Class<*>
 ) : EcoJSONConfigWrapper(), LoadableConfig {
 
     private val configFile: File
@@ -65,7 +65,7 @@ class EcoLoadableJSONConfig(
 
     @Throws(FileNotFoundException::class)
     fun init(file: File) {
-        super.init(handle.fromJson(FileReader(file), Map::class.java) as @NotNull MutableMap<String, Any>)
+        super.init(handle.fromJson(FileReader(file), Map::class.java) as MutableMap<String, Any>)
     }
 
     override fun getName(): String {

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

@@ -0,0 +1,74 @@
+package com.willfp.eco.internal.config.json
+
+import com.willfp.eco.core.EcoPlugin
+import org.bukkit.configuration.InvalidConfigurationException
+import org.bukkit.configuration.file.YamlConfiguration
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
+import java.nio.charset.StandardCharsets
+
+open class EcoUpdatableJSONConfig(
+    configName: String,
+    plugin: EcoPlugin,
+    subDirectoryPath: String,
+    source: Class<*>,
+    private val removeUnused: Boolean,
+    vararg updateBlacklist: String
+) : EcoLoadableJSONConfig(configName, plugin, subDirectoryPath, source) {
+
+    private val updateBlacklist: MutableList<String> = mutableListOf(*updateBlacklist)
+
+    fun update() {
+        super.clearCache()
+        try {
+            this.init(configFile)
+            val newConfig = configInJar
+            if (newConfig.getKeys(true) == this.getKeys(true)) {
+                return
+            }
+            newConfig.getKeys(true).forEach { key: String ->
+                if (!this.getKeys(true).contains(key)) {
+                    if (updateBlacklist.stream().noneMatch { s: String -> key.contains(s) }) {
+                        this.set(key, newConfig[key])
+                    }
+                }
+            }
+            if (removeUnused) {
+                this.getKeys(true).forEach { s ->
+                    if (!newConfig.getKeys(true).contains(s)) {
+                        if (updateBlacklist.stream().noneMatch(s::contains)) {
+                            this.set(s, null)
+                        }
+                    }
+                }
+            }
+            this.save()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        } catch (e: InvalidConfigurationException) {
+            e.printStackTrace()
+        }
+    }
+
+    private val configInJar: YamlConfiguration
+        get() {
+            val newIn = this.source.getResourceAsStream(resourcePath) ?: throw NullPointerException("$name is null?")
+            val reader = BufferedReader(InputStreamReader(newIn, StandardCharsets.UTF_8))
+            val newConfig = YamlConfiguration()
+            try {
+                newConfig.load(reader)
+            } catch (e: IOException) {
+                e.printStackTrace()
+            } catch (e: InvalidConfigurationException) {
+                e.printStackTrace()
+            }
+            return newConfig
+        }
+
+    init {
+        this.updateBlacklist.removeIf { obj: String -> obj.isEmpty() }
+        plugin.configHandler.addConfig(this)
+        update()
+    }
+}

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

@@ -5,6 +5,7 @@ import com.willfp.eco.core.config.interfaces.LoadableConfig
 import com.willfp.eco.core.config.updating.ConfigHandler
 import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.eco.internal.config.json.EcoLoadableJSONConfig
+import com.willfp.eco.internal.config.json.EcoUpdatableJSONConfig
 import com.willfp.eco.internal.config.updating.exceptions.InvalidUpdateMethodException
 import com.willfp.eco.internal.config.yaml.EcoLoadableYamlConfig
 import com.willfp.eco.internal.config.yaml.EcoUpdatableYamlConfig
@@ -55,6 +56,7 @@ class EcoConfigHandler(
         for (config in configs) {
             when (config) {
                 is EcoUpdatableYamlConfig -> config.update()
+                is EcoUpdatableJSONConfig -> config.update()
                 is EcoLoadableYamlConfig -> config.reloadFromFile()
                 is EcoLoadableJSONConfig -> config.reloadFromFile()
             }

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/display/EcoDisplayHandler.kt

@@ -0,0 +1,119 @@
+package com.willfp.eco.internal.display
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.display.Display
+import com.willfp.eco.core.display.DisplayHandler
+import com.willfp.eco.core.display.DisplayModule
+import com.willfp.eco.core.display.DisplayPriority
+import com.willfp.eco.core.fast.FastItemStack
+import org.bukkit.NamespacedKey
+import org.bukkit.entity.Player
+import org.bukkit.inventory.ItemStack
+import org.bukkit.persistence.PersistentDataType
+
+class EcoDisplayHandler(plugin: EcoPlugin) : DisplayHandler {
+    /**
+     * All registered display modules.
+     */
+    private val registeredModules = mutableMapOf<DisplayPriority, MutableList<DisplayModule>>()
+
+    /**
+     * NamespacedKey for finalizing.
+     */
+    private val finalizeKey: NamespacedKey = plugin.namespacedKeyFactory.create("finalized")
+
+    init {
+        for (priority in DisplayPriority.values()) {
+            registeredModules[priority] = mutableListOf()
+        }
+    }
+
+    override fun registerDisplayModule(module: DisplayModule) {
+        val modules = registeredModules[module.priority] ?: return
+        modules.removeIf { module1: DisplayModule ->
+            module1.pluginName.equals(module.pluginName, ignoreCase = true)
+        }
+        modules.add(module)
+        registeredModules[module.priority] = modules
+    }
+
+    override fun display(itemStack: ItemStack, player: Player?): ItemStack {
+        val pluginVarArgs = mutableMapOf<String, Array<Any>>()
+
+        for (priority in DisplayPriority.values()) {
+            val modules = registeredModules[priority] ?: continue
+            for (module in modules) {
+                pluginVarArgs[module.pluginName] = module.generateVarArgs(itemStack)
+            }
+        }
+
+        Display.revert(itemStack)
+
+        itemStack.itemMeta ?: return itemStack
+
+        for (priority in DisplayPriority.values()) {
+            val modules = registeredModules[priority] ?: continue
+            for (module in modules) {
+                val varargs = pluginVarArgs[module.pluginName] ?: continue
+                Display.callDisplayModule(module, itemStack, player, *varargs)
+            }
+        }
+
+        return itemStack
+    }
+
+    override fun revert(itemStack: ItemStack): ItemStack {
+        if (Display.isFinalized(itemStack)) {
+            Display.unfinalize(itemStack)
+        }
+
+        val fast = FastItemStack.wrap(itemStack)
+        val lore = fast.lore
+
+        if (lore.isNotEmpty() && lore.removeIf { line: String ->
+                line.startsWith(
+                    Display.PREFIX
+                )
+            }) { // Only modify lore if needed.
+            fast.lore = lore
+        }
+
+        for (priority in DisplayPriority.values()) {
+            val modules = registeredModules[priority] ?: continue
+            for (module in modules) {
+                module.revert(itemStack)
+            }
+        }
+
+        return itemStack
+    }
+
+    override fun finalize(itemStack: ItemStack): ItemStack {
+        if (itemStack.type.maxStackSize > 1) {
+            return itemStack
+        }
+
+        val meta = itemStack.itemMeta ?: return itemStack
+
+        val container = meta.persistentDataContainer
+        container.set(finalizeKey, PersistentDataType.INTEGER, 1)
+        itemStack.itemMeta = meta
+        return itemStack
+    }
+
+    override fun unfinalize(itemStack: ItemStack): ItemStack {
+        val meta = itemStack.itemMeta ?: return itemStack
+
+        val container = meta.persistentDataContainer
+        container.remove(finalizeKey)
+        itemStack.itemMeta = meta
+        return itemStack
+    }
+
+    override fun isFinalized(itemStack: ItemStack): Boolean {
+        val meta = itemStack.itemMeta ?: return false
+
+        val container = meta.persistentDataContainer
+        return container.has(finalizeKey, PersistentDataType.INTEGER)
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/requirement/EcoRequirementFactory.kt

@@ -0,0 +1,17 @@
+package com.willfp.eco.internal.requirement
+
+import com.willfp.eco.core.requirement.Requirement
+import com.willfp.eco.core.requirement.RequirementFactory
+import com.willfp.eco.internal.requirement.requirements.*
+
+class EcoRequirementFactory: RequirementFactory {
+    override fun create(name: String): Requirement {
+        return when (name.lowercase()) {
+            "has-permission" -> RequirementHasPermission()
+            "placeholder-equals" -> RequirementPlaceholderEquals()
+            "placeholder-greater-than" -> RequirementPlaceholderGreaterThan()
+            "placeholder-less-than" -> RequirementPlaceholderLessThan()
+            else -> RequirementTrue()
+        }
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/requirement/requirements/RequirementHasPermission.kt

@@ -0,0 +1,18 @@
+package com.willfp.eco.internal.requirement.requirements
+
+import com.willfp.eco.core.requirement.Requirement
+import org.bukkit.entity.Player
+
+class RequirementHasPermission : Requirement() {
+    override fun doesPlayerMeet(
+        player: Player,
+        args: List<String>
+    ): Boolean {
+        if (args.isEmpty()) {
+            return false
+        }
+
+        val permission = args[0]
+        return player.hasPermission(permission)
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/requirement/requirements/RequirementPlaceholderEquals.kt

@@ -0,0 +1,20 @@
+package com.willfp.eco.internal.requirement.requirements
+
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
+import com.willfp.eco.core.requirement.Requirement
+import org.bukkit.entity.Player
+
+class RequirementPlaceholderEquals : Requirement() {
+    override fun doesPlayerMeet(
+        player: Player,
+        args: List<String>
+    ): Boolean {
+        if (args.size < 2) {
+            return false
+        }
+
+        val placeholder = args[0]
+        val equals = args[1]
+        return PlaceholderManager.translatePlaceholders(placeholder, player).equals(equals, ignoreCase = true)
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/requirement/requirements/RequirementPlaceholderGreaterThan.kt

@@ -0,0 +1,20 @@
+package com.willfp.eco.internal.requirement.requirements
+
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
+import com.willfp.eco.core.requirement.Requirement
+import org.bukkit.entity.Player
+
+class RequirementPlaceholderGreaterThan : Requirement() {
+    override fun doesPlayerMeet(
+        player: Player,
+        args: List<String>
+    ): Boolean {
+        if (args.size < 2) {
+            return false
+        }
+
+        val placeholder = args[0]
+        val equals = args[1].toDoubleOrNull() ?: return false
+        return PlaceholderManager.translatePlaceholders(placeholder, player).toDoubleOrNull() ?: 0.0 >= equals
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/requirement/requirements/RequirementPlaceholderLessThan.kt

@@ -0,0 +1,20 @@
+package com.willfp.eco.internal.requirement.requirements
+
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
+import com.willfp.eco.core.requirement.Requirement
+import org.bukkit.entity.Player
+
+class RequirementPlaceholderLessThan : Requirement() {
+    override fun doesPlayerMeet(
+        player: Player,
+        args: List<String>
+    ): Boolean {
+        if (args.size < 2) {
+            return false
+        }
+
+        val placeholder = args[0]
+        val equals = args[1].toDoubleOrNull() ?: return false
+        return PlaceholderManager.translatePlaceholders(placeholder, player).toDoubleOrNull() ?: 0.0 < equals
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/requirement/requirements/RequirementTrue.kt

@@ -0,0 +1,13 @@
+package com.willfp.eco.internal.requirement.requirements
+
+import com.willfp.eco.core.requirement.Requirement
+import org.bukkit.entity.Player
+
+class RequirementTrue : Requirement() {
+    override fun doesPlayerMeet(
+        player: Player,
+        args: List<String>
+    ): Boolean {
+        return true
+    }
+}

eco-core/core-plugin/build.gradle

@@ -13,7 +13,7 @@ dependencies {
     compileOnly 'com.github.TechFortress:GriefPrevention:16.14.0'
     compileOnly 'com.massivecraft:Factions:1.6.9.5-U0.5.10'
     compileOnly 'com.github.cryptomorin:kingdoms:1.10.14'
-    compileOnly 'com.github.TownyAdvanced:Towny:0.96.2.0'
+    compileOnly 'com.github.TownyAdvanced:Towny:0.97.1.0'
     compileOnly 'com.github.angeschossen:LandsAPI:4.7.3'
     compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
     compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt

@@ -15,6 +15,7 @@ import com.willfp.eco.core.gui.GUIFactory
 import com.willfp.eco.core.integrations.placeholder.PlaceholderIntegration
 import com.willfp.eco.core.proxy.Cleaner
 import com.willfp.eco.core.proxy.ProxyFactory
+import com.willfp.eco.core.requirement.RequirementFactory
 import com.willfp.eco.core.scheduling.Scheduler
 import com.willfp.eco.internal.EcoCleaner
 import com.willfp.eco.internal.Plugins
@@ -30,6 +31,7 @@ import com.willfp.eco.internal.gui.EcoGUIFactory
 import com.willfp.eco.internal.integrations.PlaceholderIntegrationPAPI
 import com.willfp.eco.internal.logging.EcoLogger
 import com.willfp.eco.internal.proxy.EcoProxyFactory
+import com.willfp.eco.internal.requirement.EcoRequirementFactory
 import com.willfp.eco.internal.scheduling.EcoScheduler
 import com.willfp.eco.proxy.FastItemStackFactoryProxy
 import com.willfp.eco.spigot.integrations.bstats.MetricHandler
@@ -39,6 +41,7 @@ import java.util.logging.Logger
 @Suppress("UNUSED")
 class EcoHandler : EcoSpigotPlugin(), Handler {
     private val cleaner = EcoCleaner()
+    private val requirementFactory = EcoRequirementFactory()
 
     override fun createScheduler(plugin: EcoPlugin): Scheduler {
         return EcoScheduler(plugin)
@@ -119,4 +122,8 @@ class EcoHandler : EcoSpigotPlugin(), Handler {
     override fun registerBStats(plugin: EcoPlugin) {
         MetricHandler.createMetrics(plugin, this.ecoPlugin)
     }
+
+    override fun getRequirementFactory(): RequirementFactory {
+        return requirementFactory
+    }
 }

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

@@ -12,6 +12,7 @@ import com.willfp.eco.core.integrations.shop.ShopManager
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.items.args.EnchantmentArgParser
 import com.willfp.eco.core.items.args.TextureArgParser
+import com.willfp.eco.internal.display.EcoDisplayHandler
 import com.willfp.eco.internal.drops.DropManager
 import com.willfp.eco.proxy.BlockBreakProxy
 import com.willfp.eco.proxy.FastItemStackFactoryProxy
@@ -23,7 +24,6 @@ import com.willfp.eco.spigot.eventlisteners.*
 import com.willfp.eco.spigot.gui.GUIListener
 import com.willfp.eco.spigot.integrations.anticheat.*
 import com.willfp.eco.spigot.integrations.antigrief.*
-import com.willfp.eco.spigot.integrations.customitems.CustomItemsHeadDatabase
 import com.willfp.eco.spigot.integrations.customitems.CustomItemsItemsAdder
 import com.willfp.eco.spigot.integrations.customitems.CustomItemsOraxen
 import com.willfp.eco.spigot.integrations.mcmmo.McmmoIntegrationImpl
@@ -40,14 +40,12 @@ import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.SkullMeta
 
 abstract class EcoSpigotPlugin : EcoPlugin(
-    87955,
+    773,
     10043,
     "com.willfp.eco.proxy",
     "&a"
 ) {
     init {
-        Display.setFinalizeKey(namespacedKeyFactory.create("finalized"))
-
         Items.registerArgParser(EnchantmentArgParser())
         Items.registerArgParser(TextureArgParser())
 
@@ -59,6 +57,12 @@ abstract class EcoSpigotPlugin : EcoPlugin(
 
         val blockBreakProxy = getProxy(BlockBreakProxy::class.java)
         BlockUtils.initialize { player: Player, block: Block -> blockBreakProxy.breakBlock(player, block) }
+
+        postInit()
+    }
+
+    private fun postInit() {
+        Display.handler = EcoDisplayHandler(this)
     }
 
     override fun handleEnable() {
@@ -90,6 +94,7 @@ abstract class EcoSpigotPlugin : EcoPlugin(
 
     override fun handleAfterLoad() {
         CustomItemsManager.registerAllItems()
+        ShopManager.registerEcoProvider()
     }
 
     override fun loadIntegrationLoaders(): List<IntegrationLoader> {
@@ -123,10 +128,9 @@ abstract class EcoSpigotPlugin : EcoPlugin(
             // Custom Items
             IntegrationLoader("Oraxen") { CustomItemsManager.register(CustomItemsOraxen()) },
             IntegrationLoader("ItemsAdder") { CustomItemsManager.register(CustomItemsItemsAdder(this)) },
-            IntegrationLoader("HeadDatabase") { CustomItemsManager.register(CustomItemsHeadDatabase()) },
 
             // Shop
-            IntegrationLoader("ShopGuiPlus") { ShopManager.register(ShopShopGuiPlus()) },
+            IntegrationLoader("ShopGUIPlus") { ShopManager.register(ShopShopGuiPlus()) },
 
             // Misc
             IntegrationLoader("mcMMO") { McmmoManager.register(McmmoIntegrationImpl()) }

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/gui/GUIListener.kt

@@ -73,9 +73,7 @@ class GUIListener(private val plugin: EcoPlugin) : Listener {
 
         val menu = MenuHandler.getMenu(inv) ?: return
 
-        val rowColumn = MenuUtils.convertSlotToRowColumn(inv.firstEmpty())
+        val (row, column) = MenuUtils.convertSlotToRowColumn(inv.firstEmpty())
-        val row = rowColumn.first!!
-        val column = rowColumn.second!!
         val slot = menu.getSlot(row, column)
 
         if (!slot.isCaptive) {

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefTowny.kt

@@ -2,9 +2,7 @@ package com.willfp.eco.spigot.integrations.antigrief
 
 import com.palmergames.bukkit.towny.TownyAPI
 import com.palmergames.bukkit.towny.TownyUniverse
-import com.palmergames.bukkit.towny.`object`.Town
 import com.palmergames.bukkit.towny.`object`.TownyPermission
-import com.palmergames.bukkit.towny.`object`.WorldCoord
 import com.palmergames.bukkit.towny.utils.PlayerCacheUtil
 import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper
 import org.bukkit.Location
@@ -67,22 +65,8 @@ class AntigriefTowny : AntigriefWrapper {
                 true
             }
         }
-        if (victim is Player) {
+        val townBlock = TownyAPI.getInstance().getTownBlock(victim.location) ?: return true
-            try {
+        return townBlock.permissions.pvp
-                val town: Town = WorldCoord.parseWorldCoord(victim.getLocation()).townBlock.town
-                return town.isPVP
-            } catch (ignored: Exception) {
-                // If exception, no town was found, thus return true.
-            }
-        } else {
-            try {
-                val town: Town = WorldCoord.parseWorldCoord(victim.location).townBlock.town
-                return town.hasMobs()
-            } catch (ignored: Exception) {
-                // If exception, no town was found, thus return true.
-            }
-        }
-        return true
     }
 
     override fun getPluginName(): String {

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsHeadDatabase.kt

@@ -1,34 +0,0 @@
-package com.willfp.eco.spigot.integrations.customitems
-
-import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper
-import com.willfp.eco.core.items.CustomItem
-import com.willfp.eco.util.NamespacedKeyUtils
-import me.arcaniax.hdb.api.HeadDatabaseAPI
-import me.arcaniax.hdb.enums.CategoryEnum
-import java.util.function.Predicate
-
-class CustomItemsHeadDatabase : CustomItemsWrapper {
-    private val api = HeadDatabaseAPI()
-
-    override fun registerAllItems() {
-        for (categoryEnum in CategoryEnum.values()) {
-            for (head in api.getHeads(categoryEnum).toList()) {
-                val stack = head.head
-                val id = head.id
-                val key = NamespacedKeyUtils.create("headdb", id.lowercase());
-                CustomItem(
-                    key,
-                    Predicate { test ->
-                        val headId = api.getItemID(test) ?: return@Predicate false
-                        headId.equals(id, ignoreCase = true)
-                    },
-                    stack
-                ).register()
-            }
-        }
-    }
-
-    override fun getPluginName(): String {
-        return "HeadDatabase"
-    }
-}

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/customitems/CustomItemsOraxen.kt

@@ -6,13 +6,15 @@ import com.willfp.eco.util.NamespacedKeyUtils
 import io.th0rgal.oraxen.items.OraxenItems
 import org.bukkit.NamespacedKey
 import org.bukkit.inventory.ItemStack
+import java.util.*
 import java.util.function.Predicate
 
 class CustomItemsOraxen : CustomItemsWrapper {
     override fun registerAllItems() {
         for (item in OraxenItems.getItems()) {
             val stack = item.build()
-            val id: String = OraxenItems.getIdByItem(item)
+            val id: String = Objects.requireNonNullElse(OraxenItems.getIdByItem(item), "")
+            if (id.isEmpty()) continue
             val key: NamespacedKey = NamespacedKeyUtils.create("oraxen", id.lowercase())
             CustomItem(
                 key, Predicate { test: ItemStack ->

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/shop/ShopShopGuiPlus.kt

@@ -28,4 +28,8 @@ class ShopShopGuiPlus : ShopWrapper {
             return Items.getCustomItem(itemStack1)?.key == Items.getCustomItem(itemStack2)?.key
         }
     }
+
+    override fun getPluginName(): String {
+        return "ShopGUIPlus"
+    }
 }

eco-core/core-plugin/src/main/resources/plugin.yml

@@ -21,7 +21,7 @@ softdepend:
   - PlaceholderAPI
   - mcMMO
   - CombatLogX
-  - ShopGuiPlus
+  - ShopGUIPlus
   - ItemsAdder
   - Oraxen
   - HeadDatabase

gradle.properties

@@ -1,2 +1,2 @@
-version = 6.7.2
+version = 6.8.2
 plugin-name = eco