From 546916fc1229bcd3e05bd43773581c40388fe7ef Mon Sep 17 00:00:00 2001 From: isXander Date: Sun, 14 May 2023 22:56:02 +0100 Subject: [PATCH] whoops partial commit --- .../controlify/bindings/BindContexts.java | 2 +- .../bindings/ControllerBindings.java | 19 +++++++++++++++++++ .../assets/controlify/lang/en_us.json | 3 +++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/isxander/controlify/bindings/BindContexts.java b/src/main/java/dev/isxander/controlify/bindings/BindContexts.java index 5386d23..0d408ac 100644 --- a/src/main/java/dev/isxander/controlify/bindings/BindContexts.java +++ b/src/main/java/dev/isxander/controlify/bindings/BindContexts.java @@ -11,7 +11,7 @@ public final class BindContexts { GUI_VMOUSE_CURSOR_ONLY = ctx("gui_vmouse_cursor"), GUI_VMOUSE = ctx("gui_vmouse", GUI_VMOUSE_CURSOR_ONLY), CONTROLIFY_CONFIG = ctx("controlify_config", GUI), - INVENTORY = ctx("inventory", GUI_VMOUSE_CURSOR_ONLY); + INVENTORY = ctx("inventory"); private static BindContext ctx(String path, BindContext... parents) { return new BindContext(Controlify.id(path), Set.of(parents)); diff --git a/src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java b/src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java index ba42615..e2c28dd 100644 --- a/src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java +++ b/src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java @@ -51,6 +51,7 @@ public class ControllerBindings { CHANGE_PERSPECTIVE, SWAP_HANDS, OPEN_CHAT, + INV_SELECT, INV_QUICK_MOVE, INV_TAKE_HALF, GUI_PRESS, GUI_BACK, GUI_NEXT_TAB, GUI_PREV_TAB, GUI_ABSTRACT_ACTION_1, GUI_ABSTRACT_ACTION_2, @@ -250,6 +251,24 @@ public class ControllerBindings { .category(GUI_CATEGORY) .context(BindContexts.GUI) .build()); + register(INV_SELECT = ControllerBindingBuilder.create(controller) + .identifier("controlify", "inv_select") + .defaultBind(GamepadBinds.A_BUTTON) + .category(INVENTORY_CATEGORY) + .context(BindContexts.INVENTORY) + .build()); + register(INV_QUICK_MOVE = ControllerBindingBuilder.create(controller) + .identifier("controlify", "inv_quick_move") + .defaultBind(GamepadBinds.Y_BUTTON) + .category(INVENTORY_CATEGORY) + .context(BindContexts.INVENTORY) + .build()); + register(INV_TAKE_HALF = ControllerBindingBuilder.create(controller) + .identifier("controlify", "inv_take_half") + .defaultBind(GamepadBinds.X_BUTTON) + .category(INVENTORY_CATEGORY) + .context(BindContexts.INVENTORY) + .build()); register(PICK_BLOCK = ControllerBindingBuilder.create(controller) .identifier("controlify", "pick_block") .defaultBind(GamepadBinds.DPAD_LEFT) diff --git a/src/main/resources/assets/controlify/lang/en_us.json b/src/main/resources/assets/controlify/lang/en_us.json index 50358b1..d4311a7 100644 --- a/src/main/resources/assets/controlify/lang/en_us.json +++ b/src/main/resources/assets/controlify/lang/en_us.json @@ -167,6 +167,9 @@ "controlify.binding.controlify.gui_abstract_action_1.desc": "A generic binding that may do different things depending on the current screen.", "controlify.binding.controlify.gui_abstract_action_2": "GUI Abstract Action 2", "controlify.binding.controlify.gui_abstract_action_2.desc": "A generic binding that may do different things depending on the current screen.", + "controlify.binding.controlify.inv_select": "Select Item", + "controlify.binding.controlify.inv_quick_move": "Quick Move", + "controlify.binding.controlify.inv_take_half": "Take Half", "controlify.binding.controlify.drop": "Drop Item", "controlify.binding.controlify.pick_block": "Pick Block", "controlify.binding.controlify.toggle_hud_visibility": "Toggle HUD Visibility",