Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
#	src/main/java/cc/polyfrost/oneconfig/gui/animations/EaseInOutQuad.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
#	src/main/java/cc/polyfrost/oneconfig/lwjgl/image/ImageLoader.java
#	src/main/java/cc/polyfrost/oneconfig/utils/GuiUtils.java
#	src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/Command.java
#	src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/ArgumentParser.java

6 files changed, 61 insertions, 5 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/ArgumentParser.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/ArgumentParser.java
index 61d1e07..8bf811b 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/ArgumentParser.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/ArgumentParser.java
@@ -3,12 +3,36 @@ package cc.polyfrost.oneconfig.utils.commands.arguments;
 import com.google.common.reflect.TypeToken;
 import org.jetbrains.annotations.Nullable;
 
-@SuppressWarnings("unstable")
+import java.lang.reflect.Parameter;
+import java.util.Collections;
+import java.util.List;
+
+@SuppressWarnings("UnstableApiUsage")
 public abstract class ArgumentParser<T> {
     private final TypeToken<T> type = new TypeToken<T>(getClass()) {
     };
     public final Class<?> typeClass = type.getRawType();
 
+    /**
+     * Parses the given string into an object of the type specified by this parser.
+     * Should return null if the string cannot be parsed.
+     *
+     * @param arguments The string to parse.
+     * @return The parsed object, or null if the string cannot be parsed.
+     */
     @Nullable
     public abstract T parse(Arguments arguments);
+
+    /**
+     * Returns possible completions for the given arguments.
+     * Should return an empty list or null if no completions are possible.
+     *
+     * @param arguments The arguments to complete.
+     * @param parameter The parameter to complete.
+     * @return A list of possible completions, or an empty list or null if no completions are possible.
+     */
+    @Nullable
+    public List<String> complete(Arguments arguments, Parameter parameter) {
+        return Collections.emptyList();
+    }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/Arguments.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/Arguments.java
index 74a0840..f35cf46 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/Arguments.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/Arguments.java
@@ -1,9 +1,9 @@
 package cc.polyfrost.oneconfig.utils.commands.arguments;
 
 public class Arguments {
-    private int position = 0;
     public final String[] args;
     public final boolean greedy;
+    private int position = 0;
 
     public Arguments(String[] args, boolean greedy) {
         this.args = args;
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/BooleanParser.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/BooleanParser.java
index dfdca2d..7411cbe 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/BooleanParser.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/BooleanParser.java
@@ -1,11 +1,31 @@
 package cc.polyfrost.oneconfig.utils.commands.arguments;
 
+import com.google.common.collect.Lists;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Parameter;
+import java.util.List;
+import java.util.Locale;
+
 public class BooleanParser extends ArgumentParser<Boolean> {
 
+    private static final List<String> VALUES = Lists.newArrayList("true", "false");
+
     @Override
     public @Nullable Boolean parse(Arguments arguments) {
         return Boolean.parseBoolean(arguments.poll());
     }
+
+    @Override
+    public @Nullable List<String> complete(Arguments arguments, Parameter parameter) {
+        String value = arguments.poll();
+        if (value != null && !value.trim().isEmpty()) {
+            for (String v : VALUES) {
+                if (v.startsWith(value.toLowerCase(Locale.ENGLISH))) {
+                    return Lists.newArrayList(v);
+                }
+            }
+        }
+        return VALUES;
+    }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/DoubleParser.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/DoubleParser.java
index 8c85849..4379e3a 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/DoubleParser.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/DoubleParser.java
@@ -5,6 +5,10 @@ import org.jetbrains.annotations.Nullable;
 public class DoubleParser extends ArgumentParser<Double> {
     @Override
     public @Nullable Double parse(Arguments arguments) {
-        return Double.parseDouble(arguments.poll());
+        try {
+            return Double.parseDouble(arguments.poll());
+        } catch (NumberFormatException e) {
+            return null;
+        }
     }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/FloatParser.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/FloatParser.java
index 7053fcb..08e0a45 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/FloatParser.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/FloatParser.java
@@ -6,6 +6,10 @@ public class FloatParser extends ArgumentParser<Float> {
 
     @Override
     public @Nullable Float parse(Arguments arguments) {
-        return Float.parseFloat(arguments.poll());
+        try {
+            return Float.parseFloat(arguments.poll());
+        } catch (NumberFormatException e) {
+            return null;
+        }
     }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/IntegerParser.java b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/IntegerParser.java
index 6910d4b..89f4eca 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/IntegerParser.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/IntegerParser.java
@@ -3,6 +3,10 @@ package cc.polyfrost.oneconfig.utils.commands.arguments;
 public class IntegerParser extends ArgumentParser<Integer> {
     @Override
     public Integer parse(Arguments arguments) {
-        return Integer.parseInt(arguments.poll());
+        try {
+            return Integer.parseInt(arguments.poll());
+        } catch (NumberFormatException e) {
+            return null;
+        }
     }
 }