qloak/cafeberry
1
0 Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

Merge kbm-ig into kbm

Browse Source
This commit is contained in:
qloak committed 2026-09-14 16:26:34 -07:00
2 parents 5023e0a8d6 a4326aec9a
commit 3521b06611
1371 files changed
+260387 -267883
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Minecraft.Client/Minecraft.cpp
+14 -9
View File
@@ -1225,7 +1225,7 @@ void Minecraft::run_middle()
{
// if the pause menu is up for the primary player, don't autosave
// If saving isn't disabled, and the main player has a app action running , or has any crafting or containers open, don't autosave
if(!StorageManager.GetSaveDisabled() && (app.GetXuiAction(ProfileManager.GetPrimaryPad())==eAppAction_Idle) )
if(!StorageManager.GetSaveDisabled() && (app.GetUIAction(ProfileManager.GetPrimaryPad())==eAppAction_Idle) )
{
if(!ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad()) && !ui.IsIgnoreAutosaveMenuDisplayed(ProfileManager.GetPrimaryPad()))
{
@@ -1418,7 +1418,8 @@ void Minecraft::run_middle()
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_RIGHT)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_CHANGE_SKIN;
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_UP)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_FLY_TOGGLE;
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_DOWN)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG;
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_LEFT)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_SPAWN_CREEPER;
//if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_LEFT)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_SPAWN_CREEPER;
if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_LEFT)) localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG_SCREEN;
}
else
#endif
@@ -1669,7 +1670,6 @@ void Minecraft::run_middle()
if(i!=0)
{
InputManager.Tick();
app.HandleButtonPresses();
}
ticks++;
@@ -1793,7 +1793,7 @@ void Minecraft::run_middle()
RenderManager.InternalScreenCapture();
#endif
// check to see if we need to capture a screenshot for the save game thumbnail
switch(app.GetXuiAction(i))
switch(app.GetUIAction(i))
{
case eAppAction_ExitWorldCapturedThumbnail:
case eAppAction_SaveGameCapturedThumbnail:
@@ -1822,7 +1822,7 @@ void Minecraft::run_middle()
// Do we need to capture a screenshot for a social post?
for( int i = 0; i < XUSER_MAX_COUNT; i++ )
{
if(app.GetXuiAction(i)==eAppAction_SocialPostScreenshot)
if(app.GetUIAction(i)==eAppAction_SocialPostScreenshot)
{
app.CaptureScreenshot(i);
}
@@ -3369,7 +3369,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
}
// 4J-JEV: Don't set tooltips when we're reloading the skin, it'll crash.
if (!ui.IsReloadingSkin()) ui.SetTooltips( iPad, iA, iB, iX, iY, iLT, iRT, iLB, iRB, iLS, iRS);
if (!ui.IsReloadingSkins()) ui.SetTooltips( iPad, iA, iB, iX, iY, iLT, iRT, iLB, iRB, iLS, iRS);
int wheel = 0;
if (InputManager.GetValue(iPad, MINECRAFT_ACTION_LEFT_SCROLL, true) > 0 && gameMode->isInputAllowed(MINECRAFT_ACTION_LEFT_SCROLL) )
@@ -3533,8 +3533,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_RENDER_DEBUG)) )
{
#ifndef _CONTENT_PACKAGE
options->renderDebug = !options->renderDebug;
#ifdef _XBOX
app.EnableDebugOverlay(options->renderDebug,iPad);
#else
@@ -3544,6 +3542,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
#endif
}
if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_RENDER_DEBUG_SCREEN)) )
{
options->renderDebug = !options->renderDebug;
}
#if 0 //str1k3r - replaced this DPAD bind for opening the F3 Debug Menu
if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_SPAWN_CREEPER)) && app.GetMobsDontAttackEnabled())
{
//shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(Creeper::_class->newInstance( level ));
@@ -3552,6 +3556,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
mob->moveTo(player->x+1, player->y, player->z+1, level->random->nextFloat() * 360, 0);
level->addEntity(mob);
}
#endif
}
if( (player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_FLY_TOGGLE)) )
@@ -3710,7 +3715,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
// printf("Input Detected!\n");
//
// // see if we can react to this
// if(app.GetXuiAction(iPad)==eAppAction_Idle)
// if(app.GetUIAction(iPad)==eAppAction_Idle)
// {
// app.SetAction(iPad,eAppAction_DebugText,(LPVOID)wchInput);
// }