diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index b48729b9..0b3c7ba4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -19,7 +19,7 @@ import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig; import com.onarandombox.MultiverseCore.api.MultiverseMessaging; import com.onarandombox.MultiverseCore.api.SafeTTeleporter; import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; -import com.onarandombox.MultiverseCore.commandtools.flags.CoreFlags; +import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags; import com.onarandombox.MultiverseCore.destination.AnchorDestination; import com.onarandombox.MultiverseCore.destination.BedDestination; import com.onarandombox.MultiverseCore.destination.CannonDestination; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandCompletions.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandCompletions.java index c09ae392..e888a5b7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandCompletions.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandCompletions.java @@ -17,9 +17,9 @@ import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag; -import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag.ValueRequirement; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagGroup; +import com.onarandombox.MultiverseCore.commandtools.flag.CommandFlag; +import com.onarandombox.MultiverseCore.commandtools.flag.CommandFlag.ValueRequirement; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup; import com.onarandombox.MultiverseCore.enums.AddProperties; import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType; import org.bukkit.GameRule; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandContexts.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandContexts.java index c762e2ad..62e33559 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandContexts.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandContexts.java @@ -16,9 +16,9 @@ import com.onarandombox.MultiverseCore.api.MVDestination; import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MultiverseWorld; import com.onarandombox.MultiverseCore.commands.EnvironmentCommand; -import com.onarandombox.MultiverseCore.commandtools.contexts.GameRuleProperty; -import com.onarandombox.MultiverseCore.commandtools.contexts.PageFilter; -import com.onarandombox.MultiverseCore.commandtools.contexts.RequiredPlayer; +import com.onarandombox.MultiverseCore.commandtools.context.GameRuleProperty; +import com.onarandombox.MultiverseCore.commandtools.context.PageFilter; +import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer; import com.onarandombox.MultiverseCore.destination.InvalidDestination; import com.onarandombox.MultiverseCore.displaytools.ContentFilter; import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MultiverseCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MultiverseCommand.java index 9fb897cc..1d185401 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MultiverseCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MultiverseCommand.java @@ -1,7 +1,7 @@ package com.onarandombox.MultiverseCore.commandtools; import co.aikar.commands.BaseCommand; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagGroup; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup; public class MultiverseCommand extends BaseCommand { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/GameRuleProperty.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/context/GameRuleProperty.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/GameRuleProperty.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/context/GameRuleProperty.java index 9fce456a..613ae547 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/GameRuleProperty.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/context/GameRuleProperty.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commandtools.contexts; +package com.onarandombox.MultiverseCore.commandtools.context; import org.bukkit.GameRule; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/PageFilter.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/context/PageFilter.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/PageFilter.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/context/PageFilter.java index b7ea02e5..0e69ff39 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/PageFilter.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/context/PageFilter.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commandtools.contexts; +package com.onarandombox.MultiverseCore.commandtools.context; import com.onarandombox.MultiverseCore.displaytools.ContentFilter; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/RequiredPlayer.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/context/RequiredPlayer.java similarity index 79% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/RequiredPlayer.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/context/RequiredPlayer.java index a90498b7..0da75c33 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/RequiredPlayer.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/context/RequiredPlayer.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.contexts; +package com.onarandombox.MultiverseCore.commandtools.context; import org.bukkit.entity.Player; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/context/package-info.java similarity index 51% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/package-info.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/context/package-info.java index d780a0ba..1dc9cfc4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/package-info.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/context/package-info.java @@ -1,4 +1,4 @@ /** * Classes derived from parsing command args and context. */ -package com.onarandombox.MultiverseCore.commandtools.contexts; \ No newline at end of file +package com.onarandombox.MultiverseCore.commandtools.context; \ No newline at end of file diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/CommandFlag.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/CommandFlag.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/CommandFlag.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/CommandFlag.java index 0543e0a1..769a3a4e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/CommandFlag.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/CommandFlag.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package com.onarandombox.MultiverseCore.commandtools.flag; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CoreFlags.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/CoreFlags.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CoreFlags.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/CoreFlags.java index 0e28dd5f..b70a15db 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CoreFlags.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/CoreFlags.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package com.onarandombox.MultiverseCore.commandtools.flag; import co.aikar.commands.InvalidCommandArgument; import com.onarandombox.MultiverseCore.MultiverseCore; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/FlagGroup.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/FlagGroup.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/FlagGroup.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/FlagGroup.java index d41fd515..0d57be15 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/FlagGroup.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/FlagGroup.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package com.onarandombox.MultiverseCore.commandtools.flag; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/FlagParseFailedException.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/FlagParseFailedException.java similarity index 83% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/FlagParseFailedException.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/FlagParseFailedException.java index 7c13d5a5..c8796ad0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/FlagParseFailedException.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/FlagParseFailedException.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package com.onarandombox.MultiverseCore.commandtools.flag; import co.aikar.commands.InvalidCommandArgument; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/FlagResult.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/FlagResult.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/FlagResult.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/FlagResult.java index f91b5715..1c48aee5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/FlagResult.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/FlagResult.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package com.onarandombox.MultiverseCore.commandtools.flag; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable; import java.util.HashMap; import java.util.Map; -import static com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag.ValueRequirement; +import static com.onarandombox.MultiverseCore.commandtools.flag.CommandFlag.ValueRequirement; public class FlagResult { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/NoValueCommandFlag.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/NoValueCommandFlag.java similarity index 94% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/NoValueCommandFlag.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/NoValueCommandFlag.java index 895eda77..587aaa33 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/NoValueCommandFlag.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/NoValueCommandFlag.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package com.onarandombox.MultiverseCore.commandtools.flag; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/OptionalCommandFlag.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/OptionalCommandFlag.java similarity index 84% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/OptionalCommandFlag.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/OptionalCommandFlag.java index 264e18ed..021ee6f5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/OptionalCommandFlag.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/OptionalCommandFlag.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package com.onarandombox.MultiverseCore.commandtools.flag; /** * Command Flag with {@link ValueRequirement#OPTIONAL}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/RequiredCommandFlag.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/RequiredCommandFlag.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/RequiredCommandFlag.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/RequiredCommandFlag.java index d77f1221..c3e8f5e9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/flags/RequiredCommandFlag.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/flag/RequiredCommandFlag.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.commandtools.flags; +package com.onarandombox.MultiverseCore.commandtools.flag; /** * Command Flag with {@link ValueRequirement#REQUIRED}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java index 73eb7cc2..998e2e0d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java @@ -17,7 +17,7 @@ import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.commandtools.contexts.PageFilter; +import com.onarandombox.MultiverseCore.commandtools.context.PageFilter; import com.onarandombox.MultiverseCore.displaytools.ColorAlternator; import com.onarandombox.MultiverseCore.displaytools.ContentDisplay; import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/BedCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/BedCommand.java index 16f4a1d8..492aade7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/BedCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/BedCommand.java @@ -14,7 +14,7 @@ import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandtools.contexts.RequiredPlayer; +import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java index 61d2bf9c..de9f6592 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java @@ -15,7 +15,7 @@ import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; -import com.onarandombox.MultiverseCore.commandtools.contexts.RequiredPlayer; +import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java index 73d3c94f..f764d46d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java @@ -16,7 +16,7 @@ import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.commandtools.contexts.RequiredPlayer; +import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer; import org.bukkit.ChatColor; 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/commands/CreateCommand.java index 953ebca1..66dea8c9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java @@ -16,9 +16,9 @@ import co.aikar.commands.annotation.Flags; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagResult; -import com.onarandombox.MultiverseCore.commandtools.flags.CoreFlags; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult; +import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GameRuleCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/GameRuleCommand.java index 6dc96330..b49d25a8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GameRuleCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/GameRuleCommand.java @@ -16,12 +16,11 @@ import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.commandtools.contexts.GameRuleProperty; +import com.onarandombox.MultiverseCore.commandtools.context.GameRuleProperty; import com.onarandombox.MultiverseCore.displaytools.ColorAlternator; import com.onarandombox.MultiverseCore.displaytools.ContentDisplay; import com.onarandombox.MultiverseCore.displaytools.ContentFilter; import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers; -import com.onarandombox.MultiverseCore.displaytools.DisplaySetting; import com.onarandombox.MultiverseCore.displaytools.DisplaySettings; import org.bukkit.ChatColor; import org.bukkit.GameRule; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java index b90414f8..62ebe869 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java @@ -12,10 +12,9 @@ import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandtools.flags.CoreFlags; +import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags; import com.onarandombox.MultiverseCore.displaytools.ColorAlternator; import com.onarandombox.MultiverseCore.displaytools.ContentDisplay; -import com.onarandombox.MultiverseCore.displaytools.ContentFilter; import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java index 041dbb61..d1458bba 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java @@ -15,9 +15,9 @@ import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagResult; -import com.onarandombox.MultiverseCore.commandtools.flags.CoreFlags; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult; +import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java index 9173b9ec..1acd08d0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java @@ -14,10 +14,9 @@ import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.commandtools.contexts.PageFilter; +import com.onarandombox.MultiverseCore.commandtools.context.PageFilter; import com.onarandombox.MultiverseCore.displaytools.ColorAlternator; import com.onarandombox.MultiverseCore.displaytools.ContentDisplay; -import com.onarandombox.MultiverseCore.displaytools.ContentFilter; import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers; import com.onarandombox.MultiverseCore.displaytools.DisplaySettings; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java index 2abd25af..657c521f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java @@ -16,9 +16,9 @@ import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagResult; -import com.onarandombox.MultiverseCore.commandtools.flags.CoreFlags; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult; +import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags; import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ScriptCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ScriptCommand.java index bf672f65..615d0b7c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ScriptCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ScriptCommand.java @@ -16,7 +16,7 @@ import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandtools.contexts.RequiredPlayer; +import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java index 9233765d..fe2db979 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java @@ -15,7 +15,7 @@ import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.commandtools.contexts.RequiredPlayer; +import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java index 1b9c8b45..55df188f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java @@ -14,9 +14,9 @@ import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagGroup; -import com.onarandombox.MultiverseCore.commandtools.flags.FlagResult; -import com.onarandombox.MultiverseCore.commandtools.flags.CoreFlags; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup; +import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult; +import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags; import com.onarandombox.MultiverseCore.event.MVVersionEvent; import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException; import com.onarandombox.MultiverseCore.utils.webpaste.PasteService; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java index fde54135..45a70c53 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java @@ -18,11 +18,10 @@ import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.commandtools.contexts.PageFilter; +import com.onarandombox.MultiverseCore.commandtools.context.PageFilter; import com.onarandombox.MultiverseCore.displaytools.ContentDisplay; import com.onarandombox.MultiverseCore.displaytools.ContentFilter; import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers; -import com.onarandombox.MultiverseCore.displaytools.DisplaySetting; import com.onarandombox.MultiverseCore.displaytools.DisplaySettings; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender;