Align parser/suggestion package names

Incendo · Jan 14, 2024 · 844aa71 · 844aa71
1 parent 78761db
commit 844aa71
Show file tree

Hide file tree

Showing 83 changed files with 144 additions and 146 deletions.
diff --git a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java
@@ -43,7 +43,7 @@
 import cloud.commandframework.brigadier.argument.BrigadierMapping;
 import cloud.commandframework.brigadier.argument.BrigadierMappingBuilder;
 import cloud.commandframework.brigadier.argument.BrigadierMappings;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import cloud.commandframework.brigadier.node.LiteralBrigadierNodeFactory;
 import cloud.commandframework.brigadier.suggestion.TooltipSuggestion;
 import cloud.commandframework.context.CommandContext;

diff --git a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/package-info.java b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/package-info.java
@@ -5,7 +5,7 @@
  * Cloud {@link cloud.commandframework.CommandTree command trees} to Brigadier nodes.</p>
  *
  * <p>To bridge Brigadier and Cloud argument types, an argument parser that wraps Brigadier argument types is available in
- * {@link cloud.commandframework.brigadier.argument.WrappedBrigadierParser}. Other classes in that package allow constructing
+ * {@link cloud.commandframework.brigadier.parser.WrappedBrigadierParser}. Other classes in that package allow constructing
  * Brigadier {@link com.mojang.brigadier.StringReader} instances that can be used for efficient interoperability with
  * Brigadier.</p>
  */

diff --git a/...brigadier/argument/CloudStringReader.java → ...k/brigadier/parser/CloudStringReader.java b/...brigadier/argument/CloudStringReader.java → ...k/brigadier/parser/CloudStringReader.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.brigadier.argument;
+package cloud.commandframework.brigadier.parser;
 
 import cloud.commandframework.context.CommandInput;
 import com.mojang.brigadier.StringReader;

diff --git a/...dier/argument/WrappedBrigadierParser.java → ...gadier/parser/WrappedBrigadierParser.java b/...dier/argument/WrappedBrigadierParser.java → ...gadier/parser/WrappedBrigadierParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.brigadier.argument;
+package cloud.commandframework.brigadier.parser;
 
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;

diff --git a/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/package-info.java b/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/parser/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Argument parsers available on Brigadier platforms.
+ */
+package cloud.commandframework.brigadier.parser;
diff --git a/...adier/argument/CloudStringReaderTest.java → ...igadier/parser/CloudStringReaderTest.java b/...adier/argument/CloudStringReaderTest.java → ...igadier/parser/CloudStringReaderTest.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.brigadier.argument;
+package cloud.commandframework.brigadier.parser;
 
 import cloud.commandframework.context.CommandInput;
 import com.mojang.brigadier.StringReader;

diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitBrigadierMapper.java
@@ -29,17 +29,17 @@
 import cloud.commandframework.bukkit.internal.CommandBuildContextSupplier;
 import cloud.commandframework.bukkit.internal.MinecraftArgumentTypes;
 import cloud.commandframework.bukkit.internal.RegistryReflection;
-import cloud.commandframework.bukkit.parsers.BlockPredicateParser;
-import cloud.commandframework.bukkit.parsers.EnchantmentParser;
-import cloud.commandframework.bukkit.parsers.ItemStackParser;
-import cloud.commandframework.bukkit.parsers.ItemStackPredicateParser;
-import cloud.commandframework.bukkit.parsers.NamespacedKeyParser;
-import cloud.commandframework.bukkit.parsers.location.Location2DParser;
-import cloud.commandframework.bukkit.parsers.location.LocationParser;
-import cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser;
-import cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser;
-import cloud.commandframework.bukkit.parsers.selector.SingleEntitySelectorParser;
-import cloud.commandframework.bukkit.parsers.selector.SinglePlayerSelectorParser;
+import cloud.commandframework.bukkit.parser.BlockPredicateParser;
+import cloud.commandframework.bukkit.parser.EnchantmentParser;
+import cloud.commandframework.bukkit.parser.ItemStackParser;
+import cloud.commandframework.bukkit.parser.ItemStackPredicateParser;
+import cloud.commandframework.bukkit.parser.NamespacedKeyParser;
+import cloud.commandframework.bukkit.parser.location.Location2DParser;
+import cloud.commandframework.bukkit.parser.location.LocationParser;
+import cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser;
+import cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser;
+import cloud.commandframework.bukkit.parser.selector.SingleEntitySelectorParser;
+import cloud.commandframework.bukkit.parser.selector.SinglePlayerSelectorParser;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import io.leangen.geantyref.GenericTypeReflector;

diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java
@@ -36,21 +36,21 @@
 import cloud.commandframework.bukkit.data.MultipleEntitySelector;
 import cloud.commandframework.bukkit.data.MultiplePlayerSelector;
 import cloud.commandframework.bukkit.internal.CraftBukkitReflection;
-import cloud.commandframework.bukkit.parsers.BlockPredicateParser;
-import cloud.commandframework.bukkit.parsers.EnchantmentParser;
-import cloud.commandframework.bukkit.parsers.ItemStackParser;
-import cloud.commandframework.bukkit.parsers.ItemStackPredicateParser;
-import cloud.commandframework.bukkit.parsers.MaterialParser;
-import cloud.commandframework.bukkit.parsers.NamespacedKeyParser;
-import cloud.commandframework.bukkit.parsers.OfflinePlayerParser;
-import cloud.commandframework.bukkit.parsers.PlayerParser;
-import cloud.commandframework.bukkit.parsers.WorldParser;
-import cloud.commandframework.bukkit.parsers.location.Location2DParser;
-import cloud.commandframework.bukkit.parsers.location.LocationParser;
-import cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser;
-import cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser;
-import cloud.commandframework.bukkit.parsers.selector.SingleEntitySelectorParser;
-import cloud.commandframework.bukkit.parsers.selector.SinglePlayerSelectorParser;
+import cloud.commandframework.bukkit.parser.BlockPredicateParser;
+import cloud.commandframework.bukkit.parser.EnchantmentParser;
+import cloud.commandframework.bukkit.parser.ItemStackParser;
+import cloud.commandframework.bukkit.parser.ItemStackPredicateParser;
+import cloud.commandframework.bukkit.parser.MaterialParser;
+import cloud.commandframework.bukkit.parser.NamespacedKeyParser;
+import cloud.commandframework.bukkit.parser.OfflinePlayerParser;
+import cloud.commandframework.bukkit.parser.PlayerParser;
+import cloud.commandframework.bukkit.parser.WorldParser;
+import cloud.commandframework.bukkit.parser.location.Location2DParser;
+import cloud.commandframework.bukkit.parser.location.LocationParser;
+import cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser;
+import cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser;
+import cloud.commandframework.bukkit.parser.selector.SingleEntitySelectorParser;
+import cloud.commandframework.bukkit.parser.selector.SinglePlayerSelectorParser;
 import cloud.commandframework.exceptions.ArgumentParseException;
 import cloud.commandframework.exceptions.CommandExecutionException;
 import cloud.commandframework.exceptions.InvalidCommandSenderException;

diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java
@@ -23,7 +23,7 @@
 //
 package cloud.commandframework.bukkit;
 
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import cloud.commandframework.bukkit.internal.BukkitBackwardsBrigadierSenderMapper;
 import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext;
 import cloud.commandframework.execution.preprocessor.CommandPreprocessor;

diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitParserParameters.java
@@ -41,8 +41,8 @@ private BukkitParserParameters() {
 
     /**
      * Used to specify if an empty result is allowed for
-     * {@link cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser} and
-     * {@link cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser}.
+     * {@link cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser} and
+     * {@link cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser}.
      *
      * @since 1.8.0
      */
@@ -51,7 +51,7 @@ private BukkitParserParameters() {
             create("allow_empty_selector_result", TypeToken.get(Boolean.class));
 
     /**
-     * Sets to require explicit namespaces for {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser}
+     * Sets to require explicit namespaces for {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser}
      * (i.e. 'test' will be rejected but 'test:test' will pass).
      *
      * @since 1.7.0
@@ -60,7 +60,7 @@ private BukkitParserParameters() {
             create("require_explicit_namespace", TypeToken.get(Boolean.class));
 
     /**
-     * Sets a custom default namespace for {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser}.
+     * Sets a custom default namespace for {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser}.
      * Without this annotation the default is {@link org.bukkit.NamespacedKey#MINECRAFT}.
      *
      * @since 1.7.0

diff --git a/...src/main/java/cloud/commandframework/bukkit/annotation/specifier/AllowEmptySelection.java b/...src/main/java/cloud/commandframework/bukkit/annotation/specifier/AllowEmptySelection.java
@@ -31,8 +31,8 @@
 
 /**
  * Annotation used to specify if an empty result is allowed for
- * {@link cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorParser} and
- * {@link cloud.commandframework.bukkit.parsers.selector.MultipleEntitySelectorParser}.
+ * {@link cloud.commandframework.bukkit.parser.selector.MultiplePlayerSelectorParser} and
+ * {@link cloud.commandframework.bukkit.parser.selector.MultipleEntitySelectorParser}.
  *
  * @since 1.8.0
  */

diff --git a/...it/src/main/java/cloud/commandframework/bukkit/annotation/specifier/DefaultNamespace.java b/...it/src/main/java/cloud/commandframework/bukkit/annotation/specifier/DefaultNamespace.java
@@ -30,7 +30,7 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
- * Annotation used to set a custom namespace for {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser}.
+ * Annotation used to set a custom namespace for {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser}.
  * Without this annotation, the default namespace is {@link org.bukkit.NamespacedKey#MINECRAFT}.
  *
  * @since 1.7.0

diff --git a/...ain/java/cloud/commandframework/bukkit/annotation/specifier/RequireExplicitNamespace.java b/...ain/java/cloud/commandframework/bukkit/annotation/specifier/RequireExplicitNamespace.java
@@ -29,7 +29,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Annotation used to set {@link cloud.commandframework.bukkit.parsers.NamespacedKeyParser} to
+ * Annotation used to set {@link cloud.commandframework.bukkit.parser.NamespacedKeyParser} to
  * require explicit namespaces.
  *
  * @since 1.7.0

diff --git a/.../bukkit/parsers/BlockPredicateParser.java → ...k/bukkit/parser/BlockPredicateParser.java b/.../bukkit/parsers/BlockPredicateParser.java → ...k/bukkit/parser/BlockPredicateParser.java
@@ -21,14 +21,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers;
+package cloud.commandframework.bukkit.parser;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
 import cloud.commandframework.arguments.suggestion.SuggestionProvider;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import cloud.commandframework.bukkit.BukkitCommandManager;
 import cloud.commandframework.bukkit.data.BlockPredicate;
 import cloud.commandframework.bukkit.internal.CommandBuildContextSupplier;

diff --git a/...ork/bukkit/parsers/EnchantmentParser.java → ...work/bukkit/parser/EnchantmentParser.java b/...ork/bukkit/parsers/EnchantmentParser.java → ...work/bukkit/parser/EnchantmentParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers;
+package cloud.commandframework.bukkit.parser;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;

diff --git a/...ework/bukkit/parsers/ItemStackParser.java → ...mework/bukkit/parser/ItemStackParser.java b/...ework/bukkit/parsers/ItemStackParser.java → ...mework/bukkit/parser/ItemStackParser.java
@@ -21,15 +21,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers;
+package cloud.commandframework.bukkit.parser;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
 import cloud.commandframework.arguments.suggestion.BlockingSuggestionProvider;
 import cloud.commandframework.arguments.suggestion.SuggestionProvider;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import cloud.commandframework.bukkit.BukkitCommandManager;
 import cloud.commandframework.bukkit.data.ProtoItemStack;
 import cloud.commandframework.bukkit.internal.CommandBuildContextSupplier;

diff --git a/...kit/parsers/ItemStackPredicateParser.java → ...kkit/parser/ItemStackPredicateParser.java b/...kit/parsers/ItemStackPredicateParser.java → ...kkit/parser/ItemStackPredicateParser.java
@@ -21,14 +21,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers;
+package cloud.commandframework.bukkit.parser;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
 import cloud.commandframework.arguments.suggestion.SuggestionProvider;
-import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
+import cloud.commandframework.brigadier.parser.WrappedBrigadierParser;
 import cloud.commandframework.bukkit.BukkitCommandManager;
 import cloud.commandframework.bukkit.data.ItemStackPredicate;
 import cloud.commandframework.bukkit.internal.CommandBuildContextSupplier;

diff --git a/...mework/bukkit/parsers/MaterialParser.java → ...amework/bukkit/parser/MaterialParser.java b/...mework/bukkit/parsers/MaterialParser.java → ...amework/bukkit/parser/MaterialParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers;
+package cloud.commandframework.bukkit.parser;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;

diff --git a/...k/bukkit/parsers/NamespacedKeyParser.java → ...rk/bukkit/parser/NamespacedKeyParser.java b/...k/bukkit/parsers/NamespacedKeyParser.java → ...rk/bukkit/parser/NamespacedKeyParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers;
+package cloud.commandframework.bukkit.parser;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;

diff --git a/...k/bukkit/parsers/OfflinePlayerParser.java → ...rk/bukkit/parser/OfflinePlayerParser.java b/...k/bukkit/parsers/OfflinePlayerParser.java → ...rk/bukkit/parser/OfflinePlayerParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers;
+package cloud.commandframework.bukkit.parser;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;

diff --git a/...ramework/bukkit/parsers/PlayerParser.java → ...framework/bukkit/parser/PlayerParser.java b/...ramework/bukkit/parsers/PlayerParser.java → ...framework/bukkit/parser/PlayerParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers;
+package cloud.commandframework.bukkit.parser;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;

diff --git a/...framework/bukkit/parsers/WorldParser.java → ...dframework/bukkit/parser/WorldParser.java b/...framework/bukkit/parsers/WorldParser.java → ...dframework/bukkit/parser/WorldParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers;
+package cloud.commandframework.bukkit.parser;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;

diff --git a/...k/bukkit/parsers/location/Location2D.java → ...rk/bukkit/parser/location/Location2D.java b/...k/bukkit/parsers/location/Location2D.java → ...rk/bukkit/parser/location/Location2D.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers.location;
+package cloud.commandframework.bukkit.parser.location;
 
 import org.bukkit.Location;
 import org.bukkit.World;

diff --git a/...it/parsers/location/Location2DParser.java → ...kit/parser/location/Location2DParser.java b/...it/parsers/location/Location2DParser.java → ...kit/parser/location/Location2DParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers.location;
+package cloud.commandframework.bukkit.parser.location;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;

diff --git a/.../parsers/location/LocationCoordinate.java → ...t/parser/location/LocationCoordinate.java b/.../parsers/location/LocationCoordinate.java → ...t/parser/location/LocationCoordinate.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers.location;
+package cloud.commandframework.bukkit.parser.location;
 
 import java.util.Locale;
 import java.util.Objects;

diff --git a/...rs/location/LocationCoordinateParser.java → ...er/location/LocationCoordinateParser.java b/...rs/location/LocationCoordinateParser.java → ...er/location/LocationCoordinateParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers.location;
+package cloud.commandframework.bukkit.parser.location;
 
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;

diff --git a/...sers/location/LocationCoordinateType.java → ...rser/location/LocationCoordinateType.java b/...sers/location/LocationCoordinateType.java → ...rser/location/LocationCoordinateType.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers.location;
+package cloud.commandframework.bukkit.parser.location;
 
 /**
  * Type of location coordinates

diff --git a/...kkit/parsers/location/LocationParser.java → ...ukkit/parser/location/LocationParser.java b/...kkit/parsers/location/LocationParser.java → ...ukkit/parser/location/LocationParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers.location;
+package cloud.commandframework.bukkit.parser.location;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;

diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/package-info.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/location/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Vanilla-like location arguments
+ */
+package cloud.commandframework.bukkit.parser.location;
diff --git a/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/package-info.java b/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parser/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Bukkit specific command arguments
+ */
+package cloud.commandframework.bukkit.parser;
diff --git a/...elector/MultipleEntitySelectorParser.java → ...elector/MultipleEntitySelectorParser.java b/...elector/MultipleEntitySelectorParser.java → ...elector/MultipleEntitySelectorParser.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers.selector;
+package cloud.commandframework.bukkit.parser.selector;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ParserDescriptor;

diff --git a/...elector/MultiplePlayerSelectorParser.java → ...elector/MultiplePlayerSelectorParser.java b/...elector/MultiplePlayerSelectorParser.java → ...elector/MultiplePlayerSelectorParser.java
@@ -21,13 +21,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers.selector;
+package cloud.commandframework.bukkit.parser.selector;
 
 import cloud.commandframework.CommandComponent;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ParserDescriptor;
 import cloud.commandframework.bukkit.data.MultiplePlayerSelector;
-import cloud.commandframework.bukkit.parsers.PlayerParser;
+import cloud.commandframework.bukkit.parser.PlayerParser;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.context.CommandInput;
 import java.util.Collection;

diff --git a/...elector/SelectorUnsupportedException.java → ...elector/SelectorUnsupportedException.java b/...elector/SelectorUnsupportedException.java → ...elector/SelectorUnsupportedException.java
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
-package cloud.commandframework.bukkit.parsers.selector;
+package cloud.commandframework.bukkit.parser.selector;
 
 import cloud.commandframework.bukkit.BukkitCaptionKeys;
 import cloud.commandframework.context.CommandContext;