djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

✏️ Remove VMouse Escape in favour of existing GUI Back bind

Browse Source
This commit is contained in:
isXander
2023-05-07 12:41:20 +01:00
parent af83e5c712
commit f958a2b1b6
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/dev/isxander/controlify/Controlify.java
View File

@ -267,13 +267,12 @@ public class Controlify implements ControlifyApi {
return; return;
} }
this.virtualMouseHandler().handleControllerInput(controller);
if (minecraft.screen != null) { if (minecraft.screen != null) {
ScreenProcessorProvider.provide(minecraft.screen).onControllerUpdate(controller); ScreenProcessorProvider.provide(minecraft.screen).onControllerUpdate(controller);
} } else if (minecraft.level != null) {
if (minecraft.level != null) {
this.inGameInputHandler().ifPresent(InGameInputHandler::inputTick); this.inGameInputHandler().ifPresent(InGameInputHandler::inputTick);
} }
this.virtualMouseHandler().handleControllerInput(controller);
ControlifyEvents.ACTIVE_CONTROLLER_TICKED.invoker().onControllerStateUpdate(controller); ControlifyEvents.ACTIVE_CONTROLLER_TICKED.invoker().onControllerStateUpdate(controller);
} }

7
src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java
View File

@ -60,7 +60,7 @@ public class ControllerBindings<T extends ControllerState> {
VMOUSE_MOVE_UP, VMOUSE_MOVE_DOWN, VMOUSE_MOVE_LEFT, VMOUSE_MOVE_RIGHT, VMOUSE_MOVE_UP, VMOUSE_MOVE_DOWN, VMOUSE_MOVE_LEFT, VMOUSE_MOVE_RIGHT,
VMOUSE_LCLICK, VMOUSE_RCLICK, VMOUSE_SHIFT_CLICK, VMOUSE_LCLICK, VMOUSE_RCLICK, VMOUSE_SHIFT_CLICK,
VMOUSE_SCROLL_UP, VMOUSE_SCROLL_DOWN, VMOUSE_SCROLL_UP, VMOUSE_SCROLL_DOWN,
VMOUSE_ESCAPE, VMOUSE_SHIFT, VMOUSE_SHIFT,
VMOUSE_TOGGLE, VMOUSE_TOGGLE,
GUI_NAVI_UP, GUI_NAVI_DOWN, GUI_NAVI_LEFT, GUI_NAVI_RIGHT, GUI_NAVI_UP, GUI_NAVI_DOWN, GUI_NAVI_LEFT, GUI_NAVI_RIGHT,
CYCLE_OPT_FORWARD, CYCLE_OPT_BACKWARD, CYCLE_OPT_FORWARD, CYCLE_OPT_BACKWARD,
@ -287,11 +287,6 @@ public class ControllerBindings<T extends ControllerState> {
.defaultBind(GamepadBinds.RIGHT_STICK_BACKWARD) .defaultBind(GamepadBinds.RIGHT_STICK_BACKWARD)
.category(VMOUSE_CATEGORY) .category(VMOUSE_CATEGORY)
.build()); .build());
register(VMOUSE_ESCAPE = ControllerBindingBuilder.create(controller)
.identifier("controlify", "vmouse_escape")
.defaultBind(GamepadBinds.B_BUTTON)
.category(VMOUSE_CATEGORY)
.build());
register(VMOUSE_SHIFT = ControllerBindingBuilder.create(controller) register(VMOUSE_SHIFT = ControllerBindingBuilder.create(controller)
.identifier("controlify", "vmouse_shift") .identifier("controlify", "vmouse_shift")
.defaultBind(GamepadBinds.LEFT_STICK_PRESS) .defaultBind(GamepadBinds.LEFT_STICK_PRESS)

6
src/main/java/dev/isxander/controlify/virtualmouse/VirtualMouseHandler.java
View File

@ -114,10 +114,8 @@ public class VirtualMouseHandler {
mouseHandler.invokeOnPress(minecraft.getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_LEFT, GLFW.GLFW_RELEASE, 0); mouseHandler.invokeOnPress(minecraft.getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_LEFT, GLFW.GLFW_RELEASE, 0);
} }
if (controller.bindings().VMOUSE_ESCAPE.justPressed()) { if (controller.bindings().GUI_BACK.justPressed() && minecraft.screen != null) {
keyboardHandler.invokeKeyPress(minecraft.getWindow().getWindow(), GLFW.GLFW_KEY_ESCAPE, 0, GLFW.GLFW_PRESS, 0); minecraft.screen.onClose();
} else if (controller.bindings().VMOUSE_ESCAPE.justReleased()) {
keyboardHandler.invokeKeyPress(minecraft.getWindow().getWindow(), GLFW.GLFW_KEY_ESCAPE, 0, GLFW.GLFW_RELEASE, 0);
} }
} }