Added locker to registry

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

.github/workflows/checkstyle.yml

@@ -1,15 +0,0 @@
-name: Check PR Codestyle
-on: [ pull_request ]
-
-jobs:
-  checkstyle:
-    name: Checkstyle
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dbelyaev/action-checkstyle@v0.5.1
-        with:
-          github_token: ${{ secrets.github_token }}
-          reporter: github-pr-review
-          level: warning
-          checkstyle_config: ../../config/checkstyle/checkstyle.xml

.github/workflows/publish-release.yml

@@ -28,6 +28,8 @@ jobs:
       - name: Publish artifact
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
 
         # The GITHUB_REF tag comes in the format 'refs/tags/xxx'.
         # So if we split on '/' and take the 3rd value, we can get the release name.

README.md

@@ -63,7 +63,7 @@ eco comes packed with all the tools you need in your plugins:
 # For developers
 
 ## Javadoc
-The 6.49.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.49.0/javadoc/)
+The 6.53.0 Javadoc can be found [here](https://javadoc.jitpack.io/com/willfp/eco/6.53.0/javadoc/)
 
 ## Plugin Information
 
@@ -75,31 +75,31 @@ depend:
   - eco
 ```
 
-## Get from JitPack:
+## Dependency Information:
 
 Gradle:
 
-```groovy
+```kts
 repositories {
-        maven { url 'https://jitpack.io' }
+        maven("https://repo.auxilor.io/repository/maven-public/")
 }
 
 ```
 
 ```groovy
 dependencies {
-        compileOnly 'com.willfp:eco:Tag'
+        compileOnly("com.willfp:eco:Tag")
 }
 ```
 
-Replace `Tag` with a release tag for eco, eg `6.49.0`.
+Replace `Tag` with a release tag for eco, eg `6.53.0`.
 
 Maven:
 
 ```xml
 <repository>
-        <id>jitpack.io</id>
+        <id>auxilor</id>
-        <url>https://jitpack.io</url>
+        <url>https://repo.auxilor.io/repository/maven-public/</url>
 </repository>
 ```
 
@@ -112,7 +112,7 @@ Maven:
 </dependency>
 ```
 
-Replace `Tag` with a release tag for eco, eg `6.49.0`.
+Replace `Tag` with a release tag for eco, eg `6.53.0`.
 
 ## Build locally:
 

eco-api/build.gradle.kts

@@ -39,4 +39,17 @@ publishing {
             }
         }
     }
+
+    publishing {
+        repositories {
+            maven {
+                name = "Auxilor"
+                url = uri("https://repo.auxilor.io/repository/maven-releases/")
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        }
+    }
 }

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

@@ -19,9 +19,10 @@ import com.willfp.eco.core.proxy.ProxyFactory;
 import com.willfp.eco.core.registry.Registrable;
 import com.willfp.eco.core.registry.Registry;
 import com.willfp.eco.core.scheduling.Scheduler;
+import com.willfp.eco.core.version.OutdatedEcoVersionError;
+import com.willfp.eco.core.version.Version;
 import com.willfp.eco.core.web.UpdateChecker;
 import org.apache.commons.lang.Validate;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -38,6 +39,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -346,14 +348,14 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
         they have an outdated version of eco installed.
          */
 
-        DefaultArtifactVersion runningVersion = new DefaultArtifactVersion(Eco.get().getEcoPlugin().getDescription().getVersion());
+        Version runningVersion = new Version(Eco.get().getEcoPlugin().getDescription().getVersion());
-        DefaultArtifactVersion requiredVersion = new DefaultArtifactVersion(this.getMinimumEcoVersion());
+        Version requiredVersion = new Version(this.getMinimumEcoVersion());
         if (!(runningVersion.compareTo(requiredVersion) > 0 || runningVersion.equals(requiredVersion))) {
             this.getLogger().severe("You are running an outdated version of eco!");
             this.getLogger().severe("You must be on at least" + this.getMinimumEcoVersion());
             this.getLogger().severe("Download the newest version here:");
             this.getLogger().severe("https://polymart.org/download/773/recent/JSpprMspkuyecf5y1wQ2Jn8OoLQSQ_IW");
-            Bukkit.getPluginManager().disablePlugin(this);
+            throw new OutdatedEcoVersionError("This plugin requires at least eco version " + this.getMinimumEcoVersion() + " to run.");
         }
     }
 
@@ -369,8 +371,8 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
 
         if (this.getResourceId() != 0 && !Eco.get().getEcoPlugin().getConfigYml().getBool("no-update-checker")) {
             new UpdateChecker(this).getVersion(version -> {
-                DefaultArtifactVersion currentVersion = new DefaultArtifactVersion(this.getDescription().getVersion());
+                Version currentVersion = new Version(this.getDescription().getVersion());
-                DefaultArtifactVersion mostRecentVersion = new DefaultArtifactVersion(version);
+                Version mostRecentVersion = new Version(version);
                 if (!(currentVersion.compareTo(mostRecentVersion) > 0 || currentVersion.equals(mostRecentVersion))) {
                     this.outdated = true;
                     this.getLogger().warning(this.getName() + " is out of date! (Version " + this.getDescription().getVersion() + ")");
@@ -392,8 +394,13 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
 
         this.loadIntegrationLoaders().forEach(integrationLoader -> {
             if (enabledPlugins.contains(integrationLoader.getPluginName().toLowerCase())) {
-                this.loadedIntegrations.add(integrationLoader.getPluginName());
+                try {
-                integrationLoader.load();
+                    integrationLoader.load();
+                    this.loadedIntegrations.add(integrationLoader.getPluginName());
+                } catch (Exception e) {
+                    this.getLogger().warning("Failed to load integration for " + integrationLoader.getPluginName());
+                    e.printStackTrace();
+                }
             }
         });
 
@@ -429,9 +436,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
             }
         }
 
-        this.onEnable.get(LifecyclePosition.START).forEach(Runnable::run);
+        this.handleLifecycle(this.onEnable, this::handleEnable);
-        this.handleEnable();
-        this.onEnable.get(LifecyclePosition.END).forEach(Runnable::run);
 
         this.getLogger().info("");
     }
@@ -466,9 +471,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
         this.getEventManager().unregisterAllListeners();
         this.getScheduler().cancelAll();
 
-        this.onDisable.get(LifecyclePosition.START).forEach(Runnable::run);
+        this.handleLifecycle(this.onDisable, this::handleDisable);
-        this.handleDisable();
-        this.onDisable.get(LifecyclePosition.END).forEach(Runnable::run);
 
         if (this.isSupportingExtensions()) {
             this.getExtensionLoader().unloadExtensions();
@@ -505,9 +508,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
     public final void onLoad() {
         super.onLoad();
 
-        this.onLoad.get(LifecyclePosition.START).forEach(Runnable::run);
+        this.handleLifecycle(this.onLoad, this::handleLoad);
-        this.handleLoad();
-        this.onLoad.get(LifecyclePosition.END).forEach(Runnable::run);
     }
 
     /**
@@ -561,9 +562,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
             this.getLogger().severe("");
         }
 
-        this.afterLoad.get(LifecyclePosition.START).forEach(Runnable::run);
+        this.handleLifecycle(this.afterLoad, this::handleAfterLoad);
-        this.handleAfterLoad();
-        this.afterLoad.get(LifecyclePosition.END).forEach(Runnable::run);
 
         this.reload();
 
@@ -604,9 +603,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
         this.getConfigHandler().callUpdate();
         this.getConfigHandler().callUpdate(); // Call twice to fix issues
 
-        this.onReload.get(LifecyclePosition.START).forEach(Runnable::run);
+        this.handleLifecycle(this.onReload, this::handleReload);
-        this.handleReload();
-        this.onReload.get(LifecyclePosition.END).forEach(Runnable::run);
 
         for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
             extension.handleReload();
@@ -646,6 +643,43 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
         return System.currentTimeMillis() - startTime;
     }
 
+    /**
+     * Handle lifecycle.
+     *
+     * @param tasks   The tasks.
+     * @param handler The handler.
+     */
+    private void handleLifecycle(@NotNull final ListMap<LifecyclePosition, Runnable> tasks,
+                                 @NotNull final Runnable handler) {
+        for (Runnable task : tasks.get(LifecyclePosition.START)) {
+            try {
+                task.run();
+            } catch (final Exception e) {
+                this.getLogger().log(Level.SEVERE, "Error while running lifecycle task!");
+                this.getLogger().log(Level.SEVERE, "The plugin may not function properly");
+                e.printStackTrace();
+            }
+        }
+
+        try {
+            handler.run();
+        } catch (final Exception e) {
+            this.getLogger().log(Level.SEVERE, "Error while running lifecycle task!");
+            this.getLogger().log(Level.SEVERE, "The plugin may not function properly");
+            e.printStackTrace();
+        }
+
+        for (Runnable task : tasks.get(LifecyclePosition.END)) {
+            try {
+                task.run();
+            } catch (final Exception e) {
+                this.getLogger().log(Level.SEVERE, "Error while running lifecycle task!");
+                this.getLogger().log(Level.SEVERE, "The plugin may not function properly");
+                e.printStackTrace();
+            }
+        }
+    }
+
     /**
      * The plugin-specific code to be executed on enable.
      * <p>

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

@@ -37,6 +37,14 @@ public class Prerequisite {
             "Requires server to have ProtocolLib"
     );
 
+    /**
+     * Requires the server to be running 1.19.4.
+     */
+    public static final Prerequisite HAS_1_19_4 = new Prerequisite(
+            () -> ProxyConstants.NMS_VERSION.contains("19_R3"),
+            "Requires server to be running 1.19.4+"
+    );
+
     /**
      * Requires the server to be running 1.19.
      */

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

@@ -3,17 +3,26 @@ package com.willfp.eco.core.data;
 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;
 import java.util.function.Supplier;
 
 /**
  * A simple store key-value store for data to be stored outside of plugins.
  */
+@SuppressWarnings("unchecked")
 public final class ExternalDataStore {
     /**
      * The store.
      */
-    private static final HashMap<String, Object> data = new HashMap<>();
+    private static final Map<String, Object> DATA = new HashMap<>();
+
+    /**
+     * The store adapters.
+     */
+    private static final List<ExternalDataStoreObjectAdapter<?, ?>> STORE_ADAPTERS = new ArrayList<>();
 
     /**
      * Put data into the store.
@@ -23,7 +32,29 @@ public final class ExternalDataStore {
      */
     public static void put(@NotNull final String key,
                            @NotNull final Object value) {
-        data.put(key, value);
+        doPut(key, value);
+    }
+
+    /**
+     * Put data into the store.
+     *
+     * @param key   The key.
+     * @param value The value.
+     * @param <A>   The stored type.
+     */
+    private static <A> void doPut(@NotNull final String key,
+                                  @NotNull final A value) {
+        Object storedValue = value;
+
+        for (ExternalDataStoreObjectAdapter<?, ?> unknownAdapter : STORE_ADAPTERS) {
+            if (unknownAdapter.getAccessedClass().isInstance(value)) {
+                ExternalDataStoreObjectAdapter<A, ?> adapter = (ExternalDataStoreObjectAdapter<A, ?>) unknownAdapter;
+                storedValue = adapter.toStoredObject(value);
+                break;
+            }
+        }
+
+        DATA.put(key, storedValue);
     }
 
     /**
@@ -37,7 +68,30 @@ public final class ExternalDataStore {
     @Nullable
     public static <T> T get(@NotNull final String key,
                             @NotNull final Class<T> clazz) {
-        Object value = data.get(key);
+        return doGet(key, clazz);
+    }
+
+    /**
+     * Get data from the store.
+     *
+     * @param key   The key.
+     * @param clazz The class.
+     * @param <A>   The accessed type.
+     * @param <S>   The stored type.
+     * @return The value.
+     */
+    @Nullable
+    private static <A, S> A doGet(@NotNull final String key,
+                                  @NotNull final Class<A> clazz) {
+        Object value = DATA.get(key);
+
+        for (ExternalDataStoreObjectAdapter<?, ?> unknownAdapter : STORE_ADAPTERS) {
+            if (unknownAdapter.getStoredClass().isInstance(value) && unknownAdapter.getAccessedClass().equals(clazz)) {
+                ExternalDataStoreObjectAdapter<A, S> adapter = (ExternalDataStoreObjectAdapter<A, S>) unknownAdapter;
+                value = adapter.toAccessedObject((S) value);
+                break;
+            }
+        }
 
         if (clazz.isInstance(value)) {
             return clazz.cast(value);
@@ -79,6 +133,15 @@ public final class ExternalDataStore {
         return get(key, clazz, defaultValue.get());
     }
 
+    /**
+     * Register a new adapter.
+     *
+     * @param adapter The adapter.
+     */
+    public static void registerAdapter(@NotNull final ExternalDataStoreObjectAdapter<?, ?> adapter) {
+        STORE_ADAPTERS.add(adapter);
+    }
+
     private ExternalDataStore() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

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

@@ -0,0 +1,69 @@
+package com.willfp.eco.core.data;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An adapter for objects stored in {@link ExternalDataStore}.
+ *
+ * @param <A> The accessed class.
+ * @param <S> The stored class.
+ */
+public abstract class ExternalDataStoreObjectAdapter<A, S> {
+    /**
+     * The class that is accessed (read / written).
+     */
+    private final Class<? extends A> accessedClass;
+
+    /**
+     * The class that is stored internally.
+     */
+    private final Class<? extends S> storedClass;
+
+    /**
+     * Create a new adapter.
+     *
+     * @param accessedClass The class that is accessed (read / written).
+     * @param storedClass   The class that is stored internally.
+     */
+    protected ExternalDataStoreObjectAdapter(@NotNull final Class<? extends A> accessedClass,
+                                             @NotNull final Class<? extends S> storedClass) {
+        this.accessedClass = accessedClass;
+        this.storedClass = storedClass;
+    }
+
+    /**
+     * Convert an object to the stored object.
+     *
+     * @param obj The object.
+     * @return The stored object.
+     */
+    @NotNull
+    public abstract S toStoredObject(@NotNull final A obj);
+
+    /**
+     * Convert an object to the accessed object.
+     *
+     * @param obj The object.
+     * @return The accessed object.
+     */
+    @NotNull
+    public abstract A toAccessedObject(@NotNull final S obj);
+
+    /**
+     * Get the class that is accessed (read / written).
+     *
+     * @return The class.
+     */
+    public Class<? extends A> getAccessedClass() {
+        return accessedClass;
+    }
+
+    /**
+     * Get the class that is stored internally.
+     *
+     * @return The class.
+     */
+    public Class<? extends S> getStoredClass() {
+        return storedClass;
+    }
+}

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

@@ -1,13 +1,22 @@
 package com.willfp.eco.core.integrations;
 
+import com.willfp.eco.core.registry.Registrable;
+import com.willfp.eco.core.registry.Registry;
+import org.jetbrains.annotations.NotNull;
+
 /**
  * Abstract class for integrations.
  */
-public interface Integration {
+public interface Integration extends Registrable {
     /**
      * Get the name of integration.
      *
      * @return The name.
      */
     String getPluginName();
+
+    @Override
+    default @NotNull String getID() {
+        return Registry.tryFitPattern(this.getPluginName());
+    }
 }

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

@@ -0,0 +1,131 @@
+package com.willfp.eco.core.integrations;
+
+import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.registry.Registry;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashSet;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Registry for integrations.
+ *
+ * @param <T> The type of integration.
+ */
+public class IntegrationRegistry<T extends Integration> extends Registry<T> {
+    @Override
+    public @NotNull T register(@NotNull final T element) {
+        return executeSafely(() -> super.register(element), element);
+    }
+
+    /**
+     * Iterate over all integrations, safely.
+     *
+     * @param action The action to perform.
+     */
+    public void forEachSafely(@NotNull final Consumer<T> action) {
+        for (T integration : new HashSet<>(this.values())) {
+            executeSafely(() -> action.accept(integration), integration);
+        }
+    }
+
+    /**
+     * If any integrations return true, safely.
+     *
+     * @param predicate The predicate to test.
+     * @return If any integrations return true.
+     */
+    public boolean anySafely(@NotNull final Predicate<T> predicate) {
+        for (T integration : new HashSet<>(this.values())) {
+            Boolean result = executeSafely(() -> predicate.test(integration), integration);
+            if (result != null && result) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get the first integration that returns a value, safely.
+     *
+     * @param function     The function to apply.
+     * @param defaultValue The default value.
+     * @param <R>          The type of value.
+     * @return The first value that returns a value.
+     */
+    @NotNull
+    public <R> R firstSafely(@NotNull final Function<T, R> function,
+                             @NotNull final R defaultValue) {
+        if (this.isEmpty()) {
+            return defaultValue;
+        }
+
+        T integration = this.iterator().next();
+
+        return executeSafely(() -> function.apply(integration), integration, defaultValue);
+    }
+
+    /**
+     * Executes a given action safely, catching any exceptions and logging the issue.
+     *
+     * @param action      The action to execute.
+     * @param integration The integration to apply the action on.
+     */
+    private void executeSafely(@NotNull final Runnable action,
+                               @NotNull final T integration) {
+        executeSafely(() -> {
+            action.run();
+            return null;
+        }, integration);
+    }
+
+    /**
+     * Executes a given action safely, catching any exceptions and logging the issue.
+     *
+     * @param action      The action to execute.
+     * @param integration The integration to apply the action on.
+     * @param <R>         The return type of the action.
+     * @return The result of the action, or null if an exception was thrown.
+     */
+    private <R> R executeSafely(@NotNull final Supplier<R> action,
+                                @NotNull final T integration) {
+        return executeSafely(action, integration, null);
+    }
+
+    /**
+     * Executes a given action safely, catching any exceptions and logging the issue.
+     *
+     * @param action       The action to execute.
+     * @param integration  The integration to apply the action on.
+     * @param defaultValue The default value to return if an exception is thrown.
+     * @param <R>          The return type of the action.
+     * @return The result of the action, or the default value if an exception was thrown.
+     */
+    private <R> R executeSafely(@NotNull final Supplier<R> action,
+                                @NotNull final T integration,
+                                @Nullable final R defaultValue) {
+        try {
+            return action.get();
+        } catch (final Exception e) {
+            Eco.get().getEcoPlugin().getLogger().warning("Integration for " + integration.getPluginName() + " threw an exception!");
+            Eco.get().getEcoPlugin().getLogger().warning("The integration will be disabled.");
+            e.printStackTrace();
+            this.remove(integration.getPluginName());
+            return defaultValue;
+        }
+    }
+
+    /**
+     * If all integrations return true, safely.
+     *
+     * @param predicate The predicate to test.
+     * @return If all integrations return true.
+     */
+    public boolean allSafely(@NotNull final Predicate<T> predicate) {
+        return !this.anySafely(predicate.negate());
+    }
+}

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

@@ -1,11 +1,9 @@
 package com.willfp.eco.core.integrations.afk;
 
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * Class to handle afk integrations.
  */
@@ -13,7 +11,7 @@ public final class AFKManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<AFKIntegration> REGISTERED = new HashSet<>();
+    private static final IntegrationRegistry<AFKIntegration> REGISTRY = new IntegrationRegistry<>();
 
     /**
      * Register a new integration.
@@ -21,8 +19,7 @@ public final class AFKManager {
      * @param integration The integration to register.
      */
     public static void register(@NotNull final AFKIntegration integration) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
+        REGISTRY.register(integration);
-        REGISTERED.add(integration);
     }
 
     /**
@@ -32,13 +29,7 @@ public final class AFKManager {
      * @return If afk.
      */
     public static boolean isAfk(@NotNull final Player player) {
-        for (AFKIntegration integration : REGISTERED) {
+        return REGISTRY.anySafely(integration -> integration.isAfk(player));
-            if (integration.isAfk(player)) {
-                return true;
-            }
-        }
-
-        return false;
     }
 
     private AFKManager() {

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

@@ -1,13 +1,11 @@
 package com.willfp.eco.core.integrations.anticheat;
 
 import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * Class to handle anticheat integrations.
  */
@@ -15,7 +13,7 @@ public final class AnticheatManager {
     /**
      * A set of all registered anticheats.
      */
-    private static final Set<AnticheatIntegration> ANTICHEATS = new HashSet<>();
+    private static final IntegrationRegistry<AnticheatIntegration> REGISTRY = new IntegrationRegistry<>();
 
     /**
      * Register a new anticheat.
@@ -26,8 +24,7 @@ public final class AnticheatManager {
         if (anticheat instanceof Listener) {
             Eco.get().getEcoPlugin().getEventManager().registerListener((Listener) anticheat);
         }
-        ANTICHEATS.removeIf(it -> it.getPluginName().equalsIgnoreCase(anticheat.getPluginName()));
+        REGISTRY.register(anticheat);
-        ANTICHEATS.add(anticheat);
     }
 
     /**
@@ -36,17 +33,16 @@ public final class AnticheatManager {
      * @param player The player to exempt.
      */
     public static void exemptPlayer(@NotNull final Player player) {
-        ANTICHEATS.forEach(anticheat -> anticheat.exempt(player));
+        REGISTRY.forEachSafely(anticheat -> anticheat.exempt(player));
     }
 
     /**
      * Unexempt a player from triggering anticheats.
-     * This is ran a tick after it is called to ensure that there are no event timing conflicts.
      *
      * @param player The player to remove the exemption.
      */
     public static void unexemptPlayer(@NotNull final Player player) {
-        ANTICHEATS.forEach(anticheat -> anticheat.unexempt(player));
+        REGISTRY.forEachSafely(anticheat -> anticheat.unexempt(player));
     }
 
     private AnticheatManager() {

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.integrations.antigrief;
 
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
@@ -16,7 +17,7 @@ public final class AntigriefManager {
     /**
      * Registered antigriefs.
      */
-    private static final Set<AntigriefIntegration> REGISTERED = new HashSet<>();
+    private static final IntegrationRegistry<AntigriefIntegration> REGISTRY = new IntegrationRegistry<>();
 
     /**
      * Register a new AntiGrief/Land Management integration.
@@ -24,8 +25,7 @@ public final class AntigriefManager {
      * @param antigrief The integration to register.
      */
     public static void register(@NotNull final AntigriefIntegration antigrief) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(antigrief.getPluginName()));
+        REGISTRY.register(antigrief);
-        REGISTERED.add(antigrief);
     }
 
     /**
@@ -34,8 +34,7 @@ public final class AntigriefManager {
      * @param antigrief The integration to unregister.
      */
     public static void unregister(@NotNull final AntigriefIntegration antigrief) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(antigrief.getPluginName()));
+        REGISTRY.remove(antigrief);
-        REGISTERED.remove(antigrief);
     }
 
     /**
@@ -47,7 +46,7 @@ public final class AntigriefManager {
      */
     public static boolean canPickupItem(@NotNull final Player player,
                                         @NotNull final Location location) {
-        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canPickupItem(player, location));
+        return REGISTRY.allSafely(integration -> integration.canPickupItem(player, location));
     }
 
     /**
@@ -59,7 +58,7 @@ public final class AntigriefManager {
      */
     public static boolean canBreakBlock(@NotNull final Player player,
                                         @NotNull final Block block) {
-        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canBreakBlock(player, block));
+        return REGISTRY.allSafely(integration -> integration.canBreakBlock(player, block));
     }
 
     /**
@@ -71,7 +70,7 @@ public final class AntigriefManager {
      */
     public static boolean canCreateExplosion(@NotNull final Player player,
                                              @NotNull final Location location) {
-        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canCreateExplosion(player, location));
+        return REGISTRY.allSafely(integration -> integration.canCreateExplosion(player, location));
     }
 
     /**
@@ -83,7 +82,7 @@ public final class AntigriefManager {
      */
     public static boolean canPlaceBlock(@NotNull final Player player,
                                         @NotNull final Block block) {
-        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canPlaceBlock(player, block));
+        return REGISTRY.allSafely(integration -> integration.canPlaceBlock(player, block));
     }
 
     /**
@@ -95,7 +94,7 @@ public final class AntigriefManager {
      */
     public static boolean canInjure(@NotNull final Player player,
                                     @NotNull final LivingEntity victim) {
-        return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canInjure(player, victim));
+        return REGISTRY.allSafely(integration -> integration.canInjure(player, victim));
     }
 
     private AntigriefManager() {

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

@@ -1,10 +1,8 @@
 package com.willfp.eco.core.integrations.customentities;
 
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * Class to handle custom entity integrations.
  */
@@ -12,7 +10,7 @@ public final class CustomEntitiesManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<CustomEntitiesIntegration> REGISTERED = new HashSet<>();
+    private static final IntegrationRegistry<CustomEntitiesIntegration> REGISTRY = new IntegrationRegistry<>();
 
     /**
      * Register a new integration.
@@ -20,8 +18,7 @@ public final class CustomEntitiesManager {
      * @param integration The integration to register.
      */
     public static void register(@NotNull final CustomEntitiesIntegration integration) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
+        REGISTRY.register(integration);
-        REGISTERED.add(integration);
     }
 
     /**
@@ -30,9 +27,7 @@ public final class CustomEntitiesManager {
      * @see com.willfp.eco.core.entities.Entities
      */
     public static void registerAllEntities() {
-        for (CustomEntitiesIntegration integration : REGISTERED) {
+        REGISTRY.forEachSafely(CustomEntitiesIntegration::registerAllEntities);
-            integration.registerAllEntities();
-        }
     }
 
     private CustomEntitiesManager() {

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.integrations.customitems;
 
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
@@ -12,7 +13,7 @@ public final class CustomItemsManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<CustomItemsIntegration> REGISTERED = new HashSet<>();
+    private static final IntegrationRegistry<CustomItemsIntegration> REGISTRY = new IntegrationRegistry<>();
 
     /**
      * Register a new integration.
@@ -20,8 +21,7 @@ public final class CustomItemsManager {
      * @param integration The integration to register.
      */
     public static void register(@NotNull final CustomItemsIntegration integration) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
+        REGISTRY.register(integration);
-        REGISTERED.add(integration);
     }
 
     /**
@@ -30,9 +30,7 @@ public final class CustomItemsManager {
      * @see com.willfp.eco.core.items.Items
      */
     public static void registerAllItems() {
-        for (CustomItemsIntegration customItemsIntegration : REGISTERED) {
+        REGISTRY.forEachSafely(CustomItemsIntegration::registerAllItems);
-            customItemsIntegration.registerAllItems();
-        }
     }
 
     /**
@@ -41,9 +39,7 @@ public final class CustomItemsManager {
      * @see com.willfp.eco.core.items.Items
      */
     public static void registerProviders() {
-        for (CustomItemsIntegration customItemsIntegration : REGISTERED) {
+        REGISTRY.forEachSafely(CustomItemsIntegration::registerProvider);
-            customItemsIntegration.registerProvider();
-        }
     }
 
     private CustomItemsManager() {

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

@@ -1,11 +1,10 @@
 package com.willfp.eco.core.integrations.economy;
 
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
 
 import java.math.BigDecimal;
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * Class to handle economy.
@@ -14,7 +13,7 @@ public final class EconomyManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<EconomyIntegration> REGISTERED = new HashSet<>();
+    private static final IntegrationRegistry<EconomyIntegration> REGISTRY = new IntegrationRegistry<>();
 
     /**
      * Register a new integration.
@@ -22,8 +21,7 @@ public final class EconomyManager {
      * @param integration The integration to register.
      */
     public static void register(@NotNull final EconomyIntegration integration) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
+        REGISTRY.register(integration);
-        REGISTERED.add(integration);
     }
 
     /**
@@ -32,7 +30,7 @@ public final class EconomyManager {
      * @return If any economy.
      */
     public static boolean hasRegistrations() {
-        return !REGISTERED.isEmpty();
+        return REGISTRY.isNotEmpty();
     }
 
     /**
@@ -56,11 +54,10 @@ public final class EconomyManager {
      */
     public static boolean hasAmount(@NotNull final OfflinePlayer player,
                                     final BigDecimal amount) {
-        for (EconomyIntegration integration : REGISTERED) {
+        return REGISTRY.firstSafely(
-            return integration.hasAmount(player, amount);
+                integration -> integration.hasAmount(player, amount),
-        }
+                false
-
+        );
-        return false;
     }
 
     /**
@@ -84,11 +81,10 @@ public final class EconomyManager {
      */
     public static boolean giveMoney(@NotNull final OfflinePlayer player,
                                     @NotNull final BigDecimal amount) {
-        for (EconomyIntegration integration : REGISTERED) {
+        return REGISTRY.firstSafely(
-            return integration.giveMoney(player, amount);
+                integration -> integration.giveMoney(player, amount),
-        }
+                false
-
+        );
-        return false;
     }
 
     /**
@@ -112,11 +108,10 @@ public final class EconomyManager {
      */
     public static boolean removeMoney(@NotNull final OfflinePlayer player,
                                       @NotNull final BigDecimal amount) {
-        for (EconomyIntegration integration : REGISTERED) {
+        return REGISTRY.firstSafely(
-            return integration.removeMoney(player, amount);
+                integration -> integration.removeMoney(player, amount),
-        }
+                false
-
+        );
-        return false;
     }
 
     /**
@@ -136,11 +131,10 @@ public final class EconomyManager {
      * @return The balance.
      */
     public static BigDecimal getExactBalance(@NotNull final OfflinePlayer player) {
-        for (EconomyIntegration integration : REGISTERED) {
+        return REGISTRY.firstSafely(
-            return integration.getExactBalance(player);
+                integration -> integration.getExactBalance(player),
-        }
+                BigDecimal.ZERO
-
+        );
-        return BigDecimal.ZERO;
     }
 
     private EconomyManager() {

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

@@ -1,12 +1,10 @@
 package com.willfp.eco.core.integrations.guidetection;
 
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import com.willfp.eco.util.MenuUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * Class to handle GUI detection.
  */
@@ -14,7 +12,7 @@ public final class GUIDetectionManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<GUIDetectionIntegration> REGISTERED = new HashSet<>();
+    private static final IntegrationRegistry<GUIDetectionIntegration> REGISTRY = new IntegrationRegistry<>();
 
     /**
      * Register a new integration.
@@ -22,8 +20,7 @@ public final class GUIDetectionManager {
      * @param integration The integration to register.
      */
     public static void register(@NotNull final GUIDetectionIntegration integration) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
+        REGISTRY.register(integration);
-        REGISTERED.add(integration);
     }
 
     /**
@@ -37,13 +34,7 @@ public final class GUIDetectionManager {
             return true;
         }
 
-        for (GUIDetectionIntegration integration : REGISTERED) {
+        return REGISTRY.anySafely(integration -> integration.hasGUIOpen(player));
-            if (integration.hasGUIOpen(player)) {
-                return true;
-            }
-        }
-
-        return false;
     }
 
     private GUIDetectionManager() {

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

@@ -1,11 +1,10 @@
 package com.willfp.eco.core.integrations.hologram;
 
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import org.bukkit.Location;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Class to handle hologram integrations.
@@ -14,7 +13,7 @@ public final class HologramManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<HologramIntegration> REGISTERED = new HashSet<>();
+    private static final IntegrationRegistry<HologramIntegration> REGISTRY = new IntegrationRegistry<>();
 
     /**
      * Register a new integration.
@@ -22,8 +21,7 @@ public final class HologramManager {
      * @param integration The integration to register.
      */
     public static void register(@NotNull final HologramIntegration integration) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
+        REGISTRY.register(integration);
-        REGISTERED.add(integration);
     }
 
     /**
@@ -35,11 +33,10 @@ public final class HologramManager {
      */
     public static Hologram createHologram(@NotNull final Location location,
                                           @NotNull final List<String> contents) {
-        for (HologramIntegration integration : REGISTERED) {
+        return REGISTRY.firstSafely(
-            return integration.createHologram(location, contents);
+                integration -> integration.createHologram(location, contents),
-        }
+                new DummyHologram()
-
+        );
-        return new DummyHologram();
     }
 
     private HologramManager() {

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.integrations.mcmmo;
 
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import org.bukkit.block.Block;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
@@ -14,7 +15,7 @@ public final class McmmoManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<McmmoIntegration> REGISTERED = new HashSet<>();
+    private static final IntegrationRegistry<McmmoIntegration> REGISTERED = new IntegrationRegistry<>();
 
     /**
      * Register a new integration.
@@ -22,8 +23,7 @@ public final class McmmoManager {
      * @param integration The integration to register.
      */
     public static void register(@NotNull final McmmoIntegration integration) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
+        REGISTERED.register(integration);
-        REGISTERED.add(integration);
     }
 
     /**
@@ -34,13 +34,11 @@ public final class McmmoManager {
      */
     public static int getBonusDropCount(@NotNull final Block block) {
         int finalValue = 0;
+
         for (McmmoIntegration mcmmoIntegration : REGISTERED) {
             finalValue += mcmmoIntegration.getBonusDropCount(block);
-            
-
-
-            
         }
+
         return finalValue;
     }
 
@@ -51,13 +49,7 @@ public final class McmmoManager {
      * @return If the event is fake.
      */
     public static boolean isFake(@NotNull final Event event) {
-        for (McmmoIntegration mcmmoIntegration : REGISTERED) {
+        return REGISTERED.anySafely(integration -> integration.isFake(event));
-            if (mcmmoIntegration.isFake(event)) {
-                return true;
-            }
-
-        }
-        return false;
     }
 
     private McmmoManager() {

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.integrations.shop;
 
+import com.willfp.eco.core.integrations.IntegrationRegistry;
 import com.willfp.eco.core.price.Price;
 import com.willfp.eco.core.price.impl.PriceFree;
 import org.bukkit.entity.Player;
@@ -13,11 +14,12 @@ import java.util.Set;
 /**
  * Class to handle shop integrations.
  */
+@SuppressWarnings("DeprecatedIsStillUsed")
 public final class ShopManager {
     /**
      * A set of all registered integrations.
      */
-    private static final Set<ShopIntegration> REGISTERED = new HashSet<>();
+    private static final IntegrationRegistry<ShopIntegration> REGISTRY = new IntegrationRegistry<>();
 
     /**
      * Register a new integration.
@@ -25,17 +27,14 @@ public final class ShopManager {
      * @param integration The integration to register.
      */
     public static void register(@NotNull final ShopIntegration integration) {
-        REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(integration.getPluginName()));
+        REGISTRY.register(integration);
-        REGISTERED.add(integration);
     }
 
     /**
      * Register eco item provider for shop plugins.
      */
     public static void registerEcoProvider() {
-        for (ShopIntegration shopIntegration : REGISTERED) {
+        REGISTRY.forEachSafely(ShopIntegration::registerEcoProvider);
-            shopIntegration.registerEcoProvider();
-        }
     }
 
     /**
@@ -51,11 +50,7 @@ public final class ShopManager {
             return false;
         }
 
-        for (ShopIntegration integration : REGISTERED) {
+        return REGISTRY.anySafely(integration -> integration.isSellable(itemStack, player));
-            return integration.isSellable(itemStack, player);
-        }
-
-        return false;
     }
 
     /**
@@ -74,11 +69,10 @@ public final class ShopManager {
             return new PriceFree();
         }
 
-        for (ShopIntegration integration : REGISTERED) {
+        return REGISTRY.firstSafely(
-            return integration.getUnitValue(itemStack, player);
+                integration -> integration.getUnitValue(itemStack, player),
-        }
+                new PriceFree()
-
+        );
-        return new PriceFree();
     }
 
     /**
@@ -108,11 +102,10 @@ public final class ShopManager {
             return 0.0;
         }
 
-        for (ShopIntegration shopIntegration : REGISTERED) {
+        return REGISTRY.firstSafely(
-            return shopIntegration.getUnitValue(itemStack, player).getValue(player, itemStack.getAmount());
+                integration -> integration.getUnitValue(itemStack, player).getValue(player, itemStack.getAmount()),
-        }
+                0.0
-
+        );
-        return 0.0;
     }
 
     /**
@@ -121,7 +114,7 @@ public final class ShopManager {
      * @return The integrations.
      */
     public static Set<ShopIntegration> getRegisteredIntegrations() {
-        return new HashSet<>(REGISTERED);
+        return new HashSet<>(REGISTRY.values());
     }
 
     private ShopManager() {

eco-api/src/main/java/com/willfp/eco/core/registry/Registry.java

@@ -5,6 +5,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -14,7 +15,7 @@ import java.util.regex.Pattern;
  *
  * @param <T> The type of {@link Registrable}.
  */
-public class Registry<T extends Registrable> {
+public class Registry<T extends Registrable> implements Iterable<T> {
     /**
      * The ID pattern.
      */
@@ -25,6 +26,17 @@ public class Registry<T extends Registrable> {
      */
     private final Map<String, T> registry = new HashMap<>();
 
+    /**
+     * If the registry is locked.
+     */
+    private boolean isLocked = false;
+
+    /**
+     * The locker, used to 'secure' registries and prevent random unlocking.
+     */
+    @Nullable
+    private Object locker = null;
+
     /**
      * Instantiate a new registry.
      */
@@ -40,6 +52,10 @@ public class Registry<T extends Registrable> {
      */
     @NotNull
     public T register(@NotNull final T element) {
+        if (this.isLocked) {
+            throw new IllegalStateException("Cannot add to locked registry! (ID: " + element.getID() + ")");
+        }
+
         Validate.isTrue(ID_PATTERN.matcher(element.getID()).matches(), "ID must match pattern: " + ID_PATTERN.pattern() + " (was " + element.getID() + ")");
 
         registry.put(element.getID(), element);
@@ -56,6 +72,10 @@ public class Registry<T extends Registrable> {
      * @return The element.
      */
     public T remove(@NotNull final T element) {
+        if (this.isLocked) {
+            throw new IllegalStateException("Cannot remove from locked registry! (ID: " + element.getID() + ")");
+        }
+
         element.onRemove();
 
         registry.remove(element.getID());
@@ -71,6 +91,10 @@ public class Registry<T extends Registrable> {
      */
     @Nullable
     public T remove(@NotNull final String id) {
+        if (this.isLocked) {
+            throw new IllegalStateException("Cannot remove from locked registry! (ID: " + id + ")");
+        }
+
         T element = registry.get(id);
 
         if (element != null) {
@@ -109,6 +133,61 @@ public class Registry<T extends Registrable> {
         return Set.copyOf(registry.values());
     }
 
+    /**
+     * Get if the registry is locked.
+     *
+     * @return If the registry is locked.
+     */
+    public boolean isLocked() {
+        return isLocked;
+    }
+
+    /**
+     * Lock the registry.
+     *
+     * @param locker The locker.
+     */
+    public void lock(@Nullable final Object locker) {
+        this.locker = locker;
+        isLocked = true;
+    }
+
+    /**
+     * Unlock the registry.
+     *
+     * @param locker The locker.
+     */
+    public void unlock(@Nullable final Object locker) {
+        if (this.locker != locker) {
+            throw new IllegalArgumentException("Cannot unlock registry!");
+        }
+        isLocked = false;
+    }
+
+    /**
+     * Get if the registry is empty.
+     *
+     * @return If the registry is empty.
+     */
+    public boolean isEmpty() {
+        return registry.isEmpty();
+    }
+
+    /**
+     * Get if the registry is not empty.
+     *
+     * @return If the registry is not empty.
+     */
+    public boolean isNotEmpty() {
+        return !isEmpty();
+    }
+
+    @NotNull
+    @Override
+    public Iterator<T> iterator() {
+        return values().iterator();
+    }
+
     /**
      * Try to fit a string to the ID pattern.
      *

eco-api/src/main/java/com/willfp/eco/core/version/OutdatedEcoVersionError.java

@@ -0,0 +1,17 @@
+package com.willfp.eco.core.version;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An error thrown when eco is outdated.
+ */
+public class OutdatedEcoVersionError extends Error {
+    /**
+     * Create a new OutdatedEcoVersionError.
+     *
+     * @param message The message.
+     */
+    public OutdatedEcoVersionError(@NotNull final String message) {
+        super(message);
+    }
+}

eco-api/src/main/java/com/willfp/eco/core/version/Version.java

@@ -0,0 +1,53 @@
+package com.willfp.eco.core.version;
+
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A minimal class to represent a version, uses DefaultArtifactVersion under the hood.
+ * <p>
+ * This class exists to resolve issues where 1.17 doesn't include DefaultArtifactVersion.
+ */
+public class Version implements Comparable<Version> {
+    /**
+     * The version.
+     */
+    private final DefaultArtifactVersion version;
+
+    /**
+     * Create a new version.
+     *
+     * @param version The version.
+     */
+    public Version(@NotNull final String version) {
+        this.version = new DefaultArtifactVersion(version);
+    }
+
+    @Override
+    public int compareTo(@NotNull final Version o) {
+        return this.version.compareTo(o.version);
+    }
+
+    @Override
+    public String toString() {
+        return this.version.toString();
+    }
+
+    @Override
+    public boolean equals(@NotNull final Object obj) {
+        if (obj == this) {
+            return true;
+        }
+
+        if (!(obj instanceof Version other)) {
+            return false;
+        }
+
+        return this.version.equals(other.version);
+    }
+
+    @Override
+    public int hashCode() {
+        return this.version.hashCode();
+    }
+}

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

@@ -38,6 +38,15 @@ class DSLConfig internal constructor(type: ConfigType) : GenericConfig(type) {
 fun config(type: ConfigType = ConfigType.YAML, builder: DSLConfig.() -> Unit): Config =
     DSLConfig(type).apply(builder)
 
+/**
+ * Helper function to create JSON configs with a kotlin DSL.
+ *
+ * @param builder The builder.
+ * @return The config.
+ */
+fun json(builder: DSLConfig.() -> Unit): Config =
+    config(ConfigType.JSON, builder)
+
 /** @see Configs.empty */
 fun emptyConfig() = Configs.empty()
 

eco-api/src/main/kotlin/com/willfp/eco/core/registry/KRegistrable.kt

@@ -0,0 +1,13 @@
+package com.willfp.eco.core.registry
+
+/**
+ * A registrable that has a string ID, for use with Kotlin.
+ */
+interface KRegistrable : Registrable {
+    /**
+     * The ID of the registrable.
+     */
+    val id: String
+
+    override fun getID() = id
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/data/VersionAdapters.kt

@@ -0,0 +1,27 @@
+package com.willfp.eco.internal.data
+
+import com.willfp.eco.core.data.ExternalDataStoreObjectAdapter
+import com.willfp.eco.core.version.Version
+
+object VersionToStringAdapter: ExternalDataStoreObjectAdapter<Version, String>(
+    Version::class.java,
+    String::class.java
+) {
+    override fun toAccessedObject(obj: String): Version = Version(obj)
+
+    override fun toStoredObject(obj: Version): String = obj.toString()
+}
+
+class MavenVersionToStringAdapter(
+    className: String
+): ExternalDataStoreObjectAdapter<Any, String>(
+    Class.forName(className),
+    String::class.java
+) {
+    private val constructor = Class.forName(className)
+        .getConstructor(String::class.java)
+
+    override fun toAccessedObject(obj: String): Any = constructor.newInstance(obj)
+
+    override fun toStoredObject(obj: Any): String = obj.toString()
+}

eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/SNBTConverter.kt

@@ -45,7 +45,7 @@ class SNBTConverter : SNBTConverterProxy {
             val nms = CraftItemStack.asNMSCopy(itemStack)
             val nmsTag = nms.save(CompoundTag())
             nmsTag.remove("Count")
-            return tag.copy().merge(nmsTag) == nmsTag
+            return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
         }
 
         override fun getItem(): ItemStack = item

eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/SNBTConverter.kt

@@ -45,7 +45,7 @@ class SNBTConverter : SNBTConverterProxy {
             val nms = CraftItemStack.asNMSCopy(itemStack)
             val nmsTag = nms.save(CompoundTag())
             nmsTag.remove("Count")
-            return tag.copy().merge(nmsTag) == nmsTag
+            return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
         }
 
         override fun getItem(): ItemStack = item

eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/SNBTConverter.kt

@@ -45,7 +45,7 @@ class SNBTConverter : SNBTConverterProxy {
             val nms = CraftItemStack.asNMSCopy(itemStack)
             val nmsTag = nms.save(CompoundTag())
             nmsTag.remove("Count")
-            return tag.copy().merge(nmsTag) == nmsTag
+            return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
         }
 
         override fun getItem(): ItemStack = item

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/SNBTConverter.kt

@@ -3,6 +3,7 @@ package com.willfp.eco.internal.spigot.proxy.v1_19_R1
 import com.willfp.eco.core.items.TestableItem
 import com.willfp.eco.core.recipe.parts.EmptyTestableItem
 import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
+import com.willfp.eco.internal.spigot.proxy.common.toMaterial
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.SnbtPrinterTagVisitor
 import net.minecraft.nbt.TagParser
@@ -44,7 +45,7 @@ class SNBTConverter : SNBTConverterProxy {
             val nms = CraftItemStack.asNMSCopy(itemStack)
             val nmsTag = nms.save(CompoundTag())
             nmsTag.remove("Count")
-            return tag.copy().merge(nmsTag) == nmsTag
+            return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
         }
 
         override fun getItem(): ItemStack = item

eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/SNBTConverter.kt

@@ -44,7 +44,7 @@ class SNBTConverter : SNBTConverterProxy {
             val nms = CraftItemStack.asNMSCopy(itemStack)
             val nmsTag = nms.save(CompoundTag())
             nmsTag.remove("Count")
-            return tag.copy().merge(nmsTag) == nmsTag
+            return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
         }
 
         override fun getItem(): ItemStack = item

eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R3/SNBTConverter.kt

@@ -44,7 +44,7 @@ class SNBTConverter : SNBTConverterProxy {
             val nms = CraftItemStack.asNMSCopy(itemStack)
             val nmsTag = nms.save(CompoundTag())
             nmsTag.remove("Count")
-            return tag.copy().merge(nmsTag) == nmsTag
+            return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
         }
 
         override fun getItem(): ItemStack = item

eco-core/core-plugin/build.gradle.kts

@@ -37,7 +37,7 @@ dependencies {
     compileOnly("com.github.jiangdashao:matrix-api-repo:317d4635fd")
     compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.1.202")
     compileOnly("me.clip:placeholderapi:2.10.10")
-    compileOnly("com.github.oraxen:oraxen:bea381fb82")
+    compileOnly("com.github.oraxen:oraxen:1.155.0")
     compileOnly("com.github.brcdev-minecraft:shopgui-api:3.0.0")
     compileOnly("com.github.LoneDev6:API-ItemsAdder:2.4.7")
     compileOnly("com.arcaniax:HeadDatabase-API:1.3.0")

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

@@ -3,6 +3,7 @@ package com.willfp.eco.internal.spigot
 import com.willfp.eco.core.Eco
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.Prerequisite
+import com.willfp.eco.core.data.ExternalDataStore
 import com.willfp.eco.core.entities.Entities
 import com.willfp.eco.core.integrations.IntegrationLoader
 import com.willfp.eco.core.integrations.afk.AFKManager
@@ -19,6 +20,8 @@ import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.packet.PacketListener
 import com.willfp.eco.core.particle.Particles
 import com.willfp.eco.core.price.Prices
+import com.willfp.eco.internal.data.MavenVersionToStringAdapter
+import com.willfp.eco.internal.data.VersionToStringAdapter
 import com.willfp.eco.internal.entities.EntityArgParserAdult
 import com.willfp.eco.internal.entities.EntityArgParserAttackDamage
 import com.willfp.eco.internal.entities.EntityArgParserAttackSpeed
@@ -120,6 +123,7 @@ import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInComplex
 import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInVanilla
 import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapedCraftingRecipeStackHandler
 import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapelessCraftingRecipeStackHandler
+import com.willfp.eco.util.ClassUtils
 import me.TechsCode.UltraEconomy.UltraEconomy
 import net.kyori.adventure.platform.bukkit.BukkitAudiences
 import net.milkbowl.vault.economy.Economy
@@ -178,6 +182,20 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         SegmentParserUseIfPresent.register()
 
         CustomItemsManager.registerProviders()
+
+        ExternalDataStore.registerAdapter(VersionToStringAdapter)
+        // Handle with shadow.
+        val className = listOf(
+            "org",
+            "apache",
+            "maven",
+            "artifact",
+            "versioning",
+            "DefaultArtifactVersion"
+        ).joinToString(".")
+        if (ClassUtils.exists(className)) {
+            ExternalDataStore.registerAdapter(MavenVersionToStringAdapter(className))
+        }
     }
 
     override fun handleEnable() {
@@ -270,6 +288,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             IntegrationLoader("CombatLogX") {
                 val pluginManager = Bukkit.getPluginManager()
                 val combatLogXPlugin = pluginManager.getPlugin("CombatLogX") ?: return@IntegrationLoader
+
                 @Suppress("DEPRECATION")
                 val pluginVersion = combatLogXPlugin.description.version
                 if (pluginVersion.startsWith("10")) {
@@ -294,7 +313,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             IntegrationLoader("MythicMobs") { CustomEntitiesManager.register(CustomEntitiesMythicMobs()) },
 
             // Custom Items
-            IntegrationLoader("Oraxen") { CustomItemsManager.register(CustomItemsOraxen()) },
+            IntegrationLoader("Oraxen") { CustomItemsManager.register(CustomItemsOraxen(this)) },
             IntegrationLoader("ItemsAdder") { CustomItemsManager.register(CustomItemsItemsAdder()) },
             IntegrationLoader("HeadDatabase") { CustomItemsManager.register(CustomItemsHeadDatabase(this)) },
             IntegrationLoader("ExecutableItems") { CustomItemsManager.register(CustomItemsExecutableItems()) },

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.internal.spigot.integrations.customitems
 
+import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration
 import com.willfp.eco.core.items.CustomItem
 import com.willfp.eco.core.items.Items
@@ -7,16 +8,27 @@ import com.willfp.eco.core.items.TestableItem
 import com.willfp.eco.core.items.provider.ItemProvider
 import com.willfp.eco.util.NamespacedKeyUtils
 import io.th0rgal.oraxen.api.OraxenItems
+import io.th0rgal.oraxen.api.events.OraxenItemsLoadedEvent
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
 
-class CustomItemsOraxen : CustomItemsIntegration {
+class CustomItemsOraxen(
+    private val plugin: EcoPlugin
+) : CustomItemsIntegration, Listener {
     override fun registerProvider() {
-        Items.registerItemProvider(OraxenProvider())
+        plugin.eventManager.registerListener(this)
     }
 
     override fun getPluginName(): String {
         return "Oraxen"
     }
 
+    @EventHandler
+    @Suppress("UNUSED_PARAMETER")
+    fun onItemRegister(event: OraxenItemsLoadedEvent) {
+        Items.registerItemProvider(OraxenProvider())
+    }
+
     private class OraxenProvider : ItemProvider("oraxen") {
         override fun provideForKey(key: String): TestableItem? {
             val item = OraxenItems.getItemById(key) ?: return null

gradle.properties

@@ -1,3 +1,3 @@
-version = 6.53.1
+version = 6.55.0
 plugin-name = eco
 kotlin.code.style = official