diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java index 839d1ffd..b8f7fe02 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java @@ -14,7 +14,6 @@ import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; import com.onarandombox.MultiverseCore.utils.MVCorei18n; import jakarta.inject.Inject; -import org.bukkit.ChatColor; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java index 9c0f31d8..cf21e1c4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java @@ -16,7 +16,6 @@ import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand; import com.onarandombox.MultiverseCore.utils.MVCorei18n; import jakarta.inject.Inject; -import org.bukkit.ChatColor; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java index 2df9a15a..92e09c00 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java @@ -14,7 +14,6 @@ import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; import com.onarandombox.MultiverseCore.commandtools.context.GameRuleValue; import com.onarandombox.MultiverseCore.utils.MVCorei18n; import jakarta.inject.Inject; -import org.bukkit.ChatColor; import org.bukkit.GameRule; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java index 0c5d54f9..d938d018 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java @@ -15,7 +15,6 @@ import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; -import com.onarandombox.MultiverseCore.api.MVCore; import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag; import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup; import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag; @@ -24,7 +23,6 @@ import com.onarandombox.MultiverseCore.utils.MVCorei18n; import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper; import jakarta.inject.Inject; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java index ad3b3ec9..43013835 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java @@ -23,7 +23,6 @@ import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags; import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand; import com.onarandombox.MultiverseCore.utils.MVCorei18n; import jakarta.inject.Inject; -import org.bukkit.ChatColor; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java index be3d58e7..203491da 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java @@ -16,8 +16,7 @@ import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent; import com.onarandombox.MultiverseCore.utils.MVCorei18n; import jakarta.inject.Inject; -import org.bukkit.ChatColor; -import org.bukkit.Server; +import org.bukkit.plugin.PluginManager; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; @@ -28,7 +27,7 @@ public class ReloadCommand extends MultiverseCommand { private final MultiverseCore plugin; private final AnchorManager anchorManager; private final MVWorldManager worldManager; - private final Server server; + private final PluginManager pluginManager; @Inject public ReloadCommand( @@ -36,13 +35,13 @@ public class ReloadCommand extends MultiverseCommand { @NotNull MultiverseCore plugin, @NotNull AnchorManager anchorManager, @NotNull MVWorldManager worldManager, - @NotNull Server server + @NotNull PluginManager pluginManager ) { super(commandManager); this.plugin = plugin; this.anchorManager = anchorManager; this.worldManager = worldManager; - this.server = server; + this.pluginManager = pluginManager; } @Subcommand("reload") @@ -60,7 +59,7 @@ public class ReloadCommand extends MultiverseCommand { configsLoaded.add("Multiverse-Core - anchors.yml"); MVConfigReloadEvent configReload = new MVConfigReloadEvent(configsLoaded); - this.server.getPluginManager().callEvent(configReload); + this.pluginManager.callEvent(configReload); // @TODO: replace this sendMessage and format the configsLoaded above, maybe? configReload.getAllConfigsLoaded().forEach(issuer::sendMessage); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java index a6780e5f..a1e462de 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java @@ -14,7 +14,6 @@ import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; import com.onarandombox.MultiverseCore.utils.MVCorei18n; import jakarta.inject.Inject; -import org.bukkit.ChatColor; import org.jetbrains.annotations.NotNull; import org.jvnet.hk2.annotations.Service; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RootCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/RootCommand.java index c24f97ec..b42b65ec 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RootCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/RootCommand.java @@ -7,7 +7,6 @@ import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand; import com.onarandombox.MultiverseCore.utils.MVCorei18n; import jakarta.inject.Inject; -import org.bukkit.ChatColor; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt b/src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt index f5e6a9e2..e4f3d720 100644 --- a/src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/inject/InjectionTest.kt @@ -27,15 +27,12 @@ import com.onarandombox.MultiverseCore.utils.MVPermissions import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper import com.onarandombox.MultiverseCore.world.SimpleMVWorldManager import org.bukkit.Server -import org.bukkit.command.Command import org.bukkit.plugin.PluginManager import org.junit.jupiter.api.Test import org.mvplugins.multiverse.core.TestWithMockBukkit -import java.io.File import java.util.logging.Logger import kotlin.test.assertEquals import kotlin.test.assertNotNull -import kotlin.test.assertNull import kotlin.test.assertSame class InjectionTest : TestWithMockBukkit() {