core: Allow attaching a default description to arguments

cloud-core/src/main/java/cloud/commandframework/Command.java

@@ -573,7 +573,7 @@ public class Command<C> {
          * @return New builder instance with the command argument inserted into the argument list
          */
         public <T> @NonNull Builder<C> argument(final CommandArgument.@NonNull Builder<C, T> builder) {
-            return this.argument(builder.build(), ArgumentDescription.empty());
+            return this.argument(builder.build());
         }
 
         /**
@@ -584,7 +584,7 @@ public class Command<C> {
          * @return New builder instance with the command argument inserted into the argument list
          */
         public <T> @NonNull Builder<C> argument(final @NonNull CommandArgument<C, T> argument) {
-            return this.argument(argument, ArgumentDescription.empty());
+            return this.argument(argument, argument.getDefaultDescription());
         }
 
         /**

cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.Command;
 import cloud.commandframework.CommandManager;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
@@ -99,6 +100,12 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
      */
     private final Collection<BiFunction<@NonNull CommandContext<C>,
             @NonNull Queue<@NonNull String>, @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors;
+
+    /**
+     * A description that will be used when registering this argument if no override is provided.
+     */
+    private final ArgumentDescription defaultDescription;
+
     /**
      * Whether or not the argument has been used before
      */
@@ -106,6 +113,46 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
 
     private Command<C> owningCommand;
 
+    /**
+     * Construct a new command argument
+     *
+     * @param required              Whether or not the argument is required
+     * @param name                  The argument name
+     * @param parser                The argument parser
+     * @param defaultValue          Default value used when no value is provided by the command sender
+     * @param valueType             Type produced by the parser
+     * @param suggestionsProvider   Suggestions provider
+     * @param defaultDescription    Default description to use when registering
+     * @param argumentPreprocessors Argument preprocessors
+     * @since 1.4.0
+     */
+    public CommandArgument(
+            final boolean required,
+            final @NonNull String name,
+            final @NonNull ArgumentParser<C, T> parser,
+            final @NonNull String defaultValue,
+            final @NonNull TypeToken<T> valueType,
+            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>,
+                    @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors
+    ) {
+        this.required = required;
+        this.name = Objects.requireNonNull(name, "Name may not be null");
+        if (!NAME_PATTERN.asPredicate().test(name)) {
+            throw new IllegalArgumentException("Name must be alphanumeric");
+        }
+        this.parser = Objects.requireNonNull(parser, "Parser may not be null");
+        this.defaultValue = defaultValue;
+        this.valueType = valueType;
+        this.suggestionsProvider = suggestionsProvider == null
+                ? buildDefaultSuggestionsProvider(this)
+                : suggestionsProvider;
+        this.defaultDescription = Objects.requireNonNull(defaultDescription, "Default description may not be null");
+        this.argumentPreprocessors = new LinkedList<>(argumentPreprocessors);
+        this.key = SimpleCloudKey.of(this.name, this.valueType);
+    }
+
     /**
      * Construct a new command argument
      *
@@ -127,19 +174,16 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
             final @NonNull Collection<@NonNull BiFunction<@NonNull CommandContext<C>, @NonNull Queue<@NonNull String>,
                     @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors
     ) {
-        this.required = required;
+        this(
-        this.name = Objects.requireNonNull(name, "Name may not be null");
+            required,
-        if (!NAME_PATTERN.asPredicate().test(name)) {
+            name,
-            throw new IllegalArgumentException("Name must be alphanumeric");
+            parser,
-        }
+            defaultValue,
-        this.parser = Objects.requireNonNull(parser, "Parser may not be null");
+            valueType,
-        this.defaultValue = defaultValue;
+            suggestionsProvider,
-        this.valueType = valueType;
+            ArgumentDescription.empty(),
-        this.suggestionsProvider = suggestionsProvider == null
+            argumentPreprocessors
-                ? buildDefaultSuggestionsProvider(this)
+        );
-                : suggestionsProvider;
-        this.argumentPreprocessors = new LinkedList<>(argumentPreprocessors);
-        this.key = SimpleCloudKey.of(this.name, this.valueType);
     }
 
     /**
@@ -163,6 +207,30 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
         this(required, name, parser, defaultValue, valueType, suggestionsProvider, Collections.emptyList());
     }
 
+    /**
+     * Construct a new command argument
+     *
+     * @param required            Whether or not the argument is required
+     * @param name                The argument name
+     * @param parser              The argument parser
+     * @param defaultValue        Default value used when no value is provided by the command sender
+     * @param valueType           Type produced by the parser
+     * @param suggestionsProvider Suggestions provider
+     * @param defaultDescription    Default description to use when registering
+     * @since 1.4.0
+     */
+    public CommandArgument(
+            final boolean required,
+            final @NonNull String name,
+            final @NonNull ArgumentParser<C, T> parser,
+            final @NonNull String defaultValue,
+            final @NonNull TypeToken<T> valueType,
+            final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
+    ) {
+        this(required, name, parser, defaultValue, valueType, suggestionsProvider, defaultDescription, Collections.emptyList());
+    }
+
     /**
      * Construct a new command argument
      *
@@ -185,6 +253,31 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
         this(required, name, parser, defaultValue, TypeToken.get(valueType), suggestionsProvider);
     }
 
+    /**
+     * Construct a new command argument
+     *
+     * @param required            Whether or not the argument is required
+     * @param name                The argument name
+     * @param parser              The argument parser
+     * @param defaultValue        Default value used when no value is provided by the command sender
+     * @param valueType           Type produced by the parser
+     * @param suggestionsProvider Suggestions provider
+     * @param defaultDescription    Default description to use when registering
+     * @since 1.4.0
+     */
+    public CommandArgument(
+            final boolean required,
+            final @NonNull String name,
+            final @NonNull ArgumentParser<C, T> parser,
+            final @NonNull String defaultValue,
+            final @NonNull Class<T> valueType,
+            final @Nullable BiFunction<@NonNull CommandContext<C>,
+                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
+    ) {
+        this(required, name, parser, defaultValue, TypeToken.get(valueType), suggestionsProvider, defaultDescription);
+    }
+
     /**
      * Construct a new command argument
      *
@@ -351,6 +444,15 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
         return this.suggestionsProvider;
     }
 
+    /**
+     * Get the default description to use when registering and no other is provided.
+     *
+     * @return the default description
+     */
+    public final @NonNull ArgumentDescription getDefaultDescription() {
+        return this.defaultDescription;
+    }
+
     @Override
     public final boolean equals(final Object o) {
         if (this == o) {
@@ -429,6 +531,8 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
         } else {
             builder = builder.asOptionalWithDefault(this.defaultValue);
         }
+        builder = builder.withDefaultDescription(this.defaultDescription);
+
         return builder.build();
     }
 
@@ -465,6 +569,7 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
         private ArgumentParser<C, T> parser;
         private String defaultValue = "";
         private BiFunction<@NonNull CommandContext<C>, @NonNull String, @NonNull List<String>> suggestionsProvider;
+        private @NonNull ArgumentDescription defaultDescription = ArgumentDescription.empty();
 
         private final Collection<BiFunction<@NonNull CommandContext<C>,
                 @NonNull String, @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors = new LinkedList<>();
@@ -565,6 +670,22 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
             return this;
         }
 
