Improve handling of toggle keys

Fixes toggle keys from other mods getting toggled every frame (gh-18)

Author: PieKing1215

crossversion/common/src/main/java/me/pieking1215/invmove/InvMove.java

@@ -6,17 +6,18 @@
 import me.pieking1215.invmove.module.VanillaModule16;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.ToggleKeyMapping;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.player.Input;
 import net.minecraft.network.chat.MutableComponent;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public abstract class InvMove {
@@ -71,9 +72,10 @@ public static void registerModule(Module module) {
     // implementation
 
     protected boolean wasSneaking = false;
-    protected boolean wasShiftDown = false;
     protected boolean wasToggleMovementPressed = false;
 
+    protected Map<ToggleKeyMapping, Boolean> wasToggleKeyDown = new HashMap<>();
+
     public final List<Module> modules = new ArrayList<>();
 
     public InvMove() {
@@ -153,31 +155,43 @@ public void onInputUpdate(Input input){
         canMove = handleToggleMovementKey(Minecraft.getInstance().screen, canMove);
 
         if(canMove){
-
             // tick keybinds (since opening the ui unpresses all keys)
 
-            if (optionToggleCrouch()) {
-                // TODO: think about doing this a better way
-
-                // save whether it was toggled
-                boolean wasCrouchToggle = Minecraft.getInstance().options.keyShift.isDown;
+            // edited implementation of KeyMapping.setAll()
+            // using normal setAll breaks toggle keys so we have to do it manually
+            // TODO: maybe it would be better to modify KeyboardHandler::keyPress to hook key presses instead of doing it this way
+            for (KeyMapping k : KeyMapping.ALL.values()) {
+                if (k.key.getType() == InputConstants.Type.KEYSYM && k.key.getValue() != InputConstants.UNKNOWN.getValue()) {
+
+                    boolean raw = InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), k.key.getValue());
+
+                    // if is a toggle key in toggle mode
+                    if (k instanceof ToggleKeyMapping && ((ToggleKeyMapping)k).needsToggle.getAsBoolean()) {
+                        // special handling for toggle keys
+
+                        // manually handle toggling
+                        if (wasToggleKeyDown.containsKey(k)) {
+                            if (!wasToggleKeyDown.get(k) && raw) {
+                                // TODO: add a "boolean allowKey(KeyBinding);" method to Module instead of hardcoding only for sneak
+                                if (k == Minecraft.getInstance().options.keyShift) {
+                                    if (InvMoveConfig.MOVEMENT.SNEAK.get() == InvMoveConfig.Movement.SneakMode.Pressed) {
+                                        k.setDown(true);
+                                    }
+                                } else {
+                                    k.setDown(true);
+                                }
+                            }
+                        }
 
-                // make it not toggle, and see if the key was pressed
-                setOptionToggleCrouch(false);
-                KeyMapping.setAll();
-                setOptionToggleCrouch(true);
+                        wasToggleKeyDown.put((ToggleKeyMapping) k, raw);
 
-                // manually toggle crouch
-                boolean nowShift = Minecraft.getInstance().options.keyShift.isDown;
-                if (InvMoveConfig.MOVEMENT.SNEAK.get() == InvMoveConfig.Movement.SneakMode.Pressed && !wasShiftDown && nowShift) {
-                    Minecraft.getInstance().options.keyShift.isDown = !wasCrouchToggle;
-                } else {
-                    Minecraft.getInstance().options.keyShift.isDown = wasCrouchToggle;
+                    } else {
+                        // normal setAll behavior
+                        k.setDown(raw);
+                    }
                 }
-                wasShiftDown = nowShift;
-            } else {
-                KeyMapping.setAll();
             }
+
 //            Minecraft.getInstance().screen.passEvents = true;
 
             // this is needed for compatibility with ItemPhysic
@@ -205,6 +219,8 @@ public void onInputUpdate(Input input){
             }
 
             // tick movement
+            // TODO: consider mixing into KeyboardInput::tick or KeyMapping::isDown instead of this for better compatibility
+            //       that would also fix swift sneak (gh-21)
             manualTickMovement(input, Minecraft.getInstance().player.isMovingSlowly(), Minecraft.getInstance().player.isSpectator());
 
             // set sprinting using raw keybind data

crossversion/common/src/main/resources/invmove.accesswidener

@@ -1,4 +1,6 @@
 accessWidener   v1  named
 accessible   field   net/minecraft/client/KeyMapping   isDown   Z
 accessible   field   net/minecraft/client/KeyMapping   key   Lcom/mojang/blaze3d/platform/InputConstants$Key;
+accessible   field   net/minecraft/client/KeyMapping   ALL   Ljava/util/Map;
+accessible   field   net/minecraft/client/ToggleKeyMapping   needsToggle   Ljava/util/function/BooleanSupplier;
 accessible   class   net/minecraft/client/gui/screens/inventory/MerchantScreen$TradeOfferButton