From 7a1b77ccdff596eea98e396a3f9b2e9cc12f3207 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 12 Oct 2018 13:39:36 +0200
Subject: [PATCH] Added a ctrl+toggle for the jumping and sneaking actions on
 the skins gui

---
 .../voxelmodpack/hdskins/gui/GuiSkins.java    | 68 ++++++++++++++++---
 .../com/voxelmodpack/hdskins/util/Edge.java   | 32 +++++++++
 2 files changed, 92 insertions(+), 8 deletions(-)
 create mode 100644 src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java

diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
index fba4c62a..f5413f3f 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
@@ -13,6 +13,7 @@ import com.voxelmodpack.hdskins.SkinUploader.ISkinUploadHandler;
 import com.voxelmodpack.hdskins.server.SkinServer;
 import com.voxelmodpack.hdskins.upload.GLWindow;
 import com.voxelmodpack.hdskins.util.CallableFutures;
+import com.voxelmodpack.hdskins.util.Edge;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -59,11 +60,33 @@ public class GuiSkins extends GameGui implements ISkinUploadHandler {
 
     private int lastMouseX = 0;
 
+    private boolean jumpState = false;
+    private boolean sneakState = false;
+
     protected final SkinUploader uploader;
     protected final SkinChooser chooser;
 
     protected final CubeMap panorama;
 
+    private final Edge ctrlKey = new Edge(this::ctrlToggled) {
+        @Override
+        protected boolean nextState() {
+            return Keyboard.isKeyDown(Keyboard.KEY_FUNCTION) || Keyboard.isKeyDown(Keyboard.KEY_LCONTROL);
+        }
+    };
+    private final Edge jumpKey = new Edge(this::jumpToggled) {
+        @Override
+        protected boolean nextState() {
+            return Keyboard.isKeyDown(Keyboard.KEY_SPACE);
+        }
+    };
+    private final Edge sneakKey = new Edge(this::sneakToggled) {
+        @Override
+        protected boolean nextState() {
+            return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
+        }
+    };
+
     public GuiSkins(List<SkinServer> servers) {
         mc = Minecraft.getMinecraft();
         GameProfile profile = mc.getSession().getProfile();
@@ -254,16 +277,45 @@ public class GuiSkins extends GameGui implements ISkinUploadHandler {
         }
     }
 
+    private void jumpToggled(boolean jumping) {
+        if (jumping && ctrlKey.getState()) {
+            jumpState = !jumpState;
+        }
+
+        jumping |= jumpState;
+
+        localPlayer.setJumping(jumping);
+        remotePlayer.setJumping(jumping);
+    }
+
+    private void sneakToggled(boolean sneaking) {
+        if (sneaking && ctrlKey.getState()) {
+            sneakState = !sneakState;
+        }
+
+        sneaking |= sneakState;
+
+        localPlayer.setSneaking(sneaking);
+        remotePlayer.setSneaking(sneaking);
+    }
+
+    private void ctrlToggled(boolean ctrl) {
+        if (ctrl) {
+            if (sneakKey.getState()) {
+                sneakState = !sneakState;
+            }
+
+            if (jumpKey.getState()) {
+                jumpState = !jumpState;
+            }
+        }
+    }
+
     @Override
     protected void drawContents(int mouseX, int mouseY, float partialTick) {
-        boolean sneak = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
-
-        localPlayer.setSneaking(sneak);
-        remotePlayer.setSneaking(sneak);
-
-        boolean jump = Keyboard.isKeyDown(Keyboard.KEY_SPACE);
-        localPlayer.setJumping(jump);
-        remotePlayer.setJumping(jump);
+        ctrlKey.update();
+        jumpKey.update();
+        sneakKey.update();
 
         float deltaTime = panorama.getDelta(partialTick);
         panorama.render(partialTick, zLevel);
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java
new file mode 100644
index 00000000..0d3a6767
--- /dev/null
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java
@@ -0,0 +1,32 @@
+package com.voxelmodpack.hdskins.util;
+
+public abstract class Edge {
+
+    private boolean previousState;
+
+    private Callback callback;
+
+    public Edge(Callback callback) {
+        this.callback = callback;
+    }
+
+    public void update() {
+        boolean state = nextState();
+
+        if (state != previousState) {
+            previousState = state;
+            callback.call(state);
+        }
+    }
+
+    public boolean getState() {
+        return previousState;
+    }
+
+    protected abstract boolean nextState();
+
+    @FunctionalInterface
+    public interface Callback {
+        void call(boolean state);
+    }
+}
\ No newline at end of file