From 2a4c29267c8f954a2d630ae4066749c1e4101801 Mon Sep 17 00:00:00 2001
From: broccolai <me@broccol.ai>
Date: Tue, 20 Apr 2021 23:26:16 +0100
Subject: [PATCH] Use default descriptions and others

---
 .../jda/parsers/ChannelArgument.java          | 29 ++++++++++++++++--
 .../jda/parsers/RoleArgument.java             | 18 +++++++++--
 .../jda/parsers/UserArgument.java             | 30 +++++++++++++++++--
 .../pircbotx/arguments/UserArgument.java      | 16 ++++++----
 .../bungee/arguments/PlayerArgument.java      |  4 ++-
 .../bungee/arguments/ServerArgument.java      |  4 ++-
 .../fabric/argument/AngleArgument.java        | 15 ++++++++--
 .../fabric/argument/AxisArgument.java         | 15 ++++++++--
 .../fabric/argument/ColorArgument.java        | 22 +++++++++++---
 .../fabric/argument/CompoundTagArgument.java  | 10 +++++--
 .../fabric/argument/EntityAnchorArgument.java | 10 +++++--
 .../fabric/argument/FloatRangeArgument.java   | 10 +++++--
 .../fabric/argument/IdentifierArgument.java   | 10 +++++--
 .../fabric/argument/IntRangeArgument.java     | 10 +++++--
 .../fabric/argument/ItemDataArgument.java     | 10 +++++--
 .../fabric/argument/NbtPathArgument.java      | 10 +++++--
 .../fabric/argument/NbtTagArgument.java       | 15 ++++++++--
 .../argument/ParticleEffectArgument.java      | 10 +++++--
 .../argument/RegistryEntryArgument.java       | 17 +++++++++--
 .../argument/ScoreboardCriterionArgument.java | 10 +++++--
 .../argument/ScoreboardOperationArgument.java | 10 +++++--
 .../fabric/argument/StatusEffectArgument.java | 10 +++++--
 .../fabric/argument/TeamArgument.java         | 15 ++++++++--
 .../fabric/argument/TimeArgument.java         | 15 ++++++++--
 .../argument/server/BlockPosArgument.java     | 10 +++++--
 .../argument/server/ColumnPosArgument.java    | 10 +++++--
 .../argument/server/MessageArgument.java      | 10 +++++--
 .../MultipleEntitySelectorArgument.java       | 10 +++++--
 .../MultiplePlayerSelectorArgument.java       | 10 +++++--
 .../server/SingleEntitySelectorArgument.java  | 10 +++++--
 .../server/SinglePlayerSelectorArgument.java  | 10 +++++--
 .../fabric/argument/server/Vec2Argument.java  |  6 +++-
 .../fabric/argument/server/Vec3Argument.java  |  6 +++-
 .../velocity/arguments/PlayerArgument.java    |  4 ++-
 .../velocity/arguments/ServerArgument.java    |  4 ++-
 35 files changed, 319 insertions(+), 96 deletions(-)

diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java
index e3836605..45e8f2dc 100644
--- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java
+++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.jda.parsers;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -32,12 +33,14 @@ import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Queue;
 import java.util.Set;
+import java.util.function.BiFunction;
 
 /**
  * Command Argument for {@link MessageChannel}
@@ -50,10 +53,23 @@ public final class ChannelArgument<C> extends CommandArgument<C, MessageChannel>
     private final Set<ParserMode> modes;
 
     private ChannelArgument(
-            final boolean required, final @NonNull String name,
+            final boolean required,
+            final @NonNull String name,
+            final @NonNull String defaultValue,
+            final @Nullable BiFunction<@NonNull CommandContext<C>,
+                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription,
             final @NonNull Set<ParserMode> modes
     ) {
-        super(required, name, new MessageParser<>(modes), MessageChannel.class);
+        super(
+                required,
+                name,
+                new MessageParser<>(modes),
+                defaultValue,
+                MessageChannel.class,
+                suggestionsProvider,
+                defaultDescription
+        );
         this.modes = modes;
     }
 
@@ -133,7 +149,14 @@ public final class ChannelArgument<C> extends CommandArgument<C, MessageChannel>
          */
         @Override
         public @NonNull ChannelArgument<C> build() {
-            return new ChannelArgument<>(this.isRequired(), this.getName(), this.modes);
+            return new ChannelArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
+                    this.modes
+            );
         }
 
     }
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 45d36b30..d072d922 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
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.jda.parsers;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -31,12 +32,14 @@ import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Queue;
 import java.util.Set;
