diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/CoordCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/CoordCommand.java index 36d299cb..34f10c57 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/CoordCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/CoordCommand.java @@ -3,13 +3,9 @@ package com.onarandombox.MultiverseCore.commands_acf; 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.Description; -import co.aikar.commands.annotation.Flags; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; -import co.aikar.commands.bukkit.contexts.OnlinePlayer; -import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; import com.onarandombox.MultiverseCore.commands_helper.CommandPlayer; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/GeneratorCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/GeneratorCommand.java index 027f192a..d50cc6af 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/GeneratorCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/GeneratorCommand.java @@ -1,18 +1,15 @@ package com.onarandombox.MultiverseCore.commands_acf; import co.aikar.commands.annotation.CommandAlias; -import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; -import co.aikar.commands.annotation.Syntax; import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/ListCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/ListCommand.java index e6686691..7ae350dd 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/ListCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/ListCommand.java @@ -1,7 +1,6 @@ package com.onarandombox.MultiverseCore.commands_acf; import co.aikar.commands.annotation.CommandAlias; -import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Default; import co.aikar.commands.annotation.Description; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/LoadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/LoadCommand.java index 570597a8..29d97805 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/LoadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/LoadCommand.java @@ -5,11 +5,9 @@ import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Conditions; import co.aikar.commands.annotation.Description; -import co.aikar.commands.annotation.Flags; import co.aikar.commands.annotation.Single; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; -import co.aikar.commands.annotation.Values; import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/PurgeCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/PurgeCommand.java index 2f287bcc..09491e8f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/PurgeCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/PurgeCommand.java @@ -13,7 +13,6 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/RemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/RemoveCommand.java index 0355d445..0f02dce7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/RemoveCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/RemoveCommand.java @@ -5,7 +5,6 @@ import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Conditions; import co.aikar.commands.annotation.Description; -import co.aikar.commands.annotation.Flags; import co.aikar.commands.annotation.Single; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/SpawnCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/SpawnCommand.java index 10364b64..22304fd3 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/SpawnCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/SpawnCommand.java @@ -4,10 +4,8 @@ import co.aikar.commands.annotation.CommandAlias; import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; -import co.aikar.commands.annotation.Flags; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; -import co.aikar.commands.bukkit.contexts.OnlinePlayer; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; import com.onarandombox.MultiverseCore.commands_helper.CommandPlayer; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/TeleportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/TeleportCommand.java index 28cf2658..f482de47 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/TeleportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/TeleportCommand.java @@ -41,7 +41,7 @@ public class TeleportCommand extends MultiverseCommand { @Syntax("[player] ") @CommandCompletion("@players|@MVWorlds @MVWorlds") @Description("Allows you to the teleport to a location on your server!") - public void doSameTeleportCommand(@NotNull CommandSender sender, + public void doTeleportCommand(@NotNull CommandSender sender, @NotNull @Flags("other,defaultself,fallbackself") Player player, @NotNull @Single String destinationName) { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/UnloadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/UnloadCommand.java index 61c2e3d5..5bb69438 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_acf/UnloadCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_acf/UnloadCommand.java @@ -5,7 +5,6 @@ import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Flags; -import co.aikar.commands.annotation.Single; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandCompletions.java b/src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandCompletions.java index a75a9dae..40ae3c44 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandCompletions.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandCompletions.java @@ -2,7 +2,6 @@ package com.onarandombox.MultiverseCore.commands_helper; import co.aikar.commands.BukkitCommandCompletionContext; import co.aikar.commands.PaperCommandCompletions; -import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MultiverseWorld; @@ -20,8 +19,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Set; -import java.util.logging.Logger; import java.util.stream.Collectors; public class MVCommandCompletions extends PaperCommandCompletions { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandContexts.java b/src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandContexts.java index 61354633..10de6941 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandContexts.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandContexts.java @@ -4,7 +4,6 @@ import co.aikar.commands.BukkitCommandExecutionContext; import co.aikar.commands.InvalidCommandArgument; import co.aikar.commands.PaperCommandContexts; import co.aikar.commands.annotation.Values; -import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; import com.onarandombox.MultiverseCore.api.MVWorldManager; @@ -27,7 +26,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.logging.Logger; import java.util.stream.Collectors; public class MVCommandContexts extends PaperCommandContexts { @@ -418,7 +416,6 @@ public class MVCommandContexts extends PaperCommandContexts { } private Location deriveLocation(BukkitCommandExecutionContext context) { - Logging.info("testing location"); if (context.getArgs().isEmpty()) { Player player = context.getPlayer(); if (player != null) { @@ -436,8 +433,6 @@ public class MVCommandContexts extends PaperCommandContexts { throw new InvalidCommandArgument("There was an error getting Target location world!"); } - Logging.info(world.getName()); - List locationArgs = context.getArgs(); if (locationArgs.size() != 3 && locationArgs.size() != 5) { context.getSender().sendMessage(ChatColor.RED + "Invalid location arguments.");