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

Fix @service annotation

Author: benwoo1110

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

@@ -10,7 +10,6 @@
 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.PluginServiceLocatorFactory;
 import org.mvplugins.multiverse.core.module.MultiverseModule;
 import org.mvplugins.multiverse.core.utils.StringFormatter;
 import org.mvplugins.multiverse.netherportals.commands.NetherPortalsCommand;
@@ -22,7 +21,6 @@
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
 import org.mvplugins.multiverse.core.command.MVCommandManager;
-import org.mvplugins.multiverse.core.inject.PluginServiceLocator;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jakarta.inject.Provider;
 import org.mvplugins.multiverse.external.vavr.control.Try;

src/main/java/org/mvplugins/multiverse/netherportals/commands/LinkCommand.java

@@ -17,7 +17,7 @@
 import org.mvplugins.multiverse.external.acf.commands.annotation.Values;
 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.netherportals.MultiverseNetherPortals;
 
 import java.util.Objects;

src/main/java/org/mvplugins/multiverse/netherportals/commands/ListCommand.java

@@ -21,7 +21,7 @@
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.external.jetbrains.annotations.Nullable;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
 
 import java.util.List;

src/main/java/org/mvplugins/multiverse/netherportals/commands/UnlinkCommand.java

@@ -15,7 +15,7 @@
 import org.mvplugins.multiverse.external.acf.commands.annotation.Values;
 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.netherportals.MultiverseNetherPortals;
 
 import java.util.Objects;

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPCoreListener.java

@@ -7,7 +7,7 @@
 import org.mvplugins.multiverse.core.event.MVDebugModeEvent;
 import org.mvplugins.multiverse.core.event.MVDumpsDebugInfoEvent;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 
 import java.io.File;
 

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPEntityListener.java

@@ -28,7 +28,7 @@
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.external.jetbrains.annotations.Nullable;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 
 import java.util.Date;
 import java.util.HashMap;

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPPlayerListener.java

@@ -19,7 +19,7 @@
 import org.mvplugins.multiverse.core.world.WorldManager;
 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;
 
 @Service
 public class MVNPPlayerListener implements MVNPListener {

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPPluginListener.java

@@ -6,7 +6,7 @@
 
 import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 
 @Service
 public class MVNPPluginListener implements MVNPListener {

src/main/java/org/mvplugins/multiverse/netherportals/utils/EndPlatformCreator.java

@@ -9,7 +9,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 
 @Service
 public class EndPlatformCreator {

src/main/java/org/mvplugins/multiverse/netherportals/utils/MVEventRecord.java

@@ -5,7 +5,7 @@
 import org.bukkit.PortalType;
 import org.bukkit.scheduler.BukkitTask;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
-import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
+import org.jvnet.hk2.annotations.Service;
 
 import java.util.HashMap;
 import java.util.Map;