+        /**
+         * Set the default description to be used for this argument.
+         *
+         * <p>The default description is used when no other description is provided for a certain argument.</p>
+         *
+         * @param defaultDescription The default description
+         * @return Builder instance
+         * @since 1.4.0
+         */
+        public @NonNull Builder<@NonNull C, @NonNull T> withDefaultDescription(
+                final @NonNull ArgumentDescription defaultDescription
+        ) {
+            this.defaultDescription = Objects.requireNonNull(defaultDescription, "Default description may not be null");
+            return this;
+        }
+
         /**
          * Construct a command argument from the builder settings
          *
@@ -588,7 +709,8 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
                     this.parser,
                     this.defaultValue,
                     this.valueType,
-                    this.suggestionsProvider
+                    this.suggestionsProvider,
+                    this.defaultDescription
             );
         }
 
@@ -613,6 +735,10 @@ public class CommandArgument<C, T> implements Comparable<CommandArgument<?, ?>>,
             return this.suggestionsProvider;
         }
 
+        protected final @NonNull ArgumentDescription getDefaultDescription() {
+            return this.defaultDescription;
+        }
+
     }
 
 }

cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -50,9 +51,10 @@ public final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
             final boolean liberal,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription description
     ) {
-        super(required, name, new BooleanParser<>(liberal), defaultValue, Boolean.class, suggestionsProvider);
+        super(required, name, new BooleanParser<>(liberal), defaultValue, Boolean.class, suggestionsProvider, description);
         this.liberal = liberal;
     }
 
@@ -110,7 +112,7 @@ public final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
      * @return Liberal boolean
      */
     public boolean isLiberal() {
-        return liberal;
+        return this.liberal;
     }
 
     public static final class Builder<C> extends CommandArgument.Builder<C, Boolean> {
@@ -144,7 +146,8 @@ public final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
                     this.getName(),
                     this.liberal,
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -49,9 +50,10 @@ public final class ByteArgument<C> extends CommandArgument<C, Byte> {
             final byte max,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new ByteParser<>(min, max), defaultValue, Byte.class, suggestionsProvider);
+        super(required, name, new ByteParser<>(min, max), defaultValue, Byte.class, suggestionsProvider, defaultDescription);
         this.min = min;
         this.max = max;
     }
