From 90bf4f931473a8200abd19ba4664507397d6440f Mon Sep 17 00:00:00 2001
From: outis-gooner <glosh.was.to.short.smh@gmail.com>
Date: Mon, 2 Mar 2026 17:48:53 -0800
Subject: [PATCH] Make keybinds more modular

---
 .gitignore                                  |  1 +
 Minecraft.Client/Common/UI/UIController.cpp | 24 ++++++++++-----------
 Minecraft.Client/KeyboardMouseInput.h       | 14 ++++++++++++
 Minecraft.Client/Minecraft.cpp              |  2 +-
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac97f2f..60c2e66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -184,3 +184,4 @@ Minecraft.Client/PS3/PS3Extras/HeapInspector/
 
 # Sony remote storage libs
 Minecraft.Client/Common/Network/Sony/
+/.vs
diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp
index 7e7eb79..e94e83f 100644
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -1023,18 +1023,18 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 		int vk = 0;
 		switch (key)
 		{
-		case ACTION_MENU_OK:    case ACTION_MENU_A: vk = VK_RETURN; break;
-		case ACTION_MENU_CANCEL: case ACTION_MENU_B: vk = VK_ESCAPE; break;
-		case ACTION_MENU_UP:    vk = VK_UP;     break;
-		case ACTION_MENU_DOWN:  vk = VK_DOWN;   break;
-		case ACTION_MENU_LEFT:  vk = VK_LEFT;   break;
-		case ACTION_MENU_RIGHT: vk = VK_RIGHT;  break;
-		case ACTION_MENU_X:     vk = 'E';       break;
-		case ACTION_MENU_Y:     vk = VK_TAB;    break;
-		case ACTION_MENU_LEFT_SCROLL:  vk = 'Q'; break;
-		case ACTION_MENU_RIGHT_SCROLL: vk = 'R'; break;
-		case ACTION_MENU_PAGEUP:   vk = VK_PRIOR; break;
-		case ACTION_MENU_PAGEDOWN: vk = VK_NEXT;  break;
+		case ACTION_MENU_OK:    case ACTION_MENU_A: vk = KeyboardMouseInput::KEY_MENU_A; break;
+		case ACTION_MENU_CANCEL: case ACTION_MENU_B: vk = KeyboardMouseInput::KEY_MENU_B; break;
+		case ACTION_MENU_UP:    vk = KeyboardMouseInput::KEY_MENU_UP; break;
+		case ACTION_MENU_DOWN:  vk = KeyboardMouseInput::KEY_MENU_DOWN; break;
+		case ACTION_MENU_LEFT:  vk = KeyboardMouseInput::KEY_MENU_LEFT; break;
+		case ACTION_MENU_RIGHT: vk = KeyboardMouseInput::KEY_MENU_RIGHT; break;
+		case ACTION_MENU_X:     vk = KeyboardMouseInput::KEY_MENU_X; break;
+		case ACTION_MENU_Y:     vk = KeyboardMouseInput::KEY_MENU_Y; break;
+		case ACTION_MENU_LEFT_SCROLL:  vk = KeyboardMouseInput::KEY_MENU_LEFT_SCROLL; break;
+		case ACTION_MENU_RIGHT_SCROLL: vk = KeyboardMouseInput::KEY_MENU_RIGHT_SCROLL; break;
+		case ACTION_MENU_PAGEUP:   vk = KeyboardMouseInput::KEY_MENU_PAGEUP; break;
+		case ACTION_MENU_PAGEDOWN: vk = KeyboardMouseInput::KEY_MENU_PAGEDOWN; break;
 		}
 		if (vk != 0)
 		{
diff --git a/Minecraft.Client/KeyboardMouseInput.h b/Minecraft.Client/KeyboardMouseInput.h
index 03e4e29..88ecd8b 100644
--- a/Minecraft.Client/KeyboardMouseInput.h
+++ b/Minecraft.Client/KeyboardMouseInput.h
@@ -26,6 +26,20 @@ public:
 	static const int KEY_PAUSE = VK_ESCAPE;
 	static const int KEY_THIRD_PERSON = VK_F5;
 	static const int KEY_DEBUG_INFO = VK_F3;
+	static const int KEY_FPS_TOGGLE = VK_F4;
+
+	static const int KEY_MENU_UP = VK_UP;
+	static const int KEY_MENU_DOWN = VK_DOWN;
+	static const int KEY_MENU_LEFT = VK_LEFT;
+	static const int KEY_MENU_RIGHT = VK_RIGHT;
+	static const int KEY_MENU_A = VK_RETURN;
+	static const int KEY_MENU_B = VK_ESCAPE;
+	static const int KEY_MENU_X = 'E';
+	static const int KEY_MENU_Y = VK_TAB;
+	static const int KEY_MENU_LEFT_SCROLL = 'Q';
+	static const int KEY_MENU_RIGHT_SCROLL = 'R';
+	static const int KEY_MENU_PAGEUP = VK_PRIOR;
+	static const int KEY_MENU_PAGEDOWN = VK_NEXT;
 
 	void Init();
 	void Tick();
diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp
index 3494d2a..f83b336 100644
--- a/Minecraft.Client/Minecraft.cpp
+++ b/Minecraft.Client/Minecraft.cpp
@@ -1500,7 +1500,7 @@ void Minecraft::run_middle()
 							//localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG;
 						}
 
-						if(g_KBMInput.IsKeyPressed(VK_F4))
+						if(g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_FPS_TOGGLE))
 						{
 							showFpsCounter = !showFpsCounter;
 						}