make module manager instantiable

Author: UrAvgCode

src/main/java/com/uravgcode/modernessentials/ModernEssentials.java

@@ -11,6 +11,9 @@
 public final class ModernEssentials extends JavaPlugin {
     private static ModernEssentials instance = null;
 
+    private ConfigUpdater configUpdater = null;
+    private ModuleManager moduleManager = null;
+
     public static @NotNull ModernEssentials instance() {
         return Objects.requireNonNull(instance, "plugin not initialized");
     }
@@ -23,14 +26,15 @@ public void onLoad() {
     @Override
     public void onEnable() {
         new UpdateChecker().checkForUpdate(this);
-        new ConfigUpdater(this).updateConfig();
-        ModuleManager.initializeModules(this);
+        configUpdater = new ConfigUpdater(this);
+        moduleManager = new ModuleManager(this);
         reload();
     }
 
     public void reload() {
         saveDefaultConfig();
         reloadConfig();
-        ModuleManager.reloadModules();
+        configUpdater.updateConfig();
+        moduleManager.reloadModules();
     }
 }

src/main/java/com/uravgcode/modernessentials/manager/ModuleManager.java

@@ -11,15 +11,33 @@
 import java.util.List;
 
 public final class ModuleManager {
-    private static final List<@NotNull PluginModule> modules = new ArrayList<>();
+    private final List<@NotNull PluginModule> modules;
 
-    private ModuleManager() {
+    public ModuleManager(@NotNull JavaPlugin plugin) {
+        final var logger = plugin.getComponentLogger();
+
+        modules = new ArrayList<>();
+        for (final var clazz : discoverModules()) {
+            try {
+                final var constructor = clazz.getConstructor(JavaPlugin.class);
+                final var module = constructor.newInstance(plugin);
+                modules.add(module);
+            } catch (Exception exception) {
+                logger.warn("Failed to initialize {}: {}", clazz.getSimpleName(), exception.getMessage());
+            }
+        }
+
+        logger.info("Initialized {} modules", modules.size());
     }
 
-    public static List<@NotNull Class<? extends PluginModule>> discoverModules() {
+    public void reloadModules() {
+        modules.forEach(PluginModule::reload);
+    }
+
+    private List<@NotNull Class<? extends PluginModule>> discoverModules() {
         try {
             final var moduleClasses = new ArrayList<Class<? extends PluginModule>>();
-            final var classLoader = ModuleManager.class.getClassLoader();
+            final var classLoader = getClass().getClassLoader();
             final var classPath = ClassPath.from(classLoader);
 
             final var packageName = "com.uravgcode.modernessentials.module";
@@ -39,25 +57,4 @@ private ModuleManager() {
             throw new RuntimeException(exception);
         }
     }
-
-    public static void initializeModules(@NotNull JavaPlugin plugin) {
-        final var logger = plugin.getComponentLogger();
-
-        modules.clear();
-        for (final var clazz : discoverModules()) {
-            try {
-                final var constructor = clazz.getConstructor(JavaPlugin.class);
-                final var module = constructor.newInstance(plugin);
-                modules.add(module);
-            } catch (Exception exception) {
-                logger.warn("Failed to initialize {}: {}", clazz.getSimpleName(), exception.getMessage());
-            }
-        }
-
-        logger.info("Initialized {} modules", modules.size());
-    }
-
-    public static void reloadModules() {
-        modules.forEach(PluginModule::reload);
-    }
 }