+import java.util.function.BiFunction;
 
 /**
  * Command Argument for {@link net.dv8tion.jda.api.entities.Role}
@@ -51,9 +54,13 @@ public final class RoleArgument<C> extends CommandArgument<C, Role> {
     private RoleArgument(
             final boolean required,
             final @NonNull String name,
+            final @NonNull String defaultValue,
+            final @Nullable BiFunction<@NonNull CommandContext<C>,
+                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription,
             final @NonNull Set<ParserMode> modes
     ) {
-        super(required, name, new RoleParser<>(modes), Role.class);
+        super(required, name, new RoleParser<>(modes), defaultValue, Role.class, suggestionsProvider, defaultDescription);
         this.modes = modes;
     }
 
@@ -133,7 +140,14 @@ public final class RoleArgument<C> extends CommandArgument<C, Role> {
          */
         @Override
         public @NonNull RoleArgument<C> build() {
-            return new RoleArgument<>(this.isRequired(), this.getName(), this.modes);
+            return new RoleArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
+                    this.modes
+            );
         }
 
     }
diff --git a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java
index 2e1aa187..c2834407 100644
--- a/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java
+++ b/cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.jda.parsers;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -32,6 +33,7 @@ import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -39,6 +41,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Queue;
 import java.util.Set;
+import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
 /**
@@ -54,11 +57,24 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
     private final Isolation isolationLevel;
 
     private UserArgument(
-            final boolean required, final @NonNull String name,
+            final boolean required,
+            final @NonNull String name,
+            final @NonNull String defaultValue,
+            final @Nullable BiFunction<@NonNull CommandContext<C>,
+                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription,
             final @NonNull Set<ParserMode> modes,
             final @NonNull Isolation isolationLevel
     ) {
-        super(required, name, new UserParser<>(modes, isolationLevel), User.class);
+        super(
+                required,
+                name,
+                new UserParser<>(modes, isolationLevel),
+                defaultValue,
+                User.class,
+                suggestionsProvider,
+                defaultDescription
+        );
         this.modes = modes;
         this.isolationLevel = isolationLevel;
     }
@@ -167,7 +183,15 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
          */
         @Override
         public @NonNull UserArgument<C> build() {
-            return new UserArgument<>(this.isRequired(), this.getName(), this.modes, this.isolationLevel);
+            return new UserArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
+                    this.modes,
+                    this.isolationLevel
+            );
         }
 
     }
diff --git a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/arguments/UserArgument.java b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/arguments/UserArgument.java
index be343cc1..12648258 100644
--- a/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/arguments/UserArgument.java
+++ b/cloud-irc/cloud-pircbotx/src/main/java/cloud/commandframework/pircbotx/arguments/UserArgument.java
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.pircbotx.arguments;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -37,8 +38,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 import org.pircbotx.PircBotX;
 import org.pircbotx.User;
 import org.pircbotx.exception.DaoException;
-
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import java.util.function.BiFunction;
@@ -54,16 +53,19 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
     private UserArgument(
             final boolean required,
             final @NonNull String name,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @NonNull String defaultValue,
+            final @Nullable BiFunction<@NonNull CommandContext<C>,
+                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
                 name,
                 new UserArgumentParser<>(),
-                "",
+                defaultValue,
                 TypeToken.get(User.class),
                 suggestionsProvider,
-                new LinkedList<>()
+                defaultDescription
         );
     }
 
