backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quick changes

Browse source
This commit is contained in:
wize-logic 2026-03-04 10:40:18 -05:00
parent f16de1b19b
commit b072937891
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Common/UI/UIScene_ControlRemapMenu.cpp
View file

@ -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;

10
Minecraft.Client/Minecraft.cpp
View file

@ -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