Add option to toggle key modifiers

zeroeightysix · Aug 5, 2019 · b58345a · b58345a
1 parent 7aaaf87
commit b58345a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 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
@@ -2,20 +2,26 @@
 
 import me.zeroeightsix.kami.command.Command;
 import me.zeroeightsix.kami.command.syntax.ChunkBuilder;
+import me.zeroeightsix.kami.command.syntax.parsers.DependantParser;
 import me.zeroeightsix.kami.command.syntax.parsers.ModuleParser;
 import me.zeroeightsix.kami.module.Module;
 import me.zeroeightsix.kami.module.ModuleManager;
+import me.zeroeightsix.kami.setting.Setting;
+import me.zeroeightsix.kami.setting.Settings;
+import me.zeroeightsix.kami.setting.builder.SettingBuilder;
 import me.zeroeightsix.kami.util.Wrapper;
 
 /**
  * Created by 086 on 12/11/2017.
  */
 public class BindCommand extends Command {
 
+    public static Setting<Boolean> modifiersEnabled = SettingBuilder.register(Settings.b("modifiersEnabled"), "binds");
+
     public BindCommand() {
         super("bind", new ChunkBuilder()
-                .append("module", true, new ModuleParser())
-                .append("key", true)
+                .append("[module]|modifiers", true, new ModuleParser())
+                .append("[key]|[on|off]", true)
                 .build()
         );
     }
@@ -27,8 +33,26 @@ public void call(String[] args) {
             return;
         }
 
-        String rkey = args[1];
         String module = args[0];
+        String rkey = args[1];
+
+        if (module.equalsIgnoreCase("modifiers")) {
+            if (rkey == null) {
+                sendChatMessage("Expected: on or off");
+                return;
+            }
+
+            if (rkey.equalsIgnoreCase("on")) {
+                modifiersEnabled.setValue(true);
+                sendChatMessage("Turned modifiers on.");
+            } else if (rkey.equalsIgnoreCase("off")) {
+                modifiersEnabled.setValue(false);
+                sendChatMessage("Turned modifiers off.");
+            } else {
+                sendChatMessage("Expected: on or off");
+            }
+            return;
+        }
 
         Module m = ModuleManager.getModuleByName(module);
 

diff --git a/src/main/java/me/zeroeightsix/kami/util/Bind.java b/src/main/java/me/zeroeightsix/kami/util/Bind.java
@@ -1,5 +1,6 @@
 package me.zeroeightsix.kami.util;
 
+import me.zeroeightsix.kami.command.commands.BindCommand;
 import org.lwjgl.input.Keyboard;
 
 /**
@@ -61,7 +62,7 @@ public String toString() {
     }
 
     public boolean isDown() {
-        return !isEmpty() && (isShift() == isShiftDown()) && (isCtrl() == isCtrlDown()) && (isAlt() == isAltDown()) && Keyboard.isKeyDown(getKey());
+        return !isEmpty() && (!BindCommand.modifiersEnabled.getValue() || (isShift() == isShiftDown()) && (isCtrl() == isCtrlDown()) && (isAlt() == isAltDown())) && Keyboard.isKeyDown(getKey());
     }
 
     private boolean isShiftDown() {