Use shared methods from MultiverseModule

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/netherportals/MultiverseNetherPortals.java

@@ -9,9 +9,9 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import org.mvplugins.multiverse.core.MultiverseCoreApi;
-import org.mvplugins.multiverse.core.MultiversePlugin;
 import org.mvplugins.multiverse.core.config.CoreConfig;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocatorFactory;
+import org.mvplugins.multiverse.core.module.MultiverseModule;
 import org.mvplugins.multiverse.core.utils.StringFormatter;
 import org.mvplugins.multiverse.netherportals.commands.NetherPortalsCommand;
 import org.mvplugins.multiverse.netherportals.listeners.MVNPListener;
@@ -29,7 +29,7 @@
 import org.mvplugins.multiverse.portals.MultiversePortals;
 import org.mvplugins.multiverse.portals.utils.PortalManager;
 
-public class MultiverseNetherPortals extends MultiversePlugin {
+public class MultiverseNetherPortals extends MultiverseModule {
 
     private static final double TARGET_CORE_API_VERSION = 5.0;
 
@@ -45,15 +45,14 @@ public class MultiverseNetherPortals extends MultiversePlugin {
     private Map<String, String> linkMap;
     private Map<String, String> endLinkMap;
 
-    private PluginServiceLocator serviceLocator;
     @Inject
     private Provider<CoreConfig> coreConfig;
     @Inject
     private Provider<MVCommandManager> commandManager;
 
     @Override
     public void onLoad() {
-        super.onEnable();
+        super.onLoad();
         getDataFolder().mkdirs();
     }
 
@@ -71,27 +70,16 @@ public void onEnable() {
             return;
         }
 
-        initializeDependencyInjection();
+        initializeDependencyInjection(new MultiverseNetherPortalsPluginBinder(this));
         Logging.setDebugLevel(coreConfig.get().getGlobalDebug());
 
         loadConfig();
-        this.registerCommands();
+        this.registerCommands(NetherPortalsCommand.class);
         this.registerEvents();
 
         Logging.log(true, Level.INFO, " Enabled - By %s", StringFormatter.joinAnd(this.getDescription().getAuthors()));
     }
 
-    private void initializeDependencyInjection() {
-        serviceLocator = PluginServiceLocatorFactory.get()
-                .registerPlugin(new MultiverseNetherPortalsPluginBinder(this), core.getServiceLocator())
-                .flatMap(PluginServiceLocator::enable)
-                .getOrElseThrow(exception -> {
-                    Logging.severe("Failed to initialize dependency injection!");
-                    getServer().getPluginManager().disablePlugin(this);
-                    return new RuntimeException(exception);
-                });
-    }
-
     public void loadConfig() {
         initMVNPConfig();
 
@@ -159,19 +147,6 @@ private void initMVNPConfig() {
         }
     }
 
-    /**
-     * Register commands to Multiverse's CommandHandler so we get a super sexy single menu
-     */
-    private void registerCommands() {
-        Try.of(() -> commandManager.get())
-                .andThenTry(commandManager -> serviceLocator.getAllServices(NetherPortalsCommand.class)
-                        .forEach(commandManager::registerCommand))
-                .onFailure(e -> {
-                    Logging.severe("Failed to register commands");
-                    e.printStackTrace();
-                });
-    }
-
     private void registerEvents() {
         var pluginManager = getServer().getPluginManager();
 
@@ -192,11 +167,6 @@ public double getTargetCoreVersion() {
         return TARGET_CORE_API_VERSION;
     }
 
-    @Override
-    public PluginServiceLocator getServiceLocator() {
-        return serviceLocator;
-    }
-
     public void setNetherPrefix(String netherPrefix) {
         this.MVNPConfiguration.set("portal-auto-link-when.nether.prefix", netherPrefix);
     }

src/main/java/org/mvplugins/multiverse/netherportals/MultiverseNetherPortalsPluginBinder.java

@@ -1,10 +1,11 @@
 package org.mvplugins.multiverse.netherportals;
 
 import org.mvplugins.multiverse.core.inject.binder.JavaPluginBinder;
+import org.mvplugins.multiverse.core.module.MultiverseModuleBinder;
 import org.mvplugins.multiverse.external.glassfish.hk2.utilities.binding.ScopedBindingBuilder;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 
-public class MultiverseNetherPortalsPluginBinder extends JavaPluginBinder<MultiverseNetherPortals> {
+public class MultiverseNetherPortalsPluginBinder extends MultiverseModuleBinder<MultiverseNetherPortals> {
 
     protected MultiverseNetherPortalsPluginBinder(@NotNull MultiverseNetherPortals plugin) {
         super(plugin);