From 276cdff132f568ea0f106a3e4b21a5708779b3b2 Mon Sep 17 00:00:00 2001
From: isXander <xandersmith2008@gmail.com>
Date: Thu, 27 Jul 2023 20:22:58 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Make=20the=20reset=20button=20ac?=
 =?UTF-8?q?t=20as=20an=20unbind=20button.=20(close=20#120)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controlify/bindings/ControllerBindingImpl.java       | 4 ++--
 .../isxander/controlify/bindings/ControllerBindings.java | 9 +--------
 .../gui/controllers/AbstractBindController.java          | 5 -----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java b/src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java
index 8450f23..ea39de1 100644
--- a/src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java
+++ b/src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java
@@ -169,9 +169,9 @@ public class ControllerBindingImpl<T extends ControllerState> implements Control
 
     @Override
     public Option.Builder<?> startYACLOption() {
-        Option.Builder<IBind<T>> option = Option.createBuilder((Class<IBind<T>>) (Class<?>) IBind.class)
+        Option.Builder<IBind<T>> option = Option.<IBind<T>>createBuilder()
                 .name(name())
-                .binding(defaultBind(), this::currentBind, this::setCurrentBind)
+                .binding(new EmptyBind<>(), this::currentBind, this::setCurrentBind)
                 .description(OptionDescription.of(this.description()));
 
         if (controller instanceof GamepadController gamepad) {
diff --git a/src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java b/src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java
index 339c917..3fede0d 100644
--- a/src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java
+++ b/src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java
@@ -65,8 +65,7 @@ public class ControllerBindings<T extends ControllerState> {
             VMOUSE_SHIFT,
             VMOUSE_TOGGLE,
             GUI_NAVI_UP, GUI_NAVI_DOWN, GUI_NAVI_LEFT, GUI_NAVI_RIGHT,
-            CYCLE_OPT_FORWARD, CYCLE_OPT_BACKWARD,
-            CLEAR_BINDING;
+            CYCLE_OPT_FORWARD, CYCLE_OPT_BACKWARD;
 
     private final Map<ResourceLocation, ControllerBinding> registry = new LinkedHashMap<>();
 
@@ -397,12 +396,6 @@ public class ControllerBindings<T extends ControllerState> {
                 .category(GUI_CATEGORY)
                 .context(BindContexts.GUI)
                 .build());
-        register(CLEAR_BINDING = ControllerBindingBuilder.create(controller)
-                .identifier("controlify", "clear_binding")
-                .defaultBind(GamepadBinds.RIGHT_STICK_PRESS)
-                .category(GUI_CATEGORY)
-                .context(BindContexts.CONTROLIFY_CONFIG)
-                .build());
 
         for (var constructor : CUSTOM_BINDS.values()) {
             register(constructor.apply(this));
diff --git a/src/main/java/dev/isxander/controlify/gui/controllers/AbstractBindController.java b/src/main/java/dev/isxander/controlify/gui/controllers/AbstractBindController.java
index 7da0d0b..745efb1 100644
--- a/src/main/java/dev/isxander/controlify/gui/controllers/AbstractBindController.java
+++ b/src/main/java/dev/isxander/controlify/gui/controllers/AbstractBindController.java
@@ -95,11 +95,6 @@ public abstract class AbstractBindController<T extends ControllerState> implemen
             if (controller != control.controller) return true;
 
             if (!justTookInput && !awaitingControllerInput) {
-                if (controller.bindings().CLEAR_BINDING.justPressed()) {
-                    control.option().requestSet(new EmptyBind<>());
-                    return true;
-                }
-
                 if (controller.bindings().GUI_PRESS.justPressed()) {
                     ControllerBindHandler.setBindListener(this);
                     return awaitingControllerInput = true;