From 3fb99bc15628fe2e1f1120f43ef46fb2c3809c49 Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Thu, 2 Feb 2023 16:49:45 +0800 Subject: [PATCH] feat: Add ACF dependency and prep command migration --- config/mv_checks.xml | 2 +- pom.xml | 18 ++++ .../MultiverseCore/MultiverseCore.java | 84 +++++++++++-------- .../onarandombox/MultiverseCore/api/Core.java | 9 ++ .../MultiverseCore/commands/DebugCommand.java | 80 +++++++----------- .../commands/MultiverseCommand.java | 35 +------- .../MultiverseCore/commands/package-info.java | 4 - .../AnchorCommand.java | 2 +- .../CheckCommand.java | 2 +- .../CloneCommand.java | 2 +- .../ConfigCommand.java | 2 +- .../ConfirmCommand.java | 2 +- .../CoordCommand.java | 3 +- .../CreateCommand.java | 2 +- .../commandsold/DebugCommand.java | 66 +++++++++++++++ .../DeleteCommand.java | 3 +- .../EnvironmentCommand.java | 2 +- .../GameruleCommand.java | 2 +- .../GamerulesCommand.java | 2 +- .../GeneratorCommand.java | 2 +- .../HelpCommand.java | 2 +- .../ImportCommand.java | 2 +- .../InfoCommand.java | 2 +- .../ListCommand.java | 2 +- .../LoadCommand.java | 2 +- .../ModifyAddCommand.java | 2 +- .../ModifyClearCommand.java | 2 +- .../ModifyCommand.java | 2 +- .../ModifyRemoveCommand.java | 2 +- .../ModifySetCommand.java | 2 +- .../commandsold/MultiverseCommand.java | 40 +++++++++ .../PaginatedCommand.java | 2 +- .../PaginatedCoreCommand.java | 2 +- .../PurgeCommand.java | 2 +- .../RegenCommand.java | 2 +- .../ReloadCommand.java | 2 +- .../RemoveCommand.java | 2 +- .../ScriptCommand.java | 2 +- .../SetSpawnCommand.java | 2 +- .../SilentCommand.java | 2 +- .../SleepCommand.java | 2 +- .../SpawnCommand.java | 2 +- .../TeleportCommand.java | 3 +- .../UnloadCommand.java | 2 +- .../VersionCommand.java | 2 +- .../{commands => commandsold}/WhoCommand.java | 2 +- .../commandsold/package-info.java | 4 + .../commandtools/MVCommandCompletions.java | 9 ++ .../commandtools/MVCommandContexts.java | 9 ++ .../commandtools/MVCommandManager.java | 54 ++++++++++++ .../destination/DestinationFactory.java | 4 +- 51 files changed, 331 insertions(+), 164 deletions(-) delete mode 100644 src/main/java/com/onarandombox/MultiverseCore/commands/package-info.java rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/AnchorCommand.java (99%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/CheckCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/CloneCommand.java (97%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ConfigCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ConfirmCommand.java (96%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/CoordCommand.java (97%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/CreateCommand.java (99%) create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/DebugCommand.java rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/DeleteCommand.java (96%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/EnvironmentCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/GameruleCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/GamerulesCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/GeneratorCommand.java (97%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/HelpCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ImportCommand.java (99%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/InfoCommand.java (99%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ListCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/LoadCommand.java (96%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ModifyAddCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ModifyClearCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ModifyCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ModifyRemoveCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ModifySetCommand.java (99%) create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/MultiverseCommand.java rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/PaginatedCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/PaginatedCoreCommand.java (94%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/PurgeCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/RegenCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ReloadCommand.java (97%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/RemoveCommand.java (96%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/ScriptCommand.java (97%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/SetSpawnCommand.java (99%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/SilentCommand.java (97%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/SleepCommand.java (96%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/SpawnCommand.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/TeleportCommand.java (99%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/UnloadCommand.java (96%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/VersionCommand.java (99%) rename src/main/java/com/onarandombox/MultiverseCore/{commands => commandsold}/WhoCommand.java (99%) create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandsold/package-info.java create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java diff --git a/config/mv_checks.xml b/config/mv_checks.xml index 0c660d8d..2048eff5 100644 --- a/config/mv_checks.xml +++ b/config/mv_checks.xml @@ -69,7 +69,7 @@ - + diff --git a/pom.xml b/pom.xml index e714385f..44d3ab20 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,10 @@ minebench-repo https://repo.minebench.de/ + + aikar + https://repo.aikar.co/content/groups/aikar/ + @@ -154,6 +158,7 @@ maven-surefire-plugin 3.0.0-M3 + true **/TestCommandSender.java **/TestInstanceCreator.java @@ -251,6 +256,14 @@ de.themoep.idconverter com.onarandombox.idconverter + + co.aikar.commands + com.onarandombox.acf + + + co.aikar.locales + com.onarandombox.locales + @@ -307,6 +320,11 @@ + + co.aikar + acf-paper + 0.5.1-SNAPSHOT + com.pneumaticraft.commandhandler CommandHandler diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index a66f95de..15700950 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -33,41 +33,42 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig; import com.onarandombox.MultiverseCore.api.MultiverseMessaging; import com.onarandombox.MultiverseCore.api.SafeTTeleporter; -import com.onarandombox.MultiverseCore.commands.AnchorCommand; -import com.onarandombox.MultiverseCore.commands.CheckCommand; -import com.onarandombox.MultiverseCore.commands.CloneCommand; -import com.onarandombox.MultiverseCore.commands.ConfigCommand; -import com.onarandombox.MultiverseCore.commands.ConfirmCommand; -import com.onarandombox.MultiverseCore.commands.CoordCommand; -import com.onarandombox.MultiverseCore.commands.CreateCommand; import com.onarandombox.MultiverseCore.commands.DebugCommand; -import com.onarandombox.MultiverseCore.commands.DeleteCommand; -import com.onarandombox.MultiverseCore.commands.EnvironmentCommand; -import com.onarandombox.MultiverseCore.commands.GameruleCommand; -import com.onarandombox.MultiverseCore.commands.GamerulesCommand; -import com.onarandombox.MultiverseCore.commands.GeneratorCommand; -import com.onarandombox.MultiverseCore.commands.HelpCommand; -import com.onarandombox.MultiverseCore.commands.ImportCommand; -import com.onarandombox.MultiverseCore.commands.InfoCommand; -import com.onarandombox.MultiverseCore.commands.ListCommand; -import com.onarandombox.MultiverseCore.commands.LoadCommand; -import com.onarandombox.MultiverseCore.commands.ModifyAddCommand; -import com.onarandombox.MultiverseCore.commands.ModifyClearCommand; -import com.onarandombox.MultiverseCore.commands.ModifyCommand; -import com.onarandombox.MultiverseCore.commands.ModifyRemoveCommand; -import com.onarandombox.MultiverseCore.commands.ModifySetCommand; -import com.onarandombox.MultiverseCore.commands.PurgeCommand; -import com.onarandombox.MultiverseCore.commands.RegenCommand; -import com.onarandombox.MultiverseCore.commands.ReloadCommand; -import com.onarandombox.MultiverseCore.commands.RemoveCommand; -import com.onarandombox.MultiverseCore.commands.ScriptCommand; -import com.onarandombox.MultiverseCore.commands.SetSpawnCommand; -import com.onarandombox.MultiverseCore.commands.SilentCommand; -import com.onarandombox.MultiverseCore.commands.SpawnCommand; -import com.onarandombox.MultiverseCore.commands.TeleportCommand; -import com.onarandombox.MultiverseCore.commands.UnloadCommand; -import com.onarandombox.MultiverseCore.commands.VersionCommand; -import com.onarandombox.MultiverseCore.commands.WhoCommand; +import com.onarandombox.MultiverseCore.commandsold.AnchorCommand; +import com.onarandombox.MultiverseCore.commandsold.CheckCommand; +import com.onarandombox.MultiverseCore.commandsold.CloneCommand; +import com.onarandombox.MultiverseCore.commandsold.ConfigCommand; +import com.onarandombox.MultiverseCore.commandsold.ConfirmCommand; +import com.onarandombox.MultiverseCore.commandsold.CoordCommand; +import com.onarandombox.MultiverseCore.commandsold.CreateCommand; +import com.onarandombox.MultiverseCore.commandsold.DeleteCommand; +import com.onarandombox.MultiverseCore.commandsold.EnvironmentCommand; +import com.onarandombox.MultiverseCore.commandsold.GameruleCommand; +import com.onarandombox.MultiverseCore.commandsold.GamerulesCommand; +import com.onarandombox.MultiverseCore.commandsold.GeneratorCommand; +import com.onarandombox.MultiverseCore.commandsold.HelpCommand; +import com.onarandombox.MultiverseCore.commandsold.ImportCommand; +import com.onarandombox.MultiverseCore.commandsold.InfoCommand; +import com.onarandombox.MultiverseCore.commandsold.ListCommand; +import com.onarandombox.MultiverseCore.commandsold.LoadCommand; +import com.onarandombox.MultiverseCore.commandsold.ModifyAddCommand; +import com.onarandombox.MultiverseCore.commandsold.ModifyClearCommand; +import com.onarandombox.MultiverseCore.commandsold.ModifyCommand; +import com.onarandombox.MultiverseCore.commandsold.ModifyRemoveCommand; +import com.onarandombox.MultiverseCore.commandsold.ModifySetCommand; +import com.onarandombox.MultiverseCore.commandsold.PurgeCommand; +import com.onarandombox.MultiverseCore.commandsold.RegenCommand; +import com.onarandombox.MultiverseCore.commandsold.ReloadCommand; +import com.onarandombox.MultiverseCore.commandsold.RemoveCommand; +import com.onarandombox.MultiverseCore.commandsold.ScriptCommand; +import com.onarandombox.MultiverseCore.commandsold.SetSpawnCommand; +import com.onarandombox.MultiverseCore.commandsold.SilentCommand; +import com.onarandombox.MultiverseCore.commandsold.SpawnCommand; +import com.onarandombox.MultiverseCore.commandsold.TeleportCommand; +import com.onarandombox.MultiverseCore.commandsold.UnloadCommand; +import com.onarandombox.MultiverseCore.commandsold.VersionCommand; +import com.onarandombox.MultiverseCore.commandsold.WhoCommand; +import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager; import com.onarandombox.MultiverseCore.destination.AnchorDestination; import com.onarandombox.MultiverseCore.destination.BedDestination; @@ -204,6 +205,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { // Setup our Map for our Commands using the CommandHandler. private CommandHandler commandHandler; + private MVCommandManager commandManager; private CommandQueueManager commandQueueManager; private static final String LOG_TAG = "[Multiverse-Core]"; @@ -287,6 +289,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { // Setup the command manager this.commandHandler = new CommandHandler(this, this.ph); + this.commandManager = new MVCommandManager(this); this.commandQueueManager = new CommandQueueManager(this); // Call the Function to assign all the Commands to their Class. this.registerCommands(); @@ -781,13 +784,16 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { this.commandHandler.registerCommand(new AnchorCommand(this)); // Misc Commands this.commandHandler.registerCommand(new EnvironmentCommand(this)); - this.commandHandler.registerCommand(new DebugCommand(this)); + // this.commandHandler.registerCommand(new DebugCommand(this)); this.commandHandler.registerCommand(new SilentCommand(this)); this.commandHandler.registerCommand(new GeneratorCommand(this)); this.commandHandler.registerCommand(new CheckCommand(this)); this.commandHandler.registerCommand(new ScriptCommand(this)); this.commandHandler.registerCommand(new GameruleCommand(this)); this.commandHandler.registerCommand(new GamerulesCommand(this)); + + //**NEW ACF COMMAND HANDLER** + this.commandManager.registerCommand(new DebugCommand(this)); } /** @@ -918,6 +924,14 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { return this.commandHandler; } + /** + * {@inheritDoc} + */ + @Override + public MVCommandManager getCommandManager() { + return this.commandManager; + } + /** * {@inheritDoc} */ diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/Core.java b/src/main/java/com/onarandombox/MultiverseCore/api/Core.java index 5f66cddb..d1d4e9e8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/Core.java +++ b/src/main/java/com/onarandombox/MultiverseCore/api/Core.java @@ -8,6 +8,7 @@ package com.onarandombox.MultiverseCore.api; import buscript.Buscript; +import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager; import com.onarandombox.MultiverseCore.destination.DestinationFactory; import com.onarandombox.MultiverseCore.utils.AnchorManager; @@ -87,6 +88,14 @@ public interface Core { */ CommandHandler getCommandHandler(); + /** + * Multiverse uses {@link MVCommandManager} to make adding and using commands + * a piece of cake. + * + * @return A non-null {@link MVCommandManager}. + */ + MVCommandManager getCommandManager(); + /** * Manager for command that requires /mv confirm before execution. * diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java index b2ccd99e..3c183037 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java @@ -1,67 +1,47 @@ -/****************************************************************************** - * Multiverse 2 Copyright (c) the Multiverse Team 2011. * - * Multiverse 2 is licensed under the BSD License. * - * For more information please check the README.md file included * - * with this project. * - ******************************************************************************/ - package com.onarandombox.MultiverseCore.commands; +import co.aikar.commands.CommandIssuer; +import co.aikar.commands.annotation.CommandAlias; +import co.aikar.commands.annotation.CommandCompletion; +import co.aikar.commands.annotation.CommandPermission; +import co.aikar.commands.annotation.Conditions; +import co.aikar.commands.annotation.Subcommand; import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.permissions.PermissionDefault; +import org.jetbrains.annotations.NotNull; -import java.util.List; -import java.util.logging.Level; - -/** - * Enables debug-information. - */ +@CommandAlias("mv") public class DebugCommand extends MultiverseCommand { public DebugCommand(MultiverseCore plugin) { super(plugin); - this.setName("Turn Debug on/off?"); - this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]"); - this.setArgRange(0, 1); - this.addKey("mv debug"); - this.addKey("mv d"); - this.addKey("mvdebug"); - this.addCommandExample("/mv debug " + ChatColor.GOLD + "2"); - this.setPermission("multiverse.core.debug", "Spams the console a bunch.", PermissionDefault.OP); } - @Override - public void runCommand(CommandSender sender, List args) { - if (args.size() == 1) { - if (args.get(0).equalsIgnoreCase("off")) { - plugin.getMVConfig().setGlobalDebug(0); - } else { - try { - int debugLevel = Integer.parseInt(args.get(0)); - if (debugLevel > 3 || debugLevel < 0) { - throw new NumberFormatException(); - } - plugin.getMVConfig().setGlobalDebug(debugLevel); - } catch (NumberFormatException e) { - sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE - + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)"); - } - } - plugin.saveMVConfigs(); - } - this.displayDebugMode(sender); + @Subcommand("debug") + @CommandPermission("multiverse.core.debug") + public void onShowDebugCommand(@NotNull CommandIssuer issuer) { + this.displayDebugMode(issuer); } - private void displayDebugMode(CommandSender sender) { - final int debugLevel = plugin.getMVConfig().getGlobalDebug(); + + @Subcommand("debug") + @CommandPermission("multiverse.core.debug") + @CommandCompletion("@range:3") + public void onChangeDebugCommand(@NotNull CommandIssuer issuer, + @Conditions("debuglevel") int level) { + + this.plugin.getMVConfig().setGlobalDebug(level); + this.plugin.saveMVConfigs(); + this.displayDebugMode(issuer); + } + + private void displayDebugMode(@NotNull CommandIssuer issuer) { + final int debugLevel = this.plugin.getMVConfig().getGlobalDebug(); if (debugLevel == 0) { - sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF"); - } else { - sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel); - Logging.fine("Multiverse Debug ENABLED"); + issuer.sendMessage("§fMultiverse Debug mode is §cOFF§f."); + return; } + issuer.sendMessage("§fMultiverse Debug mode is at §alevel {level}§f."); + Logging.fine("Multiverse Debug ENABLED."); } } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java index ae54a9b8..42a65604 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java @@ -1,40 +1,13 @@ -/****************************************************************************** - * Multiverse 2 Copyright (c) the Multiverse Team 2011. * - * Multiverse 2 is licensed under the BSD License. * - * For more information please check the README.md file included * - * with this project. * - ******************************************************************************/ - package com.onarandombox.MultiverseCore.commands; +import co.aikar.commands.BaseCommand; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.api.MultiverseMessaging; -import com.pneumaticraft.commandhandler.Command; -import org.bukkit.command.CommandSender; -import java.util.List; +public class MultiverseCommand extends BaseCommand { -/** - * A generic Multiverse-command. - */ -public abstract class MultiverseCommand extends Command { + protected final MultiverseCore plugin; - /** - * The reference to the core. - */ - protected MultiverseCore plugin; - /** - * The reference to {@link MultiverseMessaging}. - */ - protected MultiverseMessaging messaging; - - public MultiverseCommand(MultiverseCore plugin) { - super(plugin); + protected MultiverseCommand(MultiverseCore plugin) { this.plugin = plugin; - this.messaging = this.plugin.getMessaging(); } - - @Override - public abstract void runCommand(CommandSender sender, List args); - } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/commands/package-info.java deleted file mode 100644 index 53d7f9b3..00000000 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains all Commands. - */ -package com.onarandombox.MultiverseCore.commands; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/AnchorCommand.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/AnchorCommand.java index 55d0b2cf..5009c270 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/AnchorCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/CheckCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/CheckCommand.java index 7bc4ba48..519dfa21 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/CheckCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/CloneCommand.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/CloneCommand.java index 95a0bf14..7f2a2efe 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/CloneCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import java.util.List; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ConfigCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ConfigCommand.java index 55424a94..e454dd95 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ConfigCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ConfirmCommand.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ConfirmCommand.java index 498a1431..c216ca37 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ConfirmCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/CoordCommand.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/CoordCommand.java index 485cc370..b7ce8553 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/CoordCommand.java @@ -5,13 +5,12 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MultiverseWorld; import org.bukkit.ChatColor; -import org.bukkit.Material; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/CreateCommand.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/CreateCommand.java index 6d8f3833..750c9e62 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/CreateCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandsold/DebugCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/DebugCommand.java new file mode 100644 index 00000000..81a7f74f --- /dev/null +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/DebugCommand.java @@ -0,0 +1,66 @@ +/****************************************************************************** + * Multiverse 2 Copyright (c) the Multiverse Team 2011. * + * Multiverse 2 is licensed under the BSD License. * + * For more information please check the README.md file included * + * with this project. * + ******************************************************************************/ + +package com.onarandombox.MultiverseCore.commandsold; + +import com.dumptruckman.minecraft.util.Logging; +import com.onarandombox.MultiverseCore.MultiverseCore; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.permissions.PermissionDefault; + +import java.util.List; + +/** + * Enables debug-information. + */ +public class DebugCommand extends MultiverseCommand { + + public DebugCommand(MultiverseCore plugin) { + super(plugin); + this.setName("Turn Debug on/off?"); + this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]"); + this.setArgRange(0, 1); + this.addKey("mv debug"); + this.addKey("mv d"); + this.addKey("mvdebug"); + this.addCommandExample("/mv debug " + ChatColor.GOLD + "2"); + this.setPermission("multiverse.core.debug", "Spams the console a bunch.", PermissionDefault.OP); + } + + @Override + public void runCommand(CommandSender sender, List args) { + if (args.size() == 1) { + if (args.get(0).equalsIgnoreCase("off")) { + plugin.getMVConfig().setGlobalDebug(0); + } else { + try { + int debugLevel = Integer.parseInt(args.get(0)); + if (debugLevel > 3 || debugLevel < 0) { + throw new NumberFormatException(); + } + plugin.getMVConfig().setGlobalDebug(debugLevel); + } catch (NumberFormatException e) { + sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE + + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)"); + } + } + plugin.saveMVConfigs(); + } + this.displayDebugMode(sender); + } + + private void displayDebugMode(CommandSender sender) { + final int debugLevel = plugin.getMVConfig().getGlobalDebug(); + if (debugLevel == 0) { + sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF"); + } else { + sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel); + Logging.fine("Multiverse Debug ENABLED"); + } + } +} diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/DeleteCommand.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/DeleteCommand.java index 60345493..85157d16 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/DeleteCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand; @@ -14,7 +14,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissionDefault; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/EnvironmentCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/EnvironmentCommand.java index f9ac8860..9fc85cd4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/EnvironmentCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/GameruleCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/GameruleCommand.java index ca0e1e07..053c9f23 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/GameruleCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.Bukkit; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/GamerulesCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/GamerulesCommand.java index 448b5c13..ade81ae4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/GamerulesCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.display.ColorAlternator; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/GeneratorCommand.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/GeneratorCommand.java index 72d4379b..342d71a1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/GeneratorCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/HelpCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/HelpCommand.java index 59a429e4..42cbf978 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/HelpCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.pneumaticraft.commandhandler.Command; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ImportCommand.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ImportCommand.java index 7a52d5a1..9d44dbcf 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ImportCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/InfoCommand.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/InfoCommand.java index 701424e7..579f271d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/InfoCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.FancyText; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ListCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ListCommand.java index db8ee1a4..c43c7fa5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ListCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/LoadCommand.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/LoadCommand.java index 4a96ef36..2b60a8da 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/LoadCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyAddCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyAddCommand.java index 1175d340..93229d32 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyAddCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyClearCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyClearCommand.java index 788b7452..93e57663 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyClearCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ModifyCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyCommand.java index d8c74ac3..c87a0761 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.enums.Action; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyRemoveCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyRemoveCommand.java index f714be76..51792d99 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifyRemoveCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifySetCommand.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifySetCommand.java index 54bf8a11..57a48768 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ModifySetCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandsold/MultiverseCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/MultiverseCommand.java new file mode 100644 index 00000000..ac0aa7ba --- /dev/null +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/MultiverseCommand.java @@ -0,0 +1,40 @@ +/****************************************************************************** + * Multiverse 2 Copyright (c) the Multiverse Team 2011. * + * Multiverse 2 is licensed under the BSD License. * + * For more information please check the README.md file included * + * with this project. * + ******************************************************************************/ + +package com.onarandombox.MultiverseCore.commandsold; + +import java.util.List; + +import com.onarandombox.MultiverseCore.MultiverseCore; +import com.onarandombox.MultiverseCore.api.MultiverseMessaging; +import com.pneumaticraft.commandhandler.Command; +import org.bukkit.command.CommandSender; + +/** + * A generic Multiverse-command. + */ +public abstract class MultiverseCommand extends Command { + + /** + * The reference to the core. + */ + protected MultiverseCore plugin; + /** + * The reference to {@link MultiverseMessaging}. + */ + protected MultiverseMessaging messaging; + + public MultiverseCommand(MultiverseCore plugin) { + super(plugin); + this.plugin = plugin; + this.messaging = this.plugin.getMessaging(); + } + + @Override + public abstract void runCommand(CommandSender sender, List args); + +} diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/PaginatedCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/PaginatedCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/PaginatedCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/PaginatedCommand.java index 2dd11a2a..3e603e87 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/PaginatedCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/PaginatedCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.pneumaticraft.commandhandler.Command; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/PaginatedCoreCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/PaginatedCoreCommand.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/commands/PaginatedCoreCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/PaginatedCoreCommand.java index 7071311a..ebd407b7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/PaginatedCoreCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/PaginatedCoreCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/PurgeCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/PurgeCommand.java index 8b7c4a26..38f32ca6 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/PurgeCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/RegenCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/RegenCommand.java index 4efe7ad5..2d249842 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/RegenCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ReloadCommand.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ReloadCommand.java index abe2b0a6..680de34a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ReloadCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/RemoveCommand.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/RemoveCommand.java index ff24e740..aa821b33 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/RemoveCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ScriptCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ScriptCommand.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/commands/ScriptCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/ScriptCommand.java index 665f6aa7..baec84fb 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ScriptCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/ScriptCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/SetSpawnCommand.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/SetSpawnCommand.java index 26dad442..5e9fa3c6 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/SetSpawnCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.BlockSafety; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SilentCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/SilentCommand.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/commands/SilentCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/SilentCommand.java index 4d0bfd73..45502296 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/SilentCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/SilentCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SleepCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/SleepCommand.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/commands/SleepCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/SleepCommand.java index 08156d20..c258b8f0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/SleepCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/SleepCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/SpawnCommand.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/SpawnCommand.java index 8e865545..ae6c97dd 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/SpawnCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/TeleportCommand.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/TeleportCommand.java index 9507236c..15571fd4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/TeleportCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; @@ -28,7 +28,6 @@ import org.bukkit.entity.Player; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/UnloadCommand.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/UnloadCommand.java index 52f92c6c..04a35e17 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/UnloadCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/VersionCommand.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/VersionCommand.java index f032fd20..c0a938ad 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/VersionCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/WhoCommand.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java rename to src/main/java/com/onarandombox/MultiverseCore/commandsold/WhoCommand.java index 1a03df28..fa9ab935 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/WhoCommand.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commands; +package com.onarandombox.MultiverseCore.commandsold; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandsold/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/commandsold/package-info.java new file mode 100644 index 00000000..a7559b95 --- /dev/null +++ b/src/main/java/com/onarandombox/MultiverseCore/commandsold/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains all Commands. + */ +package com.onarandombox.MultiverseCore.commandsold; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java new file mode 100644 index 00000000..7b5cbd9f --- /dev/null +++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java @@ -0,0 +1,9 @@ +package com.onarandombox.MultiverseCore.commandtools; + +import co.aikar.commands.PaperCommandCompletions; + +public class MVCommandCompletions extends PaperCommandCompletions { + public MVCommandCompletions(MVCommandManager mvCommandManager) { + super(mvCommandManager); + } +} diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java new file mode 100644 index 00000000..0ed2ac90 --- /dev/null +++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java @@ -0,0 +1,9 @@ +package com.onarandombox.MultiverseCore.commandtools; + +import co.aikar.commands.PaperCommandContexts; + +public class MVCommandContexts extends PaperCommandContexts { + public MVCommandContexts(MVCommandManager mvCommandManager) { + super(mvCommandManager); + } +} diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java new file mode 100644 index 00000000..d84689f2 --- /dev/null +++ b/src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java @@ -0,0 +1,54 @@ +package com.onarandombox.MultiverseCore.commandtools; + +import java.util.Locale; + +import co.aikar.commands.BukkitCommandCompletionContext; +import co.aikar.commands.BukkitCommandExecutionContext; +import co.aikar.commands.CommandCompletions; +import co.aikar.commands.CommandContexts; +import co.aikar.commands.PaperCommandManager; +import com.onarandombox.MultiverseCore.MultiverseCore; + +/** + * Main class to manage permissions. + */ +public class MVCommandManager extends PaperCommandManager { + + private final MultiverseCore plugin; + + public MVCommandManager(MultiverseCore plugin) { + super(plugin); + this.plugin = plugin; + + // Setup locale + this.addSupportedLanguage(Locale.ENGLISH); + this.locales.addMessageBundles("multiverse-core"); + this.locales.loadLanguages(); + } + + /** + * Gets class responsible for parsing string args into objects. + * + * @return A not-null {@link CommandContexts}. + */ + @Override + public synchronized CommandContexts getCommandContexts() { + if (this.contexts == null) { + this.contexts = new MVCommandContexts(this); + } + return this.contexts; + } + + /** + * Gets class responsible for tab-completion handling. + * + * @return A not-null {@link CommandCompletions}. + */ + @Override + public synchronized CommandCompletions getCommandCompletions() { + if (this.completions == null) { + this.completions = new MVCommandCompletions(this); + } + return this.completions; + } +} diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java b/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java index 402342c3..7f00248c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java @@ -9,17 +9,15 @@ package com.onarandombox.MultiverseCore.destination; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; -import com.onarandombox.MultiverseCore.commands.TeleportCommand; +import com.onarandombox.MultiverseCore.commandsold.TeleportCommand; import com.onarandombox.MultiverseCore.utils.PermissionTools; import com.onarandombox.MultiverseCore.utils.PlayerFinder; import com.pneumaticraft.commandhandler.Command; import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.HashMap;