@@ -161,7 +163,7 @@ public final class ByteArgument<C> extends CommandArgument<C, Byte> {
         @Override
         public @NonNull ByteArgument<C> build() {
             return new ByteArgument<>(this.isRequired(), this.getName(), this.min, this.max,
-                    this.getDefaultValue(), this.getSuggestionsProvider()
+                    this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -46,9 +47,10 @@ public final class CharArgument<C> extends CommandArgument<C, Character> {
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>,
-                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
         ) {
-        super(required, name, new CharacterParser<>(), defaultValue, Character.class, suggestionsProvider);
+        super(required, name, new CharacterParser<>(), defaultValue, Character.class, suggestionsProvider, defaultDescription);
     }
 
     /**
@@ -114,7 +116,7 @@ public final class CharArgument<C> extends CommandArgument<C, Character> {
         @Override
         public @NonNull CharArgument<C> build() {
             return new CharArgument<>(this.isRequired(), this.getName(),
-                    this.getDefaultValue(), this.getSuggestionsProvider()
+                    this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -49,9 +50,10 @@ public final class DoubleArgument<C> extends CommandArgument<C, Double> {
             final double max,
             final String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new DoubleParser<>(min, max), defaultValue, Double.class, suggestionsProvider);
+        super(required, name, new DoubleParser<>(min, max), defaultValue, Double.class, suggestionsProvider, defaultDescription);
         this.min = min;
         this.max = max;
     }
@@ -161,7 +163,7 @@ public final class DoubleArgument<C> extends CommandArgument<C, Double> {
         @Override
         public @NonNull DoubleArgument<C> build() {
             return new DoubleArgument<>(this.isRequired(), this.getName(), this.min, this.max,
-                    this.getDefaultValue(), this.getSuggestionsProvider()
+                    this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -55,9 +56,10 @@ public class EnumArgument<C, E extends Enum<E>> extends CommandArgument<C, E> {
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new EnumParser<>(enumClass), defaultValue, enumClass, suggestionsProvider);
+        super(required, name, new EnumParser<>(enumClass), defaultValue, enumClass, suggestionsProvider, defaultDescription);
     }
 
     /**
@@ -139,7 +141,7 @@ public class EnumArgument<C, E extends Enum<E>> extends CommandArgument<C, E> {
         @Override
         public @NonNull CommandArgument<C, E> build() {
             return new EnumArgument<>(this.enumClass, this.isRequired(), this.getName(),
-                    this.getDefaultValue(), this.getSuggestionsProvider()
+                    this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -49,9 +50,10 @@ public final class FloatArgument<C> extends CommandArgument<C, Float> {
             final float max,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>,
-                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new FloatParser<>(min, max), defaultValue, Float.class, suggestionsProvider);
+        super(required, name, new FloatParser<>(min, max), defaultValue, Float.class, suggestionsProvider, defaultDescription);
         this.min = min;
         this.max = max;
     }
@@ -161,7 +163,7 @@ public final class FloatArgument<C> extends CommandArgument<C, Float> {
         @Override
         public @NonNull FloatArgument<C> build() {
             return new FloatArgument<>(this.isRequired(), this.getName(), this.min, this.max,
-                    this.getDefaultValue(), this.getSuggestionsProvider()
+                    this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -56,9 +57,10 @@ public final class IntegerArgument<C> extends CommandArgument<C, Integer> {
             final int max,
             final String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new IntegerParser<>(min, max), defaultValue, Integer.class, suggestionsProvider);
+        super(required, name, new IntegerParser<>(min, max), defaultValue, Integer.class, suggestionsProvider, defaultDescription);
         this.min = min;
         this.max = max;
     }
@@ -168,7 +170,7 @@ public final class IntegerArgument<C> extends CommandArgument<C, Integer> {
         @Override
         public @NonNull IntegerArgument<C> build() {
             return new IntegerArgument<>(this.isRequired(), this.getName(), this.min, this.max,
-                    this.getDefaultValue(), this.getSuggestionsProvider()
+                    this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -49,9 +50,10 @@ public final class LongArgument<C> extends CommandArgument<C, Long> {
             final long max,
             final String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new LongParser<>(min, max), defaultValue, Long.class, suggestionsProvider);
+        super(required, name, new LongParser<>(min, max), defaultValue, Long.class, suggestionsProvider, defaultDescription);
         this.min = min;
         this.max = max;
     }
@@ -161,7 +163,7 @@ public final class LongArgument<C> extends CommandArgument<C, Long> {
         @Override
         public @NonNull LongArgument<C> build() {
             return new LongArgument<>(this.isRequired(), this.getName(), this.min,
-                    this.max, this.getDefaultValue(), this.getSuggestionsProvider()
+                    this.max, this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -49,9 +50,10 @@ public final class ShortArgument<C> extends CommandArgument<C, Short> {
             final short max,
             final String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<String>> suggestionsProvider
+                    @NonNull List<String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new ShortParser<>(min, max), defaultValue, Short.class, suggestionsProvider);
+        super(required, name, new ShortParser<>(min, max), defaultValue, Short.class, suggestionsProvider, defaultDescription);
         this.min = min;
         this.max = max;
     }
@@ -161,7 +163,7 @@ public final class ShortArgument<C> extends CommandArgument<C, Short> {
         @Override
         public @NonNull ShortArgument<C> build() {
             return new ShortArgument<>(this.isRequired(), this.getName(), this.min, this.max,
-                    this.getDefaultValue(), this.getSuggestionsProvider()
+                    this.getDefaultValue(), this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -56,10 +57,11 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
             final @NonNull StringMode stringMode,
             final @NonNull String defaultValue,
             final @NonNull BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(required, name, new StringParser<>(stringMode, suggestionsProvider),
-                defaultValue, String.class, suggestionsProvider
+                defaultValue, String.class, suggestionsProvider, defaultDescription
         );
         this.stringMode = stringMode;
     }
@@ -265,7 +267,7 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
         @Override
         public @NonNull StringArgument<C> build() {
             return new StringArgument<>(this.isRequired(), this.getName(), this.stringMode,
-                    this.getDefaultValue(), this.suggestionsProvider
+                    this.getDefaultValue(), this.suggestionsProvider, this.getDefaultDescription()
             );
         }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArrayArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -47,7 +48,8 @@ public final class StringArrayArgument<C> extends CommandArgument<C, String[]> {
     private StringArrayArgument(
             final boolean required,
             final @NonNull String name,
-            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 StringArrayArgument<C> extends CommandArgument<C, String[]> {
                 new StringArrayParser<>(),
                 "",
                 TypeToken.get(String[].class),
-                suggestionsProvider
+                suggestionsProvider,
+                defaultDescription
         );
     }
 
@@ -74,7 +77,8 @@ public final class StringArrayArgument<C> extends CommandArgument<C, String[]> {
         return new StringArrayArgument<>(
                 true,
                 name,
-                suggestionsProvider
+                suggestionsProvider,
+                ArgumentDescription.empty()
         );
     }
 
@@ -93,7 +97,8 @@ public final class StringArrayArgument<C> extends CommandArgument<C, String[]> {
         return new StringArrayArgument<>(
                 false,
                 name,
-                suggestionsProvider
+                suggestionsProvider,
+                ArgumentDescription.empty()
         );
     }
 

cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.arguments.standard;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -47,9 +48,10 @@ public final class UUIDArgument<C> extends CommandArgument<C, UUID> {
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>,
-                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new UUIDParser<>(), defaultValue, UUID.class, suggestionsProvider);
+        super(required, name, new UUIDParser<>(), defaultValue, UUID.class, suggestionsProvider, defaultDescription);
     }
 
     /**
@@ -114,7 +116,13 @@ public final class UUIDArgument<C> extends CommandArgument<C, UUID> {
          */
         @Override
         public @NonNull UUIDArgument<C> build() {
-            return new UUIDArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
+            return new UUIDArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
+            );
         }
 
     }

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/EnchantmentArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -53,9 +54,10 @@ public class EnchantmentArgument<C> extends CommandArgument<C, Enchantment> {
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
             ) {
-        super(required, name, new EnchantmentParser<>(), defaultValue, Enchantment.class, suggestionsProvider);
+        super(required, name, new EnchantmentParser<>(), defaultValue, Enchantment.class, suggestionsProvider, defaultDescription);
     }
 
     /**
@@ -118,7 +120,8 @@ public class EnchantmentArgument<C> extends CommandArgument<C, Enchantment> {
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -52,7 +53,8 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
             ) {
         super(required, name, new MaterialParser<>(), defaultValue, Material.class, suggestionsProvider);
     }
@@ -117,7 +119,8 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
             );
         }
 

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -58,9 +59,18 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new OfflinePlayerParser<>(), defaultValue, OfflinePlayer.class, suggestionsProvider);
+        super(
+                required,
+                name,
+                new OfflinePlayerParser<>(),
+                defaultValue,
+                OfflinePlayer.class,
+                suggestionsProvider,
+                defaultDescription
+        );
     }
 
     /**
@@ -126,7 +136,7 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
         @Override
         public @NonNull OfflinePlayerArgument<C> build() {
             return new OfflinePlayerArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -54,9 +55,10 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new PlayerParser<>(), defaultValue, Player.class, suggestionsProvider);
+        super(required, name, new PlayerParser<>(), defaultValue, Player.class, suggestionsProvider, defaultDescription);
     }
 
     /**
@@ -121,7 +123,13 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
          */
         @Override
         public @NonNull PlayerArgument<C> build() {
-            return new PlayerArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
+            return new PlayerArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
+            );
         }
 
     }

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -52,9 +53,10 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
             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 WorldParser<>(), defaultValue, World.class, suggestionsProvider);
