Merge pull request #103 from Multiverse/fix/service-locator

Fix @service annotation

Author: benwoo1110

build.gradle

@@ -23,6 +23,13 @@ dependencies {
     shadowed('com.dumptruckman.minecraft:Logging:1.1.1') {
         exclude group: 'junit', module: 'junit'
     }
+
+    // hk2 for annotation processing only
+    compileOnly('org.glassfish.hk2:hk2-api:3.0.3') {
+        exclude group: '*', module: '*'
+    }
+    annotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
+    testAnnotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
 }
 
 checkstyle {

src/main/java/org/mvplugins/multiverse/signportals/MultiverseSignPortals.java

@@ -8,12 +8,11 @@
 package org.mvplugins.multiverse.signportals;
 
 import com.dumptruckman.minecraft.util.Logging;
-import org.mvplugins.multiverse.core.MultiverseCoreApi;
 import org.mvplugins.multiverse.core.config.CoreConfig;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocator;
 import org.mvplugins.multiverse.core.module.MultiverseModule;
 import org.mvplugins.multiverse.core.utils.StringFormatter;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 import org.mvplugins.multiverse.signportals.listeners.SignPortalsListener;
 
 import java.util.logging.Level;
@@ -47,11 +46,6 @@ public void onDisable() {
         Logging.info("- Disabled");
     }
 
-    @Override
-    public PluginServiceLocator getServiceLocator() {
-        return serviceLocator;
-    }
-
     public String getVersionInfo() {
         return "[Multiverse-SignPortals] Multiverse-SignPortals Version: " + this.getDescription().getVersion() + '\n';
     }

src/main/java/org/mvplugins/multiverse/signportals/listeners/MVSPBlockListener.java

@@ -18,7 +18,7 @@
 import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 import org.mvplugins.multiverse.signportals.MultiverseSignPortals;
 import org.mvplugins.multiverse.signportals.utils.PortalDetector;
 import org.mvplugins.multiverse.signportals.utils.SignStatus;

src/main/java/org/mvplugins/multiverse/signportals/listeners/MVSPPlayerListener.java

@@ -17,7 +17,7 @@
 import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 import org.mvplugins.multiverse.signportals.exceptions.MoreThanOneSignFoundException;
 import org.mvplugins.multiverse.signportals.exceptions.NoMultiverseSignFoundException;
 import org.mvplugins.multiverse.signportals.utils.PortalDetector;

src/main/java/org/mvplugins/multiverse/signportals/listeners/MVSPPluginListener.java

@@ -9,7 +9,7 @@
 
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 import org.mvplugins.multiverse.signportals.MultiverseSignPortals;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.server.PluginEnableEvent;

src/main/java/org/mvplugins/multiverse/signportals/listeners/MVSPVersionListener.java

@@ -16,7 +16,7 @@
 import org.mvplugins.multiverse.core.event.MVPlayerTouchedPortalEvent;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 import org.mvplugins.multiverse.signportals.MultiverseSignPortals;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

src/main/java/org/mvplugins/multiverse/signportals/utils/PortalDetector.java

@@ -12,7 +12,7 @@
 import org.mvplugins.multiverse.core.teleportation.LocationManipulation;
 import org.mvplugins.multiverse.core.permissions.CorePermissionsChecker;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 import org.mvplugins.multiverse.signportals.enums.Axis;
 import org.mvplugins.multiverse.signportals.exceptions.MoreThanOneSignFoundException;
 import org.mvplugins.multiverse.signportals.exceptions.NoMultiverseSignFoundException;