From f7d47fa6245040ead7d929110a7bee5968f8920e Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 18 Aug 2021 17:23:44 +0100 Subject: [PATCH] Renamed EssentialsManager to RegistrationManager --- .../com/willfp/ecoenchants/EcoEnchantsPlugin.java | 9 +++++---- .../integrations/essentials/EssentialsWrapper.java | 11 ----------- .../RegistrationManager.java} | 10 +++++----- .../registration/RegistrationWrapper.java | 11 +++++++++++ .../plugins/IntegrationEssentials.java | 6 +++--- 5 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsWrapper.java rename eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/{essentials/EssentialsManager.java => registration/RegistrationManager.java} (62%) create mode 100644 eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/RegistrationWrapper.java rename eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/{essentials => registration}/plugins/IntegrationEssentials.java (82%) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java index ede884a7..c49d600c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java @@ -22,8 +22,8 @@ import com.willfp.ecoenchants.enchantments.support.obtaining.VillagerListeners; import com.willfp.ecoenchants.enchantments.util.ItemConversions; import com.willfp.ecoenchants.enchantments.util.TimedRunnable; import com.willfp.ecoenchants.enchantments.util.WatcherTriggers; -import com.willfp.ecoenchants.integrations.essentials.EssentialsManager; -import com.willfp.ecoenchants.integrations.essentials.plugins.IntegrationEssentials; +import com.willfp.ecoenchants.integrations.registration.RegistrationManager; +import com.willfp.ecoenchants.integrations.registration.plugins.IntegrationEssentials; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.World; @@ -111,13 +111,14 @@ public class EcoEnchantsPlugin extends EcoPlugin { world.getPopulators().add(new LootPopulator(this)); } } - EssentialsManager.registerEnchantments(); + RegistrationManager.registerEnchantments(); } @Override protected List loadIntegrationLoaders() { return Arrays.asList( - new IntegrationLoader("Essentials", () -> EssentialsManager.register(new IntegrationEssentials())) + new IntegrationLoader("Essentials", () -> RegistrationManager.register(new IntegrationEssentials())), + new IntegrationLoader("ShopGUIPlus", () -> RegistrationManager.register(new IntegrationShopGUIPlus())) ); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsWrapper.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsWrapper.java deleted file mode 100644 index 408f416f..00000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsWrapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.willfp.ecoenchants.integrations.essentials; - -import com.willfp.eco.core.integrations.Integration; - -public interface EssentialsWrapper extends Integration { - /** - * @see EssentialsManager#registerEnchantments(); - */ - void registerAllEnchantments(); -} - diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsManager.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/RegistrationManager.java similarity index 62% rename from eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsManager.java rename to eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/RegistrationManager.java index 86d0c76c..8612e7b2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsManager.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/RegistrationManager.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.integrations.essentials; +package com.willfp.ecoenchants.integrations.registration; import lombok.experimental.UtilityClass; import org.jetbrains.annotations.NotNull; @@ -7,18 +7,18 @@ import java.util.HashSet; import java.util.Set; @UtilityClass -public class EssentialsManager { +public class RegistrationManager { /** * All registered essentials integrations. */ - private static final Set REGISTERED = new HashSet<>(); + private static final Set REGISTERED = new HashSet<>(); /** * Register a new essentials integration. * * @param essentials The integration to register. */ - public static void register(@NotNull final EssentialsWrapper essentials) { + public static void register(@NotNull final RegistrationWrapper essentials) { REGISTERED.add(essentials); } @@ -26,6 +26,6 @@ public class EssentialsManager { * Register all {@link com.willfp.ecoenchants.enchantments.EcoEnchant}s with Essentials. */ public static void registerEnchantments() { - REGISTERED.forEach(EssentialsWrapper::registerAllEnchantments); + REGISTERED.forEach(RegistrationWrapper::registerAllEnchantments); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/RegistrationWrapper.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/RegistrationWrapper.java new file mode 100644 index 00000000..2804f63b --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/RegistrationWrapper.java @@ -0,0 +1,11 @@ +package com.willfp.ecoenchants.integrations.registration; + +import com.willfp.eco.core.integrations.Integration; + +public interface RegistrationWrapper extends Integration { + /** + * @see RegistrationManager#registerEnchantments(); + */ + void registerAllEnchantments(); +} + diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/plugins/IntegrationEssentials.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/plugins/IntegrationEssentials.java similarity index 82% rename from eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/plugins/IntegrationEssentials.java rename to eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/plugins/IntegrationEssentials.java index 743dfb24..70927125 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/plugins/IntegrationEssentials.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/registration/plugins/IntegrationEssentials.java @@ -1,16 +1,16 @@ -package com.willfp.ecoenchants.integrations.essentials.plugins; +package com.willfp.ecoenchants.integrations.registration.plugins; import com.earth2me.essentials.Enchantments; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.integrations.essentials.EssentialsWrapper; +import com.willfp.ecoenchants.integrations.registration.RegistrationWrapper; import org.apache.commons.lang.reflect.FieldUtils; import org.bukkit.enchantments.Enchantment; import java.util.Map; @SuppressWarnings("unchecked") -public class IntegrationEssentials implements EssentialsWrapper { +public class IntegrationEssentials implements RegistrationWrapper { @Override public void registerAllEnchantments() { try {