+        super(required, name, new WorldParser<>(), defaultValue, World.class, suggestionsProvider, defaultDescription);
     }
 
     /**
@@ -114,7 +116,13 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
 
         @Override
         public @NonNull CommandArgument<C, World> build() {
-            return new WorldArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
+            return new WorldArgument<>(
+                    this.isRequired(),
+                    this.getName(),
+                    this.getDefaultValue(),
+                    this.getSuggestionsProvider(),
+                    this.getDefaultDescription()
+            );
         }
 
     }

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/Location2DArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers.location;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -57,6 +58,7 @@ public final class Location2DArgument<C> extends CommandArgument<C, Location2D>
             final boolean required,
             final @NonNull String name,
             final @NonNull String defaultValue,
+            final @NonNull ArgumentDescription defaultDescription,
             final @Nullable BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider,
             final @NonNull Collection<@NonNull BiFunction<@NonNull CommandContext<C>,
                     @NonNull Queue<@NonNull String>, @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors
@@ -68,6 +70,7 @@ public final class Location2DArgument<C> extends CommandArgument<C, Location2D>
                 defaultValue,
                 TypeToken.get(Location2D.class),
                 suggestionsProvider,
+                defaultDescription,
                 argumentPreprocessors
         );
     }
@@ -133,6 +136,7 @@ public final class Location2DArgument<C> extends CommandArgument<C, Location2D>
                     this.isRequired(),
                     this.getName(),
                     this.getDefaultValue(),
+                    this.getDefaultDescription(),
                     this.getSuggestionsProvider(),
                     new LinkedList<>()
             );

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/location/LocationArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers.location;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -63,6 +64,7 @@ public final class LocationArgument<C> extends CommandArgument<C, Location> {
             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>, @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors
     ) {
@@ -73,6 +75,7 @@ public final class LocationArgument<C> extends CommandArgument<C, Location> {
                 defaultValue,
                 TypeToken.get(Location.class),
                 suggestionsProvider,
+                defaultDescription,
                 argumentPreprocessors
         );
     }
@@ -139,6 +142,7 @@ public final class LocationArgument<C> extends CommandArgument<C, Location> {
                     this.getName(),
                     this.getDefaultValue(),
                     this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
                     new LinkedList<>()
             );
         }

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers.selector;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -47,10 +48,11 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(required, name, new MultipleEntitySelectorParser<>(), defaultValue, MultipleEntitySelector.class,
-                suggestionsProvider
+                suggestionsProvider, defaultDescription
         );
     }
 
@@ -117,7 +119,7 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
         @Override
         public @NonNull MultipleEntitySelectorArgument<C> build() {
             return new MultipleEntitySelectorArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers.selector;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -51,10 +52,11 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
         super(required, name, new MultiplePlayerSelectorParser<>(), defaultValue, MultiplePlayerSelector.class,
-                suggestionsProvider
+                suggestionsProvider, defaultDescription
         );
     }
 
@@ -121,7 +123,7 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
         @Override
         public @NonNull MultiplePlayerSelectorArgument<C> build() {
             return new MultiplePlayerSelectorArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers.selector;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -47,9 +48,18 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new SingleEntitySelectorParser<>(), defaultValue, SingleEntitySelector.class, suggestionsProvider);
+        super(
+                required,
+                name,
+                new SingleEntitySelectorParser<>(),
+                defaultValue,
+                SingleEntitySelector.class,
+                suggestionsProvider,
+                defaultDescription
+        );
     }
 
     /**
@@ -115,7 +125,7 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
         @Override
         public @NonNull SingleEntitySelectorArgument<C> build() {
             return new SingleEntitySelectorArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bukkit.parsers.selector;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -51,9 +52,18 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
             final @NonNull String name,
             final @NonNull String defaultValue,
             final @Nullable BiFunction<@NonNull CommandContext<C>, @NonNull String,
-                    @NonNull List<@NonNull String>> suggestionsProvider
+                    @NonNull List<@NonNull String>> suggestionsProvider,
+            final @NonNull ArgumentDescription defaultDescription
     ) {
-        super(required, name, new SinglePlayerSelectorParser<>(), defaultValue, SinglePlayerSelector.class, suggestionsProvider);
+        super(
+                required,
+                name,
+                new SinglePlayerSelectorParser<>(),
+                defaultValue,
+                SinglePlayerSelector.class,
+                suggestionsProvider,
+                defaultDescription
+        );
     }
 
     /**
@@ -119,7 +129,7 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
         @Override
         public @NonNull SinglePlayerSelectorArgument<C> build() {
             return new SinglePlayerSelectorArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(),
-                    this.getSuggestionsProvider()
+                    this.getSuggestionsProvider(), this.getDefaultDescription()
             );
         }
 

cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/PlayerArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bungee.arguments;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -56,6 +57,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, ProxiedPlayer> {
             final boolean required,
             final @NonNull String name,
             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>,
                     @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors
     ) {
@@ -66,6 +68,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, ProxiedPlayer> {
                 "",
                 TypeToken.get(ProxiedPlayer.class),
                 suggestionProvider,
+                defaultDescription,
                 argumentPreprocessors
         );
     }
@@ -128,6 +131,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, ProxiedPlayer> {
                     this.isRequired(),
                     this.getName(),
                     this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
                     new LinkedList<>()
             );
         }

cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/arguments/ServerArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.bungee.arguments;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -56,6 +57,7 @@ public final class ServerArgument<C> extends CommandArgument<C, ServerInfo> {
             final boolean required,
             final @NonNull String name,
             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>,
                     @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors
     ) {
@@ -66,6 +68,7 @@ public final class ServerArgument<C> extends CommandArgument<C, ServerInfo> {
                 "",
                 TypeToken.get(ServerInfo.class),
                 suggestionsProvider,
+                defaultDescription,
                 argumentPreprocessors
         );
     }
@@ -127,6 +130,7 @@ public final class ServerArgument<C> extends CommandArgument<C, ServerInfo> {
                     this.isRequired(),
                     this.getName(),
                     this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
                     new LinkedList<>()
             );
         }

cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/PlayerArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.velocity.arguments;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -56,6 +57,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
             final boolean required,
             final @NonNull String name,
             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>,
                     @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors
     ) {
@@ -66,6 +68,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
                 "",
                 TypeToken.get(Player.class),
                 suggestionsProvider,
+                defaultDescription,
                 argumentPreprocessors
         );
     }
@@ -126,6 +129,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
                     this.isRequired(),
                     this.getName(),
                     this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
                     new LinkedList<>()
             );
         }

cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/arguments/ServerArgument.java

@@ -23,6 +23,7 @@
 //
 package cloud.commandframework.velocity.arguments;
 
+import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.parser.ArgumentParseResult;
 import cloud.commandframework.arguments.parser.ArgumentParser;
@@ -56,6 +57,7 @@ public final class ServerArgument<C> extends CommandArgument<C, RegisteredServer
             final boolean required,
             final @NonNull String name,
             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>,
                     @NonNull ArgumentParseResult<Boolean>>> argumentPreprocessors
     ) {
@@ -66,6 +68,7 @@ public final class ServerArgument<C> extends CommandArgument<C, RegisteredServer
                 "",
                 TypeToken.get(RegisteredServer.class),
                 suggestionsProvider,
+                defaultDescription,
                 argumentPreprocessors
         );
     }
@@ -123,6 +126,7 @@ public final class ServerArgument<C> extends CommandArgument<C, RegisteredServer
                     this.isRequired(),
                     this.getName(),
                     this.getSuggestionsProvider(),
+                    this.getDefaultDescription(),
                     new LinkedList<>()
             );
         }