From 69704c0550caae91b50763f2a9b9dba8dde01426 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 25 Dec 2020 20:47:41 +0000 Subject: [PATCH] Fixed config updater --- .../eco/util/command/AbstractCommand.java | 3 ++- .../willfp/eco/util/config/ConfigHandler.java | 2 +- .../eco/util/plugin/AbstractEcoPlugin.java | 20 +++++++------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java b/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java index 0455e33c..c0adfdef 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java +++ b/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java @@ -152,5 +152,6 @@ public abstract class AbstractCommand extends PluginDependent implements Command * @param sender The sender of the command * @param args The arguments of the command */ - protected abstract void onExecute(CommandSender sender, List args); + protected abstract void onExecute(CommandSender sender, + List args); } diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java b/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java index 49a8689a..e4e9086b 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java @@ -36,7 +36,7 @@ public class ConfigHandler extends PluginDependent { public void callUpdate() { updatableClasses.forEach(clazz -> Arrays.stream(clazz.getDeclaredMethods()).forEach(method -> { if (method.isAnnotationPresent(ConfigUpdater.class)) { - if (method.getParameterTypes().length == 0) { + if (method.getParameterTypes().length != 0) { throw new InvalidUpdateMethodException("Update method must not have parameters."); } if (!Modifier.isStatic(method.getModifiers())) { diff --git a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java index 6caf4fd2..46e0451e 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java +++ b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java @@ -240,13 +240,18 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { } }); + + updatableClasses.add(Configs.class); + updatableClasses.add(DropManager.class); + updatableClasses.addAll(this.getUpdatableClasses()); + this.getListeners().forEach(listener -> this.getEventManager().registerListener(listener)); this.getCommands().forEach(AbstractCommand::register); this.getScheduler().runLater(this::afterLoad, 1); - this.getUpdatableClasses().forEach(clazz -> this.getConfigHandler().registerUpdatableClass(clazz)); + this.updatableClasses.forEach(clazz -> this.getConfigHandler().registerUpdatableClass(clazz)); this.enable(); } @@ -314,7 +319,7 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { this.getScheduler().cancelAll(); new FastCollatedDropQueue.CollatedRunnable(this); - this.reload(); + this.onReload(); } /** @@ -342,17 +347,6 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { return integrations; } - /** - * Default updatable classes that exist within internal libraries. - * - * @return The default updatable classes. - */ - public final List> getDefaultUpdatableClasses() { - updatableClasses.add(Configs.class); - updatableClasses.add(DropManager.class); - return updatableClasses; - } - /** * The plugin-specific code to be executed on enable. */