From 6859bcfa5d87aa6f2299b20188ab8618e2227857 Mon Sep 17 00:00:00 2001 From: isXander Date: Sun, 2 Jul 2023 19:54:24 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20vmouse=20not=20working=20p?= =?UTF-8?q?roperly=20on=20most=20GUIs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controlify/virtualmouse/VirtualMouseBehaviour.java | 4 ++++ .../isxander/controlify/virtualmouse/VirtualMouseHandler.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/isxander/controlify/virtualmouse/VirtualMouseBehaviour.java b/src/main/java/dev/isxander/controlify/virtualmouse/VirtualMouseBehaviour.java index 47f84d6..54e0a3f 100644 --- a/src/main/java/dev/isxander/controlify/virtualmouse/VirtualMouseBehaviour.java +++ b/src/main/java/dev/isxander/controlify/virtualmouse/VirtualMouseBehaviour.java @@ -9,4 +9,8 @@ public enum VirtualMouseBehaviour { public boolean hasCursor() { return this != DISABLED; } + + public boolean isDefaultOr(VirtualMouseBehaviour behaviour) { + return this == DEFAULT || this == behaviour; + } } diff --git a/src/main/java/dev/isxander/controlify/virtualmouse/VirtualMouseHandler.java b/src/main/java/dev/isxander/controlify/virtualmouse/VirtualMouseHandler.java index 0f09daf..84e9d00 100644 --- a/src/main/java/dev/isxander/controlify/virtualmouse/VirtualMouseHandler.java +++ b/src/main/java/dev/isxander/controlify/virtualmouse/VirtualMouseHandler.java @@ -91,7 +91,7 @@ public class VirtualMouseHandler { scrollY += controller.bindings().VMOUSE_SCROLL_UP.state() - controller.bindings().VMOUSE_SCROLL_DOWN.state(); - if (!ScreenProcessorProvider.provide(minecraft.screen).virtualMouseBehaviour().hasCursor()) { + if (ScreenProcessorProvider.provide(minecraft.screen).virtualMouseBehaviour().isDefaultOr(VirtualMouseBehaviour.ENABLED)) { handleCompatibilityBinds(controller); }