Fixed Ping Menu keybind not working, when assigned to a mouse button

GirafiStudios · Dec 25, 2020 · 01d3147 · 01d3147
1 parent c7737d3
commit 01d3147
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 minecraft_version=1.16.4
-forge_version=35.0.15
+forge_version=35.1.11
 mappings=20201028-1.16.3
-mod_version=1.6.7
+mod_version=1.6.8
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
diff --git a/src/main/java/dmillerw/ping/client/KeyHandler.java b/src/main/java/dmillerw/ping/client/KeyHandler.java
@@ -37,7 +37,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
         }
 
         long handle = Minecraft.getInstance().getMainWindow().getHandle();
-        boolean keyPressed = (KEY_BINDING.getKey().getKeyCode() >= 0 ? InputMappings.isKeyDown(handle, KEY_BINDING.getKey().getKeyCode()) : InputMappings.isKeyDown(handle, KEY_BINDING.getKey().getKeyCode() + 100));
+        boolean keyPressed = (KEY_BINDING.matchesMouseKey(KEY_BINDING.getKey().getKeyCode()) ? GLFW.glfwGetMouseButton(handle, KEY_BINDING.getKey().getKeyCode()) == 1 : InputMappings.isKeyDown(handle, KEY_BINDING.getKey().getKeyCode()));
 
         if (keyPressed != lastKeyState) {
             if (keyPressed) {