From 95cce254536a121698eb66f1ab00fd1382b9fd75 Mon Sep 17 00:00:00 2001 From: benwoo1110 <30431861+benwoo1110@users.noreply.github.com> Date: Thu, 31 Dec 2020 12:21:06 +0800 Subject: [PATCH] Add package info and more cleanup. --- .../MultiverseCore/commandTools/MVCommandConditions.java | 2 +- .../MultiverseCore/commandTools/MVCommandContexts.java | 3 +++ .../commandTools/{ => contexts}/GameRuleProperty.java | 2 +- .../commandTools/{ => contexts}/PageFilter.java | 2 +- .../commandTools/{ => contexts}/PlayerWorld.java | 2 +- .../commandTools/{ => contexts}/WorldFlags.java | 2 +- .../MultiverseCore/commandTools/contexts/package-info.java | 4 ++++ .../MultiverseCore/commandTools/display/package-info.java | 4 ++++ .../MultiverseCore/commandTools/package-info.java | 2 +- .../MultiverseCore/commandTools/queue/package-info.java | 4 ++++ .../onarandombox/MultiverseCore/commands/AnchorCommand.java | 2 +- .../onarandombox/MultiverseCore/commands/CoordCommand.java | 2 +- .../onarandombox/MultiverseCore/commands/CreateCommand.java | 2 +- .../onarandombox/MultiverseCore/commands/GameRuleCommand.java | 4 +--- .../onarandombox/MultiverseCore/commands/ImportCommand.java | 2 +- .../com/onarandombox/MultiverseCore/commands/ListCommand.java | 2 +- .../onarandombox/MultiverseCore/commands/RegenCommand.java | 2 +- .../onarandombox/MultiverseCore/commands/SpawnCommand.java | 2 +- 18 files changed, 29 insertions(+), 16 deletions(-) rename src/main/java/com/onarandombox/MultiverseCore/commandTools/{ => contexts}/GameRuleProperty.java (93%) rename src/main/java/com/onarandombox/MultiverseCore/commandTools/{ => contexts}/PageFilter.java (93%) rename src/main/java/com/onarandombox/MultiverseCore/commandTools/{ => contexts}/PlayerWorld.java (95%) rename src/main/java/com/onarandombox/MultiverseCore/commandTools/{ => contexts}/WorldFlags.java (99%) create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/package-info.java create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandTools/display/package-info.java create mode 100644 src/main/java/com/onarandombox/MultiverseCore/commandTools/queue/package-info.java diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandConditions.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandConditions.java index 86746d62..1537cda2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandConditions.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandConditions.java @@ -13,10 +13,10 @@ import co.aikar.commands.BukkitConditionContext; import co.aikar.commands.CommandConditions; import co.aikar.commands.ConditionContext; import co.aikar.commands.ConditionFailedException; -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.contexts.PlayerWorld; import com.onarandombox.MultiverseCore.enums.AddProperties; import com.onarandombox.MultiverseCore.enums.WorldValidationResult; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandContexts.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandContexts.java index 4b6eaa56..f009b70f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandContexts.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandContexts.java @@ -15,6 +15,9 @@ import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MultiverseWorld; +import com.onarandombox.MultiverseCore.commandTools.contexts.GameRuleProperty; +import com.onarandombox.MultiverseCore.commandTools.contexts.PageFilter; +import com.onarandombox.MultiverseCore.commandTools.contexts.PlayerWorld; import com.onarandombox.MultiverseCore.commandTools.display.ContentFilter; import com.onarandombox.MultiverseCore.commands.EnvironmentCommand; import com.onarandombox.MultiverseCore.destination.InvalidDestination; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/GameRuleProperty.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/GameRuleProperty.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/GameRuleProperty.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/GameRuleProperty.java index a4dce2fa..129bec34 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/GameRuleProperty.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/GameRuleProperty.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commandTools; +package com.onarandombox.MultiverseCore.commandTools.contexts; import org.bukkit.GameRule; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/PageFilter.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/PageFilter.java similarity index 93% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/PageFilter.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/PageFilter.java index ca106faa..6a19f84e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/PageFilter.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/PageFilter.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commandTools; +package com.onarandombox.MultiverseCore.commandTools.contexts; import com.onarandombox.MultiverseCore.commandTools.display.ContentFilter; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/PlayerWorld.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/PlayerWorld.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/PlayerWorld.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/PlayerWorld.java index 79576110..a629941f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/PlayerWorld.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/PlayerWorld.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commandTools; +package com.onarandombox.MultiverseCore.commandTools.contexts; import com.onarandombox.MultiverseCore.api.MultiverseWorld; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/WorldFlags.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/WorldFlags.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/commandTools/WorldFlags.java rename to src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/WorldFlags.java index 321a255a..7176a532 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/WorldFlags.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/WorldFlags.java @@ -5,7 +5,7 @@ * with this project. * ******************************************************************************/ -package com.onarandombox.MultiverseCore.commandTools; +package com.onarandombox.MultiverseCore.commandTools.contexts; import co.aikar.commands.InvalidCommandArgument; import com.dumptruckman.minecraft.util.Logging; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/package-info.java new file mode 100644 index 00000000..fdbcfa9b --- /dev/null +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/contexts/package-info.java @@ -0,0 +1,4 @@ +/** + * Classes derived from parsing command args and context. + */ +package com.onarandombox.MultiverseCore.commandTools.contexts; \ No newline at end of file diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/display/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/display/package-info.java new file mode 100644 index 00000000..184d6b53 --- /dev/null +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/display/package-info.java @@ -0,0 +1,4 @@ +/** + * Stores classes that help display content to sender in various formatting. + */ +package com.onarandombox.MultiverseCore.commandTools.display; \ No newline at end of file diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/package-info.java index c91c6550..1a4aeb2c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commandTools/package-info.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/package-info.java @@ -1,4 +1,4 @@ /** - * Main classes used by commands. + * Main classes used to manage commands. */ package com.onarandombox.MultiverseCore.commandTools; \ No newline at end of file diff --git a/src/main/java/com/onarandombox/MultiverseCore/commandTools/queue/package-info.java b/src/main/java/com/onarandombox/MultiverseCore/commandTools/queue/package-info.java new file mode 100644 index 00000000..3a9a6296 --- /dev/null +++ b/src/main/java/com/onarandombox/MultiverseCore/commandTools/queue/package-info.java @@ -0,0 +1,4 @@ +/** + * Manager queuing of dangerous commands in need of confirmation. + */ +package com.onarandombox.MultiverseCore.commandTools.queue; \ No newline at end of file diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java index 9ca5ccfa..1c705665 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java @@ -20,7 +20,7 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld; import com.onarandombox.MultiverseCore.commandTools.display.ColourAlternator; import com.onarandombox.MultiverseCore.commandTools.display.ContentCreator; import com.onarandombox.MultiverseCore.commandTools.display.page.PageDisplay; -import com.onarandombox.MultiverseCore.commandTools.PageFilter; +import com.onarandombox.MultiverseCore.commandTools.contexts.PageFilter; import com.onarandombox.MultiverseCore.utils.AnchorManager; import org.bukkit.ChatColor; import org.bukkit.Location; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java index 5cfd1674..7f3e7df8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.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.PlayerWorld; +import com.onarandombox.MultiverseCore.commandTools.contexts.PlayerWorld; 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 ea95d13a..0b7aba94 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java @@ -17,7 +17,7 @@ import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandTools.WorldFlags; +import com.onarandombox.MultiverseCore.commandTools.contexts.WorldFlags; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.Command; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GameRuleCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/GameRuleCommand.java index b60d2afc..49bca5ee 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GameRuleCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/GameRuleCommand.java @@ -16,15 +16,13 @@ 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.GameRuleProperty; +import com.onarandombox.MultiverseCore.commandTools.contexts.GameRuleProperty; import com.onarandombox.MultiverseCore.commandTools.display.ColourAlternator; import com.onarandombox.MultiverseCore.commandTools.display.ContentCreator; import com.onarandombox.MultiverseCore.commandTools.display.ContentFilter; import com.onarandombox.MultiverseCore.commandTools.display.kvpair.KeyValueDisplay; import org.bukkit.ChatColor; -import org.bukkit.Color; import org.bukkit.GameRule; -import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java index 3a46e462..20beb722 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java @@ -17,7 +17,7 @@ import co.aikar.commands.annotation.Optional; import co.aikar.commands.annotation.Subcommand; import co.aikar.commands.annotation.Syntax; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.commandTools.WorldFlags; +import com.onarandombox.MultiverseCore.commandTools.contexts.WorldFlags; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.Command; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java index c5ceee90..a6ca4179 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java @@ -18,7 +18,7 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld; import com.onarandombox.MultiverseCore.commandTools.display.ColourAlternator; import com.onarandombox.MultiverseCore.commandTools.display.ContentCreator; import com.onarandombox.MultiverseCore.commandTools.display.page.PageDisplay; -import com.onarandombox.MultiverseCore.commandTools.PageFilter; +import com.onarandombox.MultiverseCore.commandTools.contexts.PageFilter; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java index 80dd3c32..d9dbcc5c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.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.WorldFlags; +import com.onarandombox.MultiverseCore.commandTools.contexts.WorldFlags; 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 34ca2cc6..b2d17b3e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java @@ -18,7 +18,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.PlayerWorld; +import com.onarandombox.MultiverseCore.commandTools.contexts.PlayerWorld; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender;