From af134478a34afbe4ebd3a3785a5ac00da58b4fc9 Mon Sep 17 00:00:00 2001
From: Xander <xander@isxander.dev>
Date: Wed, 25 Oct 2023 17:14:14 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Pause=20screen=20disconnec?=
 =?UTF-8?q?t=20shortcut=20now=20focuses=20instead=20of=20disconnecting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screenop/compat/vanilla/PauseScreenProcessor.java         | 4 ++--
 .../java/dev/isxander/controlify/test/ControlifyTests.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/PauseScreenProcessor.java b/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/PauseScreenProcessor.java
index dd5f227..17ece4b 100644
--- a/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/PauseScreenProcessor.java
+++ b/src/main/java/dev/isxander/controlify/screenop/compat/vanilla/PauseScreenProcessor.java
@@ -28,7 +28,7 @@ public class PauseScreenProcessor extends ScreenProcessor<PauseScreen> {
             minecraft.setScreen(new OptionsScreen(screen, minecraft.options));
         }
         if (controller.bindings().GUI_ABSTRACT_ACTION_2.justPressed()) {
-            disconnectButtonSupplier.get().onPress();
+            screen.setFocused(disconnectButtonSupplier.get());
         }
     }
 
@@ -51,7 +51,7 @@ public class PauseScreenProcessor extends ScreenProcessor<PauseScreen> {
             );
             ButtonGuideApi.addGuideToButtonBuiltin(
                     disconnectButtonSupplier.get(),
-                    bindings -> bindings.GUI_ABSTRACT_ACTION_2,
+                    bindings -> disconnectButtonSupplier.get().isFocused() ? bindings.GUI_PRESS : bindings.GUI_ABSTRACT_ACTION_2,
                     ButtonRenderPosition.TEXT,
                     ButtonGuidePredicate.ALWAYS
             );
diff --git a/src/testmod/java/dev/isxander/controlify/test/ControlifyTests.java b/src/testmod/java/dev/isxander/controlify/test/ControlifyTests.java
index ae8ebda..4a48787 100644
--- a/src/testmod/java/dev/isxander/controlify/test/ControlifyTests.java
+++ b/src/testmod/java/dev/isxander/controlify/test/ControlifyTests.java
@@ -56,7 +56,7 @@ public class ControlifyTests {
 
     @Test.Entrypoint("Screen component registry setup test")
     void setupScreenComponentRegistry() {
-        ScreenProcessorProvider.REGISTRY.register(TitleScreen.class, ts -> new ScreenProcessor<>(ts){
+        ScreenProcessorProvider.registerProvider(TitleScreen.class, ts -> new ScreenProcessor<>(ts){
             @Override
             public void onWidgetRebuild() {
                 super.onWidgetRebuild();