From f05913dc0bd83038c6c3ee13f0cb2b510cf508df Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Fri, 28 Aug 2020 22:44:50 +0100
Subject: [PATCH] Finalised Essentials Integration

---
 .../commands/CommandEcoreload.java            | 32 +++++++++++--------
 .../com/willfp/ecoenchants/loader/Loader.java | 10 ++++++
 Plugin/src/main/resources/plugin.yml          |  1 -
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcoreload.java b/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcoreload.java
index f44675d6..5cbb609e 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcoreload.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcoreload.java
@@ -21,23 +21,27 @@ public class CommandEcoreload implements CommandExecutor {
                     return true;
                 }
             }
-            ConfigManager.updateConfigs();
-            EnchantmentRarity.update();
-            EcoEnchants.update();
-            EnchantDisplay.update();
-
-            EcoEnchants.getAll().forEach((ecoEnchant -> {
-                HandlerList.unregisterAll(ecoEnchant);
-
-                Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> {
-                    if(!ecoEnchant.isDisabled()) {
-                        Bukkit.getPluginManager().registerEvents(ecoEnchant, Main.getInstance());
-                    }
-                }, 1);
-            }));
+            reload();
             sender.sendMessage(ConfigManager.getLang().getMessage("reloaded"));
         }
 
         return false;
     }
+
+    public static void reload() {
+        ConfigManager.updateConfigs();
+        EnchantmentRarity.update();
+        EcoEnchants.update();
+        EnchantDisplay.update();
+
+        EcoEnchants.getAll().forEach((ecoEnchant -> {
+            HandlerList.unregisterAll(ecoEnchant);
+
+            Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> {
+                if(!ecoEnchant.isDisabled()) {
+                    Bukkit.getPluginManager().registerEvents(ecoEnchant, Main.getInstance());
+                }
+            }, 1);
+        }));
+    }
 }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
index 541e1d3c..cb85413a 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
@@ -367,6 +367,7 @@ public class Loader {
         }));
         Bukkit.getLogger().info("");
 
+
         /*
         Load Commands
          */
@@ -414,6 +415,15 @@ public class Loader {
             Bukkit.getLogger().info("----------------------------");
         });
 
+        /*
+        Reload Data
+         */
+
+        Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> {
+            Bukkit.getLogger().info("Reloading...");
+            CommandEcoreload.reload();
+        }, 2);
+
         /*
         Finish
          */
diff --git a/Plugin/src/main/resources/plugin.yml b/Plugin/src/main/resources/plugin.yml
index cd46b21f..7ec84989 100644
--- a/Plugin/src/main/resources/plugin.yml
+++ b/Plugin/src/main/resources/plugin.yml
@@ -13,7 +13,6 @@ softdepend:
   - Towny
   - FactionsUUID
   - Lands
-  - AdvancedEnchantments
   - NoCheatPlus
   - AAC
   - Matrix