NaN/cafeberry
0
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main' into networking

Browse Source
This commit is contained in:
str1k3r
2026-09-06 09:33:19 -04:00
parent 5065c28b5c 7b4821d329
commit 83e11bdf9b
1476 changed files with 260663 additions and 269030 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Minecraft.cpp
+12 -5
View File
@@ -224,7 +224,8 @@ Minecraft::Minecraft(Component *mouseComponent, Canvas *parent, MinecraftApplet
// 4J-PB - Removed it from here on Orbis due to it causing a crash with the network init.
// We should work out why...
#ifndef __ORBIS__
//str1k3r - removed on Windows64 as the SoundEngine was starting really late
#if !(defined __ORBIS__ || _WINDOWS64)
this->soundEngine->init(NULL);
#endif
@@ -1407,7 +1408,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
@@ -3327,7 +3329,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) )
@@ -3475,8 +3477,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
@@ -3486,6 +3486,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 ));
@@ -3494,6 +3500,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)) )