Merge pull request #590 from Multiverse/feat/service-manager

Register MultiverseInventoriesApi to bukkit's service manager

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java

@@ -128,7 +128,7 @@ public final void onEnable() {
         this.playerNamesMapperProvider.get().loadMap();
 
         // Init api
-        MultiverseInventoriesApi.init(this.serviceLocator);
+        MultiverseInventoriesApi.init(this);
 
         Logging.config("Version %s (API v%s) Enabled - By %s",
                 this.getDescription().getVersion(), getVersionAsNumber(), StringFormatter.joinAnd(this.getDescription().getAuthors()));

src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventoriesApi.java

@@ -1,6 +1,9 @@
 package org.mvplugins.multiverse.inventories;
 
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.ServicePriority;
 import org.jetbrains.annotations.NotNull;
+import org.mvplugins.multiverse.core.MultiverseCoreApi;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocator;
 import org.mvplugins.multiverse.inventories.config.InventoriesConfig;
 import org.mvplugins.multiverse.inventories.dataimport.DataImportManager;
@@ -19,14 +22,16 @@ public final class MultiverseInventoriesApi {
 
     private static MultiverseInventoriesApi instance;
 
-    static void init(@NotNull PluginServiceLocator serviceLocator) {
+    static void init(@NotNull MultiverseInventories multiverseInventories) {
         if (instance != null) {
             throw new IllegalStateException("MultiverseCoreApi has already been initialized!");
         }
-        instance = new MultiverseInventoriesApi(serviceLocator);
+        instance = new MultiverseInventoriesApi(multiverseInventories.getServiceLocator());
+        Bukkit.getServicesManager().register(MultiverseInventoriesApi.class, instance, multiverseInventories, ServicePriority.Normal);
     }
 
     static void shutdown() {
+        Bukkit.getServicesManager().unregister(instance);
         instance = null;
     }