@@ -117,7 +119,9 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
             return new UserArgument<>(
                     this.isRequired(),
                     this.getName(),
-                    this.getSuggestionsProvider()
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerArgument.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerArgument.java
index 6a6b1b38..45d28cf4 100644
--- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerArgument.java
+++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerArgument.java
@@ -56,6 +56,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, ProxiedPlayer> {
     private PlayerArgument(
             final boolean required,
             final @NonNull String name,
+            final @NonNull String defaultValue,
             final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionProvider,
             final @NonNull ArgumentDescription defaultDescription,
             final @NonNull Collection<@NonNull BiFunction<@NonNull CommandContext<C>, @NonNull Queue<@NonNull String>,
@@ -65,7 +66,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, ProxiedPlayer> {
                 required,
                 name,
                 new PlayerParser<>(),
-                "",
+                defaultValue,
                 TypeToken.get(ProxiedPlayer.class),
                 suggestionProvider,
                 defaultDescription,
@@ -130,6 +131,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, ProxiedPlayer> {
             return new PlayerArgument<>(
                     this.isRequired(),
                     this.getName(),
+                    this.getDefaultValue(),
                     this.getSuggestionsProvider(),
                     this.getDefaultDescription(),
                     new LinkedList<>()
diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerArgument.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerArgument.java
index 08ab3ce9..59a6b6da 100644
--- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerArgument.java
+++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerArgument.java
@@ -56,6 +56,7 @@ public final class ServerArgument<C> extends CommandArgument<C, ServerInfo> {
     private ServerArgument(
             final boolean required,
             final @NonNull String name,
+            final @NonNull String defaultValue,
             final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
             final @NonNull ArgumentDescription defaultDescription,
             final @NonNull Collection<@NonNull BiFunction<@NonNull CommandContext<C>, @NonNull Queue<@NonNull String>,
@@ -65,7 +66,7 @@ public final class ServerArgument<C> extends CommandArgument<C, ServerInfo> {
                 required,
                 name,
                 new ServerParser<>(),
-                "",
+                defaultValue,
                 TypeToken.get(ServerInfo.class),
                 suggestionsProvider,
                 defaultDescription,
@@ -129,6 +130,7 @@ public final class ServerArgument<C> extends CommandArgument<C, ServerInfo> {
             return new ServerArgument<>(
                     this.isRequired(),
                     this.getName(),
+                    this.getDefaultValue(),
                     this.getSuggestionsProvider(),
                     this.getDefaultDescription(),
                     new LinkedList<>()
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 77b06f2f..815fa46c 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -46,7 +47,8 @@ public final class AngleArgument<C> extends CommandArgument<C, AngleArgumentType
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -54,7 +56,8 @@ public final class AngleArgument<C> extends CommandArgument<C, AngleArgumentType
                 new WrappedBrigadierParser<>(AngleArgumentType.angle()),
                 defaultValue,
                 AngleArgumentType.Angle.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -131,7 +134,13 @@ public final class AngleArgument<C> extends CommandArgument<C, AngleArgumentType
          */
         @Override
         public @NonNull AngleArgument<C> build() {
-            return new AngleArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
+            return new AngleArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
+            );
         }
 
     }
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 5d5a751c..f8d8029e 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -53,7 +54,8 @@ public final class AxisArgument<C> extends CommandArgument<C, EnumSet<Direction.
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -61,7 +63,8 @@ public final class AxisArgument<C> extends CommandArgument<C, EnumSet<Direction.
                 new WrappedBrigadierParser<>(SwizzleArgumentType.swizzle()),
                 defaultValue,
                 TYPE,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -142,7 +145,13 @@ public final class AxisArgument<C> extends CommandArgument<C, EnumSet<Direction.
          */
         @Override
         public @NonNull AxisArgument<C> build() {
-            return new AxisArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
+            return new AxisArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
+            );
         }
 
     }
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 f5695dec..9cddbb71 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -47,10 +48,17 @@ public final class ColorArgument<C> extends CommandArgument<C, Formatting> {
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new WrappedBrigadierParser<>(ColorArgumentType.color()), defaultValue, Formatting.class,
-                suggestionsProvider
+        super(
+                required,
+                name,
+                new WrappedBrigadierParser<>(ColorArgumentType.color()),
+                defaultValue,
+                Formatting.class,
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -130,7 +138,13 @@ public final class ColorArgument<C> extends CommandArgument<C, Formatting> {
          */
         @Override
         public @NonNull ColorArgument<C> build() {
-            return new ColorArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
+            return new ColorArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
+            );
         }
 
     }
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 0f497642..2c8112ce 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -47,7 +48,8 @@ public final class CompoundTagArgument<C> extends CommandArgument<C, CompoundTag
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -55,7 +57,8 @@ public final class CompoundTagArgument<C> extends CommandArgument<C, CompoundTag
                 new WrappedBrigadierParser<>(NbtCompoundTagArgumentType.nbtCompound()),
                 defaultValue,
                 CompoundTag.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -136,7 +139,8 @@ public final class CompoundTagArgument<C> extends CommandArgument<C, CompoundTag
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 7cb47ad5..3cf3630e 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -46,7 +47,8 @@ public final class EntityAnchorArgument<C> extends CommandArgument<C, EntityAnch
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -54,7 +56,8 @@ public final class EntityAnchorArgument<C> extends CommandArgument<C, EntityAnch
                 new WrappedBrigadierParser<>(EntityAnchorArgumentType.entityAnchor()),
                 defaultValue,
                 EntityAnchorArgumentType.EntityAnchor.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -135,7 +138,8 @@ public final class EntityAnchorArgument<C> extends CommandArgument<C, EntityAnch
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 e4a2b1f1..7de83d83 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -48,7 +49,8 @@ public final class FloatRangeArgument<C> extends CommandArgument<C, NumberRange.
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -56,7 +58,8 @@ public final class FloatRangeArgument<C> extends CommandArgument<C, NumberRange.
                 new WrappedBrigadierParser<>(NumberRangeArgumentType.method_30918()),
                 defaultValue,
                 NumberRange.FloatRange.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -146,7 +149,8 @@ public final class FloatRangeArgument<C> extends CommandArgument<C, NumberRange.
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 c43a76cd..1a5c17ab 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -47,7 +48,8 @@ public final class IdentifierArgument<C> extends CommandArgument<C, Identifier>
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -55,7 +57,8 @@ public final class IdentifierArgument<C> extends CommandArgument<C, Identifier>
                 new WrappedBrigadierParser<>(IdentifierArgumentType.identifier()),
                 defaultValue,
                 Identifier.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -136,7 +139,8 @@ public final class IdentifierArgument<C> extends CommandArgument<C, Identifier>
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 d8f5577f..3ade9b6c 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -48,7 +49,8 @@ public final class IntRangeArgument<C> extends CommandArgument<C, NumberRange.In
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -56,7 +58,8 @@ public final class IntRangeArgument<C> extends CommandArgument<C, NumberRange.In
                 new WrappedBrigadierParser<>(NumberRangeArgumentType.numberRange()),
                 defaultValue,
                 NumberRange.IntRange.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -146,7 +149,8 @@ public final class IntRangeArgument<C> extends CommandArgument<C, NumberRange.In
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 57384946..5939be6c 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -49,7 +50,8 @@ public final class ItemDataArgument<C> extends CommandArgument<C, ItemStackArgum
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -57,7 +59,8 @@ public final class ItemDataArgument<C> extends CommandArgument<C, ItemStackArgum
                 new WrappedBrigadierParser<>(ItemStackArgumentType.itemStack()),
                 defaultValue,
                 ItemStackArgument.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -143,7 +146,8 @@ public final class ItemDataArgument<C> extends CommandArgument<C, ItemStackArgum
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 eed4a009..d67e0ab2 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -46,7 +47,8 @@ public final class NbtPathArgument<C> extends CommandArgument<C, NbtPathArgument
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -54,7 +56,8 @@ public final class NbtPathArgument<C> extends CommandArgument<C, NbtPathArgument
                 new WrappedBrigadierParser<>(NbtPathArgumentType.nbtPath()),
                 defaultValue,
                 NbtPathArgumentType.NbtPath.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -135,7 +138,8 @@ public final class NbtPathArgument<C> extends CommandArgument<C, NbtPathArgument
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 229f9f5b..e5b762ec 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -47,7 +48,8 @@ public final class NbtTagArgument<C> extends CommandArgument<C, Tag> {
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -55,7 +57,8 @@ public final class NbtTagArgument<C> extends CommandArgument<C, Tag> {
                 new WrappedBrigadierParser<>(NbtTagArgumentType.nbtTag()),
                 defaultValue,
                 Tag.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -132,7 +135,13 @@ public final class NbtTagArgument<C> extends CommandArgument<C, Tag> {
          */
         @Override
         public @NonNull NbtTagArgument<C> build() {
-            return new NbtTagArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
+            return new NbtTagArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
+            );
         }
 
     }
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 f47f2d04..73db02af 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -47,7 +48,8 @@ public final class ParticleEffectArgument<C> extends CommandArgument<C, Particle
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -55,7 +57,8 @@ public final class ParticleEffectArgument<C> extends CommandArgument<C, Particle
                 new WrappedBrigadierParser<>(ParticleArgumentType.particle()),
                 defaultValue,
                 ParticleEffect.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -136,7 +139,8 @@ public final class ParticleEffectArgument<C> extends CommandArgument<C, Particle
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 e43f94bb..ca24adc3 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -70,9 +71,18 @@ public class RegistryEntryArgument<C, V> extends CommandArgument<C, V> {
             final @NonNull RegistryKey<? extends Registry<V>> registry,
             final @NonNull String defaultValue,
             final @NonNull TypeToken<V> valueType,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new RegistryEntryParser<>(registry), defaultValue, valueType, suggestionsProvider);
+        super(
+                required,
+                name,
+                new RegistryEntryParser<>(registry),
+                defaultValue,
+                valueType,
+                suggestionsProvider,
+                defaultDescription
+        );
     }
 
     /**
@@ -312,7 +322,8 @@ public class RegistryEntryArgument<C, V> extends CommandArgument<C, V> {
                     this.registryIdent,
                     this.getDefaultValue(),
                     this.getValueType(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 b58f7d3d..b58859a3 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -47,7 +48,8 @@ public final class ScoreboardCriterionArgument<C> extends CommandArgument<C, Sco
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -55,7 +57,8 @@ public final class ScoreboardCriterionArgument<C> extends CommandArgument<C, Sco
                 new WrappedBrigadierParser<>(ObjectiveCriteriaArgumentType.objectiveCriteria()),
                 defaultValue,
                 ScoreboardCriterion.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -136,7 +139,8 @@ public final class ScoreboardCriterionArgument<C> extends CommandArgument<C, Sco
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 57151574..dd8d5c16 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -49,7 +50,8 @@ public final class ScoreboardOperationArgument<C> extends CommandArgument<C, Ope
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -57,7 +59,8 @@ public final class ScoreboardOperationArgument<C> extends CommandArgument<C, Ope
                 new WrappedBrigadierParser<>(OperationArgumentType.operation()),
                 defaultValue,
                 Operation.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -121,7 +124,8 @@ public final class ScoreboardOperationArgument<C> extends CommandArgument<C, Ope
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 2491ac7d..10fb4ab7 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.brigadier.argument.WrappedBrigadierParser;
 import cloud.commandframework.context.CommandContext;
@@ -48,7 +49,8 @@ public final class StatusEffectArgument<C> extends CommandArgument<C, StatusEffe
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -56,7 +58,8 @@ public final class StatusEffectArgument<C> extends CommandArgument<C, StatusEffe
                 new WrappedBrigadierParser<>(MobEffectArgumentType.mobEffect()),
                 defaultValue,
                 StatusEffect.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -139,7 +142,8 @@ public final class StatusEffectArgument<C> extends CommandArgument<C, StatusEffe
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 6bd85035..b3421d74 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.captions.CaptionVariable;
@@ -57,7 +58,8 @@ public final class TeamArgument<C> extends CommandArgument<C, Team> {
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -65,7 +67,8 @@ public final class TeamArgument<C> extends CommandArgument<C, Team> {
                 new TeamParser<>(),
                 defaultValue,
                 Team.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -197,7 +200,13 @@ public final class TeamArgument<C> extends CommandArgument<C, Team> {
          */
         @Override
         public @NonNull TeamArgument<C> build() {
-            return new TeamArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
+            return new TeamArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
+            );
         }
 
     }
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 60af1b46..8d5061ac 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.data.MinecraftTime;
@@ -45,7 +46,8 @@ public final class TimeArgument<C> extends CommandArgument<C, MinecraftTime> {
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -53,7 +55,8 @@ public final class TimeArgument<C> extends CommandArgument<C, MinecraftTime> {
                 FabricArgumentParsers.time(),
                 defaultValue,
                 MinecraftTime.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -130,7 +133,13 @@ public final class TimeArgument<C> extends CommandArgument<C, MinecraftTime> {
          */
         @Override
         public @NonNull TimeArgument<C> build() {
-            return new TimeArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
+            return new TimeArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
+            );
         }
 
     }
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 ac4238c4..661890f6 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
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.fabric.argument.server;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.argument.FabricArgumentParsers;
@@ -46,7 +47,8 @@ public final class BlockPosArgument<C> extends CommandArgument<C, BlockCoordinat
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -54,7 +56,8 @@ public final class BlockPosArgument<C> extends CommandArgument<C, BlockCoordinat
                 FabricArgumentParsers.blockPos(),
                 defaultValue,
                 BlockCoordinates.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -142,7 +145,8 @@ public final class BlockPosArgument<C> extends CommandArgument<C, BlockCoordinat
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 9a2c53b3..e928cfe6 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
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.fabric.argument.server;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.argument.FabricArgumentParsers;
@@ -46,7 +47,8 @@ public final class ColumnPosArgument<C> extends CommandArgument<C, ColumnCoordin
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -54,7 +56,8 @@ public final class ColumnPosArgument<C> extends CommandArgument<C, ColumnCoordin
                 FabricArgumentParsers.columnPos(),
                 defaultValue,
                 ColumnCoordinates.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -141,7 +144,8 @@ public final class ColumnPosArgument<C> extends CommandArgument<C, ColumnCoordin
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 77545c23..6c815fbb 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
@@ -24,6 +24,7 @@
 
 package cloud.commandframework.fabric.argument.server;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.argument.FabricArgumentParsers;
@@ -46,7 +47,8 @@ public final class MessageArgument<C> extends CommandArgument<C, Message> {
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -54,7 +56,8 @@ public final class MessageArgument<C> extends CommandArgument<C, Message> {
                 FabricArgumentParsers.message(),
                 defaultValue,
                 Message.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -135,7 +138,8 @@ public final class MessageArgument<C> extends CommandArgument<C, Message> {
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 84cc6845..aec07db1 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
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.fabric.argument.server;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.argument.FabricArgumentParsers;
@@ -45,7 +46,8 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -53,7 +55,8 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
                 FabricArgumentParsers.multipleEntitySelector(),
                 defaultValue,
                 MultipleEntitySelector.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -117,7 +120,8 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 3daaa701..f5276fb9 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
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.fabric.argument.server;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.argument.FabricArgumentParsers;
@@ -45,7 +46,8 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -53,7 +55,8 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
                 FabricArgumentParsers.multiplePlayerSelector(),
                 defaultValue,
                 MultiplePlayerSelector.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -117,7 +120,8 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 42f7719b..db147496 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
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.fabric.argument.server;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.argument.FabricArgumentParsers;
@@ -45,7 +46,8 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -53,7 +55,8 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
                 FabricArgumentParsers.singleEntitySelector(),
                 defaultValue,
                 SingleEntitySelector.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -117,7 +120,8 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 c283706e..cd2961d0 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
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.fabric.argument.server;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.argument.FabricArgumentParsers;
@@ -45,7 +46,8 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
-            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(
                 required,
@@ -53,7 +55,8 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
                 FabricArgumentParsers.singlePlayerSelector(),
                 defaultValue,
                 SinglePlayerSelector.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -117,7 +120,8 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 
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 2c67d95e..6a78fbff 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
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.fabric.argument.server;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.argument.FabricArgumentParsers;
@@ -49,6 +50,7 @@ public final class Vec2Argument<C> extends CommandArgument<C, Coordinates.Coordi
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription,
             final boolean centerIntegers
     ) {
         super(
@@ -57,7 +59,8 @@ public final class Vec2Argument<C> extends CommandArgument<C, Coordinates.Coordi
                 FabricArgumentParsers.vec2(centerIntegers),
                 defaultValue,
                 Coordinates.CoordinatesXZ.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
         this.centerIntegers = centerIntegers;
     }
@@ -227,6 +230,7 @@ public final class Vec2Argument<C> extends CommandArgument<C, Coordinates.Coordi
                     this.getName(),
                     this.getDefaultValue(),
                     this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
                     this.centerIntegers()
             );
         }
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 4a213452..3ee103d7 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
@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.fabric.argument.server;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.context.CommandContext;
 import cloud.commandframework.fabric.argument.FabricArgumentParsers;
@@ -49,6 +50,7 @@ public final class Vec3Argument<C> extends CommandArgument<C, Coordinates> {
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription,
             final boolean centerIntegers
     ) {
         super(
@@ -57,7 +59,8 @@ public final class Vec3Argument<C> extends CommandArgument<C, Coordinates> {
                 FabricArgumentParsers.vec3(centerIntegers),
                 defaultValue,
                 Coordinates.class,
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
         this.centerIntegers = centerIntegers;
     }
@@ -228,6 +231,7 @@ public final class Vec3Argument<C> extends CommandArgument<C, Coordinates> {
                     this.getName(),
                     this.getDefaultValue(),
                     this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
                     this.centerIntegers()
             );
         }
diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerArgument.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerArgument.java
index e9f35995..ab9be8bf 100644
--- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerArgument.java
+++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerArgument.java
@@ -56,6 +56,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
     private PlayerArgument(
             final boolean required,
             final @NonNull String name,
+            final @NonNull String defaultValue,
             final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
             final @NonNull ArgumentDescription defaultDescription,
             final @NonNull Collection<@NonNull BiFunction<@NonNull CommandContext<C>, @NonNull Queue<@NonNull String>,
@@ -65,7 +66,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
                 required,
                 name,
                 new PlayerParser<>(),
-                "",
+                defaultValue,
                 TypeToken.get(Player.class),
                 suggestionsProvider,
                 defaultDescription,
@@ -128,6 +129,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
             return new PlayerArgument<>(
                     this.isRequired(),
                     this.getName(),
+                    this.getDefaultValue(),
                     this.getSuggestionsProvider(),
                     this.getDefaultDescription(),
                     new LinkedList<>()
diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerArgument.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerArgument.java
index 982b0626..7623cf4c 100644
--- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerArgument.java
+++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerArgument.java
@@ -56,6 +56,7 @@ public final class ServerArgument<C> extends CommandArgument<C, RegisteredServer
     private ServerArgument(
             final boolean required,
             final @NonNull String name,
+            final @NonNull String defaultValue,
             final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
             final @NonNull ArgumentDescription defaultDescription,
             final @NonNull Collection<@NonNull BiFunction<@NonNull CommandContext<C>, @NonNull Queue<@NonNull String>,
@@ -65,7 +66,7 @@ public final class ServerArgument<C> extends CommandArgument<C, RegisteredServer
                 required,
                 name,
                 new ServerParser<>(),
-                "",
+                defaultValue,
                 TypeToken.get(RegisteredServer.class),
                 suggestionsProvider,
                 defaultDescription,
@@ -125,6 +126,7 @@ public final class ServerArgument<C> extends CommandArgument<C, RegisteredServer
             return new ServerArgument<>(
                     this.isRequired(),
                     this.getName(),
+                    this.getDefaultValue(),
                     this.getSuggestionsProvider(),
                     this.getDefaultDescription(),
                     new LinkedList<>()