From d73e7113df50d00413aa7ea4ee71d0e7ec7dd3c6 Mon Sep 17 00:00:00 2001
From: broccolai <me@broccol.ai>
Date: Mon, 29 Mar 2021 02:42:23 +0100
Subject: [PATCH] Fix rebase issues

Removes TypedBuilder
Rebump version due to new build file
Fix various new argument builders
---
 build.gradle                                  |  0
 build.gradle.kts                              |  2 +-
 .../java/cloud/commandframework/Command.java  |  2 +-
 .../arguments/CommandArgument.java            | 90 +------------------
 .../jda/parsers/RoleArgument.java             |  2 +-
 .../kotlin/MutableCommandBuilder.kt           |  6 +-
 .../parsers/location/Location2DArgument.java  |  2 +-
 .../fabric/argument/AngleArgument.java        |  2 +-
 .../fabric/argument/AxisArgument.java         |  2 +-
 .../fabric/argument/ColorArgument.java        |  2 +-
 .../fabric/argument/CompoundTagArgument.java  |  2 +-
 .../fabric/argument/EntityAnchorArgument.java |  2 +-
 .../fabric/argument/FloatRangeArgument.java   |  2 +-
 .../fabric/argument/IdentifierArgument.java   |  2 +-
 .../fabric/argument/IntRangeArgument.java     |  2 +-
 .../fabric/argument/ItemDataArgument.java     |  2 +-
 .../fabric/argument/NbtPathArgument.java      |  2 +-
 .../fabric/argument/NbtTagArgument.java       |  2 +-
 .../argument/ParticleEffectArgument.java      |  2 +-
 .../argument/RegistryEntryArgument.java       |  2 +-
 .../argument/ScoreboardCriterionArgument.java |  2 +-
 .../argument/ScoreboardOperationArgument.java |  2 +-
 .../fabric/argument/StatusEffectArgument.java |  2 +-
 .../fabric/argument/TeamArgument.java         |  2 +-
 .../fabric/argument/TimeArgument.java         |  2 +-
 .../argument/server/BlockPosArgument.java     |  2 +-
 .../argument/server/ColumnPosArgument.java    |  2 +-
 .../argument/server/MessageArgument.java      |  2 +-
 .../MultipleEntitySelectorArgument.java       |  2 +-
 .../MultiplePlayerSelectorArgument.java       |  2 +-
 .../server/SingleEntitySelectorArgument.java  |  2 +-
 .../server/SinglePlayerSelectorArgument.java  |  2 +-
 .../fabric/argument/server/Vec2Argument.java  |  2 +-
 .../fabric/argument/server/Vec3Argument.java  |  2 +-
 settings.gradle                               |  0
 35 files changed, 35 insertions(+), 123 deletions(-)
 delete mode 100644 build.gradle
 delete mode 100644 settings.gradle

diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index e69de29bb..000000000
diff --git a/build.gradle.kts b/build.gradle.kts
index 2027cc062..958251c65 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,7 +32,7 @@ gradle.taskGraph.whenReady {
 }
 
 group = "cloud.commandframework"
-version = "1.5.0-SNAPSHOT"
+version = "2.0.0-SNAPSHOT"
 description = "Command framework and dispatcher for the JVM"
 
 subprojects {
diff --git a/cloud-core/src/main/java/cloud/commandframework/Command.java b/cloud-core/src/main/java/cloud/commandframework/Command.java
index 10a24ebc9..b619f5e4c 100644
--- a/cloud-core/src/main/java/cloud/commandframework/Command.java
+++ b/cloud-core/src/main/java/cloud/commandframework/Command.java
@@ -665,7 +665,7 @@ private Builder(
          * @since 1.4.0
          */
         public <T> @NonNull Builder<C> argument(
-                final CommandArgument.@NonNull Builder<C, T> builder,
+                final CommandArgument.@NonNull Builder<C, T, ?> builder,
                 final @NonNull ArgumentDescription description
         ) {
             final List<CommandComponent<C>> commandComponents = new ArrayList<>(this.commandComponents);
diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java
index 3107d40de..b5d876aba 100644
--- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java
+++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java
@@ -686,7 +686,7 @@ protected Builder(
          * @return Builder instance
          * @since 1.4.0
          */
-        public @NonNull Builder<@NonNull C, @NonNull T> withDefaultDescription(
+        public @NonNull Builder<@NonNull C, @NonNull T, @NonNull B> withDefaultDescription(
                 final @NonNull ArgumentDescription defaultDescription
         ) {
             this.defaultDescription = Objects.requireNonNull(defaultDescription, "Default description may not be null");
@@ -752,92 +752,4 @@ protected final boolean isRequired() {
 
     }
 
-    /**
-     * A variant of builders designed for subclassing, that returns a self type .
-     *
-     * @param <C> sender type
-     * @param <T> argument value type
-     * @param <B> the subclass type
-     * @since 1.5.0
-     */
-    public abstract static class TypedBuilder<C, T, B extends Builder<C, T>> extends Builder<C, T> {
-
-        protected TypedBuilder(
-                final @NonNull TypeToken<T> valueType,
-                final @NonNull String name
-        ) {
-            super(valueType, name);
-        }
-
-        protected TypedBuilder(
-                final @NonNull Class<T> valueType,
-                final @NonNull String name
-        ) {
-            super(valueType, name);
-        }
-
-        @SuppressWarnings("unchecked")
-        protected final B self() {
-            return (B) this;
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public @NonNull B manager(final @NonNull CommandManager<C> manager) {
-            super.manager(manager);
-            return this.self();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public @NonNull B asRequired() {
-            super.asRequired();
-            return this.self();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public @NonNull B asOptional() {
-            super.asOptional();
-            return this.self();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public @NonNull B asOptionalWithDefault(final @NonNull String defaultValue) {
-            super.asOptionalWithDefault(defaultValue);
-            return this.self();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public @NonNull B withParser(final @NonNull ArgumentParser<@NonNull C, @NonNull T> parser) {
-            super.withParser(parser);
-            return this.self();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public @NonNull Builder<@NonNull C, @NonNull T> withSuggestionsProvider(
-                final @NonNull BiFunction<@NonNull CommandContext<C>,
-                        @NonNull String, @NonNull List<String>> suggestionsProvider
-        ) {
-            super.withSuggestionsProvider(suggestionsProvider);
-            return this.self();
-        }
-
-    }
-
 }
diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java
index 45d36b30a..724dce1b5 100644
--- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java
+++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/RoleArgument.java
@@ -107,7 +107,7 @@ public enum ParserMode {
     }
 
 
-    public static final class Builder<C> extends CommandArgument.Builder<C, Role> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Role, Builder<C>> {
 
         private Set<ParserMode> modes = new HashSet<>();
 
diff --git a/cloud-kotlin-extensions/src/main/kotlin/cloud/commandframework/kotlin/MutableCommandBuilder.kt b/cloud-kotlin-extensions/src/main/kotlin/cloud/commandframework/kotlin/MutableCommandBuilder.kt
index 857945fe9..64dd94ada 100644
--- a/cloud-kotlin-extensions/src/main/kotlin/cloud/commandframework/kotlin/MutableCommandBuilder.kt
+++ b/cloud-kotlin-extensions/src/main/kotlin/cloud/commandframework/kotlin/MutableCommandBuilder.kt
@@ -533,7 +533,7 @@ public class MutableCommandBuilder<C : Any> {
     @Suppress("DEPRECATION")
     @Deprecated(message = "ArgumentDescription should be used over Description", level = DeprecationLevel.HIDDEN)
     public fun argument(
-        argument: CommandArgument.Builder<C, *>,
+        argument: CommandArgument.Builder<C, *, *>,
         description: Description = Description.empty()
     ): MutableCommandBuilder<C> =
         mutate { it.argument(argument, description) }
@@ -547,7 +547,7 @@ public class MutableCommandBuilder<C : Any> {
      * @since 1.4.0
      */
     public fun argument(
-            argument: CommandArgument.Builder<C, *>,
+            argument: CommandArgument.Builder<C, *, *>,
             description: ArgumentDescription = ArgumentDescription.empty()
     ): MutableCommandBuilder<C> =
             mutate { it.argument(argument, description) }
@@ -692,7 +692,7 @@ public class MutableCommandBuilder<C : Any> {
         name: String,
         aliases: Array<String> = emptyArray(),
         description: ArgumentDescription = ArgumentDescription.empty(),
-        argumentBuilder: CommandArgument.Builder<C, *>
+        argumentBuilder: CommandArgument.Builder<C, *, *>
     ): MutableCommandBuilder<C> = mutate {
         it.flag(
             this.commandManager.flagBuilder(name)
diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DArgument.java
index 57d124515..8167a5f4e 100644
--- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DArgument.java
+++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DArgument.java
@@ -119,7 +119,7 @@ private Location2DArgument(
     }
 
 
-    public static final class Builder<C> extends CommandArgument.Builder<C, Location2D> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Location2D, Builder<C>> {
 
         private Builder(
                 final @NonNull String name
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AngleArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AngleArgument.java
index 77b06f2fc..faf0ee5e2 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AngleArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AngleArgument.java
@@ -117,7 +117,7 @@ public final class AngleArgument<C> extends CommandArgument<C, AngleArgumentType
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, AngleArgumentType.Angle, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, AngleArgumentType.Angle, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(AngleArgumentType.Angle.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AxisArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AxisArgument.java
index 5d5a751c9..2e4bacea4 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AxisArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/AxisArgument.java
@@ -128,7 +128,7 @@ public final class AxisArgument<C> extends CommandArgument<C, EnumSet<Direction.
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, EnumSet<Direction.Axis>, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, EnumSet<Direction.Axis>, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(TYPE, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ColorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ColorArgument.java
index f5695dec2..8b193672d 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ColorArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ColorArgument.java
@@ -116,7 +116,7 @@ public final class ColorArgument<C> extends CommandArgument<C, Formatting> {
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends CommandArgument.TypedBuilder<C, Formatting, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Formatting, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(Formatting.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/CompoundTagArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/CompoundTagArgument.java
index 0f4976424..6283e564d 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/CompoundTagArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/CompoundTagArgument.java
@@ -118,7 +118,7 @@ public final class CompoundTagArgument<C> extends CommandArgument<C, CompoundTag
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, CompoundTag, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, CompoundTag, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(CompoundTag.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/EntityAnchorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/EntityAnchorArgument.java
index 7cb47ad53..4ec0ded34 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/EntityAnchorArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/EntityAnchorArgument.java
@@ -117,7 +117,7 @@ public final class EntityAnchorArgument<C> extends CommandArgument<C, EntityAnch
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, EntityAnchorArgumentType.EntityAnchor, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, EntityAnchorArgumentType.EntityAnchor, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(EntityAnchorArgumentType.EntityAnchor.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FloatRangeArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FloatRangeArgument.java
index e4a2b1f10..3ff88534a 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FloatRangeArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/FloatRangeArgument.java
@@ -128,7 +128,7 @@ public final class FloatRangeArgument<C> extends CommandArgument<C, NumberRange.
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, NumberRange.FloatRange, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, NumberRange.FloatRange, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(NumberRange.FloatRange.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IdentifierArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IdentifierArgument.java
index c43a76cdf..fdf85015a 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IdentifierArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IdentifierArgument.java
@@ -118,7 +118,7 @@ public final class IdentifierArgument<C> extends CommandArgument<C, Identifier>
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, Identifier, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Identifier, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(Identifier.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IntRangeArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IntRangeArgument.java
index d8f5577f5..b178b9d40 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IntRangeArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/IntRangeArgument.java
@@ -128,7 +128,7 @@ public final class IntRangeArgument<C> extends CommandArgument<C, NumberRange.In
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, NumberRange.IntRange, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, NumberRange.IntRange, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(NumberRange.IntRange.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ItemDataArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ItemDataArgument.java
index 573849460..107109864 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ItemDataArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ItemDataArgument.java
@@ -125,7 +125,7 @@ public final class ItemDataArgument<C> extends CommandArgument<C, ItemStackArgum
      *
      * @param <C> sender type
      */
-    public static final class Builder<C> extends TypedBuilder<C, ItemStackArgument, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, ItemStackArgument, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(ItemStackArgument.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtPathArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtPathArgument.java
index eed4a0090..f29f31ec6 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtPathArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtPathArgument.java
@@ -117,7 +117,7 @@ public final class NbtPathArgument<C> extends CommandArgument<C, NbtPathArgument
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, NbtPathArgumentType.NbtPath, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, NbtPathArgumentType.NbtPath, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(NbtPathArgumentType.NbtPath.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtTagArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtTagArgument.java
index 229f9f5ba..bcb1fc0a6 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtTagArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/NbtTagArgument.java
@@ -118,7 +118,7 @@ public final class NbtTagArgument<C> extends CommandArgument<C, Tag> {
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, Tag, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Tag, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(Tag.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ParticleEffectArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ParticleEffectArgument.java
index f47f2d04d..34fb53c10 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ParticleEffectArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ParticleEffectArgument.java
@@ -118,7 +118,7 @@ public final class ParticleEffectArgument<C> extends CommandArgument<C, Particle
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, ParticleEffect, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, ParticleEffect, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(ParticleEffect.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/RegistryEntryArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/RegistryEntryArgument.java
index e43f94bb0..df9156b61 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/RegistryEntryArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/RegistryEntryArgument.java
@@ -282,7 +282,7 @@ public RegistryKey<? extends Registry<?>> getRegistry() {
      * @param <V> The registry value type
      * @since 1.5.0
      */
-    public static final class Builder<C, V> extends CommandArgument.TypedBuilder<C, V, Builder<C, V>> {
+    public static final class Builder<C, V> extends CommandArgument.Builder<C, V, Builder<C, V>> {
 
         private final RegistryKey<? extends Registry<V>> registryIdent;
 
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardCriterionArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardCriterionArgument.java
index b58f7d3d8..7eadbfcd4 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardCriterionArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardCriterionArgument.java
@@ -118,7 +118,7 @@ public final class ScoreboardCriterionArgument<C> extends CommandArgument<C, Sco
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, ScoreboardCriterion, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, ScoreboardCriterion, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(ScoreboardCriterion.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardOperationArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardOperationArgument.java
index 571515748..5e89c6cc7 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardOperationArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/ScoreboardOperationArgument.java
@@ -103,7 +103,7 @@ public final class ScoreboardOperationArgument<C> extends CommandArgument<C, Ope
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, Operation, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Operation, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(Operation.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/StatusEffectArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/StatusEffectArgument.java
index 2491ac7d3..49e8f668d 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/StatusEffectArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/StatusEffectArgument.java
@@ -121,7 +121,7 @@ public final class StatusEffectArgument<C> extends CommandArgument<C, StatusEffe
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, StatusEffect, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, StatusEffect, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(StatusEffect.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TeamArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TeamArgument.java
index 6bd85035f..f91046542 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TeamArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TeamArgument.java
@@ -183,7 +183,7 @@ public static final class TeamParser<C> extends SidedArgumentParser<C, String, T
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, Team, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Team, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(Team.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TimeArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TimeArgument.java
index 60af1b464..722288444 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TimeArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/TimeArgument.java
@@ -116,7 +116,7 @@ public final class TimeArgument<C> extends CommandArgument<C, MinecraftTime> {
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, MinecraftTime, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, MinecraftTime, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(MinecraftTime.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/BlockPosArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/BlockPosArgument.java
index ac4238c4a..30138e314 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/BlockPosArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/BlockPosArgument.java
@@ -124,7 +124,7 @@ public final class BlockPosArgument<C> extends CommandArgument<C, BlockCoordinat
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, BlockCoordinates, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, BlockCoordinates, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(BlockCoordinates.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/ColumnPosArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/ColumnPosArgument.java
index 9a2c53b3d..a41b5cb77 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/ColumnPosArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/ColumnPosArgument.java
@@ -123,7 +123,7 @@ public final class ColumnPosArgument<C> extends CommandArgument<C, ColumnCoordin
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, ColumnCoordinates, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, ColumnCoordinates, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(ColumnCoordinates.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MessageArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MessageArgument.java
index 77545c23e..b4c557c6b 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MessageArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MessageArgument.java
@@ -117,7 +117,7 @@ public final class MessageArgument<C> extends CommandArgument<C, Message> {
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, Message, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Message, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(Message.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultipleEntitySelectorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultipleEntitySelectorArgument.java
index 84cc68456..b34c3f9e7 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultipleEntitySelectorArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultipleEntitySelectorArgument.java
@@ -99,7 +99,7 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, MultipleEntitySelector, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, MultipleEntitySelector, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(MultipleEntitySelector.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultiplePlayerSelectorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultiplePlayerSelectorArgument.java
index 3daaa7011..07c658099 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultiplePlayerSelectorArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/MultiplePlayerSelectorArgument.java
@@ -99,7 +99,7 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, MultiplePlayerSelector, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, MultiplePlayerSelector, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(MultiplePlayerSelector.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SingleEntitySelectorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SingleEntitySelectorArgument.java
index 42f7719bb..3835182e3 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SingleEntitySelectorArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SingleEntitySelectorArgument.java
@@ -99,7 +99,7 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, SingleEntitySelector, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, SingleEntitySelector, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(SingleEntitySelector.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SinglePlayerSelectorArgument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SinglePlayerSelectorArgument.java
index c283706e8..d11a3771e 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SinglePlayerSelectorArgument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/SinglePlayerSelectorArgument.java
@@ -99,7 +99,7 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, SinglePlayerSelector, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, SinglePlayerSelector, Builder<C>> {
 
         Builder(final @NonNull String name) {
             super(SinglePlayerSelector.class, name);
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec2Argument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec2Argument.java
index 2c67d95e9..26e173461 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec2Argument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec2Argument.java
@@ -184,7 +184,7 @@ public boolean centerIntegers() {
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, Coordinates.CoordinatesXZ, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Coordinates.CoordinatesXZ, Builder<C>> {
 
         private boolean centerIntegers = false;
 
diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec3Argument.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec3Argument.java
index 4a213452d..e707ebf72 100644
--- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec3Argument.java
+++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/argument/server/Vec3Argument.java
@@ -185,7 +185,7 @@ public boolean centerIntegers() {
      * @param <C> sender type
      * @since 1.5.0
      */
-    public static final class Builder<C> extends TypedBuilder<C, Coordinates, Builder<C>> {
+    public static final class Builder<C> extends CommandArgument.Builder<C, Coordinates, Builder<C>> {
 
         private boolean centerIntegers = false;
 
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index e69de29bb..000000000