Fix arguments

vaperion · Jun 3, 2023 · e0728b6 · e0728b6
1 parent 186df4f
commit e0728b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/core/src/main/java/me/vaperion/blade/Blade.java b/core/src/main/java/me/vaperion/blade/Blade.java
@@ -57,10 +57,15 @@ private Blade(Builder builder) {
         binder.bind(UUID.class, new UUIDArgument());
         binder.bind(String.class, new StringArgument());
         binder.bind(boolean.class, new BooleanArgument());
+        binder.bind(Boolean.class, new BooleanArgument());
         binder.bind(int.class, new IntArgument());
+        binder.bind(Integer.class, new IntArgument());
         binder.bind(long.class, new LongArgument());
+        binder.bind(Long.class, new LongArgument());
         binder.bind(double.class, new DoubleArgument());
+        binder.bind(Double.class, new DoubleArgument());
         binder.bind(float.class, new FloatArgument());
+        binder.bind(Float.class, new FloatArgument());
         binder.bind(Enum.class, new EnumArgument());
 
         for (Binding<?> binding : builder.bindings) {

diff --git a/core/src/main/java/me/vaperion/blade/argument/impl/EnumArgument.java b/core/src/main/java/me/vaperion/blade/argument/impl/EnumArgument.java
@@ -18,7 +18,7 @@ public class EnumArgument implements ArgumentProvider<Enum> {
 
     @Override
     public @Nullable Enum provide(@NotNull Context ctx, @NotNull Argument arg) throws BladeExitMessage {
-        if (enumClass == null) enumClass = (Class<? extends Enum>) arg.getParameter().getType();
+        enumClass = (Class<? extends Enum>) arg.getParameter().getType();
 
         Enum value = null;
         try {
@@ -33,7 +33,7 @@ public class EnumArgument implements ArgumentProvider<Enum> {
 
     @Override
     public @NotNull List<String> suggest(@NotNull Context ctx, @NotNull Argument arg) throws BladeExitMessage {
-        if (enumClass == null) enumClass = (Class<? extends Enum>) arg.getParameter().getType();
+        enumClass = (Class<? extends Enum>) arg.getParameter().getType();
 
         String input = arg.getString().toLowerCase(Locale.ROOT);
         List<String> completions = new ArrayList<>();