From c25a923f3a440d004db099acb0e00d83b41cd23b Mon Sep 17 00:00:00 2001
From: Bella <bella.who.two@gmail.com>
Date: Sun, 10 May 2020 14:05:36 -0400
Subject: [PATCH] Switched 4 commands to EnumParser for cleaner autocomplete,
 close #801

---
 .../me/zeroeightsix/kami/command/commands/BindCommand.java     | 3 ++-
 .../java/me/zeroeightsix/kami/command/commands/MacroCommand.kt | 3 ++-
 .../java/me/zeroeightsix/kami/command/commands/SetCommand.java | 3 ++-
 .../me/zeroeightsix/kami/command/commands/XRayCommand.java     | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/BindCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/BindCommand.java
index 2f2ff78a0..4865c1b1c 100644
--- a/src/main/java/me/zeroeightsix/kami/command/commands/BindCommand.java
+++ b/src/main/java/me/zeroeightsix/kami/command/commands/BindCommand.java
@@ -2,6 +2,7 @@ package me.zeroeightsix.kami.command.commands;
 
 import me.zeroeightsix.kami.command.Command;
 import me.zeroeightsix.kami.command.syntax.ChunkBuilder;
+import me.zeroeightsix.kami.command.syntax.parsers.EnumParser;
 import me.zeroeightsix.kami.command.syntax.parsers.ModuleParser;
 import me.zeroeightsix.kami.module.Module;
 import me.zeroeightsix.kami.module.ModuleManager;
@@ -23,7 +24,7 @@ public class BindCommand extends Command {
     public BindCommand() {
         super("bind", new ChunkBuilder()
                 .append("[module]|modifiers", true, new ModuleParser())
-                .append("[key]|[on|off]", true)
+                .append("state", true, new EnumParser(new String[]{"key", "on", "off"}))
                 .build()
         );
         setDescription("Binds a module to a key, or allows you to change modifier options");
diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/MacroCommand.kt b/src/main/java/me/zeroeightsix/kami/command/commands/MacroCommand.kt
index 004a9ecf3..590eb66cf 100644
--- a/src/main/java/me/zeroeightsix/kami/command/commands/MacroCommand.kt
+++ b/src/main/java/me/zeroeightsix/kami/command/commands/MacroCommand.kt
@@ -2,6 +2,7 @@ package me.zeroeightsix.kami.command.commands
 
 import me.zeroeightsix.kami.command.Command
 import me.zeroeightsix.kami.command.syntax.ChunkBuilder
+import me.zeroeightsix.kami.command.syntax.parsers.EnumParser
 import me.zeroeightsix.kami.module.MacroManager
 import me.zeroeightsix.kami.module.Macros
 import me.zeroeightsix.kami.util.Macro
@@ -12,7 +13,7 @@ import me.zeroeightsix.kami.util.Wrapper
  * @author dominikaaaa
  * Created by dominikaaaa on 04/05/20
  */
-class MacroCommand : Command("macro", ChunkBuilder().append("key|list").append("clear|message/command").build(), "m") {
+class MacroCommand : Command("macro", ChunkBuilder().append("command", true, EnumParser(arrayOf("key", "list"))).append("setting", false, EnumParser(arrayOf("clear", "message|command"))).build(), "m") {
     override fun call(args: Array<out String?>) {
         val rKey = args[0]
         val macro = args[1]
diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/SetCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/SetCommand.java
index 643eca797..f276086d9 100644
--- a/src/main/java/me/zeroeightsix/kami/command/commands/SetCommand.java
+++ b/src/main/java/me/zeroeightsix/kami/command/commands/SetCommand.java
@@ -2,6 +2,7 @@ package me.zeroeightsix.kami.command.commands;
 
 import me.zeroeightsix.kami.command.Command;
 import me.zeroeightsix.kami.command.syntax.ChunkBuilder;
+import me.zeroeightsix.kami.command.syntax.parsers.EnumParser;
 import me.zeroeightsix.kami.command.syntax.parsers.ModuleParser;
 import me.zeroeightsix.kami.module.Module;
 import me.zeroeightsix.kami.setting.ISettingUnknown;
@@ -24,7 +25,7 @@ public class SetCommand extends Command {
         super("set", new ChunkBuilder()
                 .append("module", true, new ModuleParser())
                 .append("setting", true)
-                .append("value|toggle", true)
+                .append("set", true, new EnumParser(new String[]{"value", "toggle"}))
                 .build());
         setDescription("Change the setting of a certain module");
     }
diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/XRayCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/XRayCommand.java
index 2fce921dc..2e0c3bc1a 100644
--- a/src/main/java/me/zeroeightsix/kami/command/commands/XRayCommand.java
+++ b/src/main/java/me/zeroeightsix/kami/command/commands/XRayCommand.java
@@ -2,6 +2,7 @@ package me.zeroeightsix.kami.command.commands;
 
 import me.zeroeightsix.kami.command.Command;
 import me.zeroeightsix.kami.command.syntax.ChunkBuilder;
+import me.zeroeightsix.kami.command.syntax.parsers.EnumParser;
 import me.zeroeightsix.kami.module.modules.render.XRay;
 import net.minecraft.block.Block;
 
@@ -15,7 +16,7 @@ import static me.zeroeightsix.kami.util.MessageSendHelper.*;
  */
 public class XRayCommand extends Command {
     public XRayCommand() {
-        super("xray", new ChunkBuilder().append("help").append("+block|-block|=block").append("list|defaults|clear|invert").build());
+        super("xray", new ChunkBuilder().append("command", true, new EnumParser(new String[]{"help", "list", "+block", "-block", "=block", "defaults", "clear", "invert"})).build());
         setDescription("Allows you to add or remove blocks from the &fxray &7module");
     }