From a20cb637552c435e35d5580ee1468ac2eae1fca7 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 27 Apr 2022 13:18:57 +0100 Subject: [PATCH] Improved integration API --- .../java/com/willfp/eco/core/integrations/afk/AFKManager.java | 1 + .../willfp/eco/core/integrations/anticheat/AnticheatManager.java | 1 + .../willfp/eco/core/integrations/antigrief/AntigriefManager.java | 1 + .../core/integrations/customentities/CustomEntitiesManager.java | 1 + .../eco/core/integrations/customitems/CustomItemsManager.java | 1 + .../com/willfp/eco/core/integrations/economy/EconomyManager.java | 1 + .../willfp/eco/core/integrations/hologram/HologramManager.java | 1 + .../com/willfp/eco/core/integrations/mcmmo/McmmoManager.java | 1 + .../java/com/willfp/eco/core/integrations/shop/ShopManager.java | 1 + 9 files changed, 9 insertions(+) diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java index 93710743..0fe4b1f4 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java @@ -21,6 +21,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())); REGISTERED.add(integration); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java index e85783fd..7ce9a87d 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java @@ -40,6 +40,7 @@ public final class AnticheatManager { if (anticheat instanceof Listener) { Eco.getHandler().getEcoPlugin().getEventManager().registerListener((Listener) anticheat); } + ANTICHEATS.removeIf(it -> it.getPluginName().equalsIgnoreCase(anticheat.getPluginName())); ANTICHEATS.add(anticheat); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java index 0321f1e5..c96fcd52 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java @@ -24,6 +24,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())); REGISTERED.add(antigrief); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java index 43903f95..d8b2f163 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java @@ -20,6 +20,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())); REGISTERED.add(integration); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java index b199c38f..047fbf9f 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java @@ -20,6 +20,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())); REGISTERED.add(integration); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java index 67043007..302b3385 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java @@ -21,6 +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())); REGISTERED.add(integration); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java index f3b0f5b6..5075ab03 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java @@ -22,6 +22,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())); REGISTERED.add(integration); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java index 135b0516..ca81bfca 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java @@ -22,6 +22,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.add(integration); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java index 24887f86..db6ee787 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java @@ -23,6 +23,7 @@ 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())); REGISTERED.add(integration); }