From b0729378914af9461e3a96a7cedf236cdfc95047 Mon Sep 17 00:00:00 2001 From: wize-logic Date: Wed, 4 Mar 2026 10:40:18 -0500 Subject: [PATCH] Quick changes --- .../Common/UI/UIScene_ControlRemapMenu.cpp | 2 +- Minecraft.Client/Minecraft.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Minecraft.Client/Common/UI/UIScene_ControlRemapMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ControlRemapMenu.cpp index 37d6dcfa2..ea97fc99d 100644 --- a/Minecraft.Client/Common/UI/UIScene_ControlRemapMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_ControlRemapMenu.cpp @@ -249,7 +249,7 @@ void UIScene_ControlRemapMenu::handlePress(F64 controlId, F64 childId) UINT uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; - + // The 100+ commits before this broke this code, so I'm not sure if the callback system is still working correctly. If it is, this should show a confirmation dialog and reset to defaults if the user confirms. // ui.RequestMessageBox(IDS_DEFAULTS_TITLE, IDS_DEFAULTS_TEXT, uiIDA, 2, m_iPad, &UIScene_ControlRemapMenu::ResetDefaultsDialogReturned, this, app.GetStringTable(), NULL, 0, false); } break; diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index f66dad635..fcf8f46dd 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -3550,7 +3550,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) player->lastClickTick[0] = ticks; } #ifdef _WINDOWS64 - else if (iPad == 0 && KMInput.IsCaptured() && KMInput.ConsumeMousePress(0)) + else if (iPad == 0 && KMInput.IsCaptured() && remapConsumePress(options->keyAttack->key)) { player->handleMouseClick(0); player->lastClickTick[0] = ticks; @@ -3564,7 +3564,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) player->lastClickTick[0] = ticks; } #ifdef _WINDOWS64 - else if (iPad == 0 && KMInput.IsCaptured() && KMInput.IsMouseDown(0) && ticks - player->lastClickTick[0] >= timer->ticksPerSecond / 4) + else if (iPad == 0 && KMInput.IsCaptured() && remapIsDown(options->keyAttack->key) && ticks - player->lastClickTick[0] >= timer->ticksPerSecond / 4) { player->handleMouseClick(0); player->lastClickTick[0] = ticks; @@ -3573,7 +3573,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) if(InputManager.ButtonDown(iPad, MINECRAFT_ACTION_ACTION) #ifdef _WINDOWS64 - || (iPad == 0 && KMInput.IsCaptured() && KMInput.IsMouseDown(0)) + || (iPad == 0 && KMInput.IsCaptured() && remapIsDown(options->keyAttack->key)) #endif ) { @@ -3598,14 +3598,14 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if(!InputManager.ButtonDown(iPad, MINECRAFT_ACTION_USE) #ifdef _WINDOWS64 - && !(iPad == 0 && KMInput.IsCaptured() && KMInput.IsMouseDown(1)) + && !(iPad == 0 && KMInput.IsCaptured() && remapIsDown(options->keyUse->key)) #endif ) gameMode->releaseUsingItem(player); } else if( gameMode->isInputAllowed(MINECRAFT_ACTION_USE) ) { #ifdef _WINDOWS64 - bool useButtonDown = InputManager.ButtonDown(iPad, MINECRAFT_ACTION_USE) || (iPad == 0 && KMInput.IsCaptured() && KMInput.IsMouseDown(1)); + bool useButtonDown = InputManager.ButtonDown(iPad, MINECRAFT_ACTION_USE) || (iPad == 0 && KMInput.IsCaptured() && remapIsDown(options->keyUse->key)); #else bool useButtonDown = InputManager.ButtonDown(iPad, MINECRAFT_ACTION_USE); #endif