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

chore: cleanup names

Browse Source
This commit is contained in:
str1k3r committed 2026-09-06 19:08:30 -04:00
1 parent 7b4821d329
commit afbd3fef00
36 files changed
+202 -251
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
+4 -4
View File
@@ -126,7 +126,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
if(nIndex<m_itemIds.size())
{
int id = m_itemIds[nIndex];
//app.SetXuiServerAction(pNotifyPressData->UserIndex, eXuiServerAction_DropItem, (void *)id);
//app.SetUIServerAction(pNotifyPressData->UserIndex, eUIServerAction_DropItem, (void *)id);
ClientConnection *conn = Minecraft::GetInstance()->getConnection(ProfileManager.GetPrimaryPad());
conn->send( GiveItemCommand::preparePacket(dynamic_pointer_cast<Player>(Minecraft::GetInstance()->localplayers[ProfileManager.GetPrimaryPad()]), id) );
}
@@ -136,7 +136,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
nIndex = m_mobs.GetCurSel();
if(nIndex<m_mobFactories.size())
{
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SpawnMob,(void *)m_mobFactories[nIndex]);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_SpawnMob,(void *)m_mobFactories[nIndex]);
}
}
else if ( hObjPressed == m_enchantments )
@@ -200,13 +200,13 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
}
else if( hObjPressed == m_toggleRain )
{
//app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_ToggleRain);
//app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_ToggleRain);
ClientConnection *conn = Minecraft::GetInstance()->getConnection(ProfileManager.GetPrimaryPad());
conn->send( ToggleDownfallCommand::preparePacket() );
}
else if( hObjPressed == m_toggleThunder )
{
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_ToggleThunder);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_ToggleThunder);
}
else if( hObjPressed == m_resetTutorial )
{
Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ HRESULT CScene_DebugSchematicCreator::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINo
#endif
m_data->compressionType = Compression::eCompressionType_RLE;
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_ExportSchematic, (void *)m_data);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(), eUIServerAction_ExportSchematic, (void *)m_data);
NavigateBack();
rfHandled = TRUE;
Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
+2 -2
View File
@@ -68,8 +68,8 @@ HRESULT CScene_DebugSetCamera::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPre
if (hObjPressed == m_teleport)
{
app.SetXuiServerAction( ProfileManager.GetPrimaryPad(),
eXuiServerAction_SetCameraLocation,
app.SetUIServerAction( ProfileManager.GetPrimaryPad(),
eUIServerAction_SetCameraLocation,
(void *)currentPosition);
rfHandled = TRUE;
}
Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
+10 -10
View File
@@ -152,7 +152,7 @@ HRESULT UIScene_PauseMenu::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
{
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)TRUE);
}
TelemetryManager->RecordMenuShown(m_iPad, eUIScene_PauseMenu, 0);
@@ -190,7 +190,7 @@ HRESULT UIScene_PauseMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
case BUTTON_PAUSE_RESUMEGAME:
if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
{
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
}
app.CloseXuiScenes(pNotifyPressData->UserIndex);
break;
@@ -441,7 +441,7 @@ HRESULT UIScene_PauseMenu::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandle
if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
{
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
}
CXuiSceneBase::PlayUISFX(eSFX_Back);
@@ -477,7 +477,7 @@ HRESULT UIScene_PauseMenu::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandle
bool bCanScreenshot = true;
for(int j=0; j < XUSER_MAX_COUNT;++j)
{
if(app.GetXuiAction(j) == eAppAction_SocialPostScreenshot)
if(app.GetUIAction(j) == eAppAction_SocialPostScreenshot)
{
bCanScreenshot = false;
break;
@@ -579,7 +579,7 @@ HRESULT UIScene_PauseMenu::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
{
if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
{
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
}
app.CloseXuiScenes(m_iPad);
@@ -610,7 +610,7 @@ int UIScene_PauseMenu::BanGameDialogReturned(void *pParam,int iPad,C4JStorage::E
if(result==C4JStorage::EMessage_ResultDecline)
{
// 4J Stu - Only do this if we are currently idle, don't want the (relatively) low priority ban task overriding something else
if(app.GetXuiAction(iPad) == eAppAction_Idle) app.SetAction(iPad,eAppAction_BanLevel);
if(app.GetUIAction(iPad) == eAppAction_Idle) app.SetAction(iPad,eAppAction_BanLevel);
}
return 0;
}
@@ -702,7 +702,7 @@ HRESULT UIScene_PauseMenu::OnDestroy()
if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
{
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
}
return S_OK;
@@ -974,11 +974,11 @@ int UIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
bool bAutosave=(bool)lpParameter;
if(bAutosave)
{
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_AutoSaveGame);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_AutoSaveGame);
}
else
{
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SaveGame);
app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_SaveGame);
}
// Share AABB & Vec3 pools with default (main thread) - should be ok as long as we don't tick the main thread whilst this thread is running
@@ -994,7 +994,7 @@ int UIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
{
app.SetGameStarted(false);
while( app.GetXuiServerAction(ProfileManager.GetPrimaryPad() ) != eXuiServerAction_Idle && !MinecraftServer::serverHalted() )
while( app.GetUIServerAction(ProfileManager.GetPrimaryPad() ) != eUIServerAction_Idle && !MinecraftServer::serverHalted() )
{
Sleep(10);
}
Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
+2 -2
View File
@@ -164,7 +164,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
for(int i=0;i<XUSER_MAX_COUNT;i++)
{
bCheckTexturePack= app.GetGameStarted() && (ui.GetMenuDisplayed(0)==false) && (app.GetXuiAction(i)==eAppAction_Idle);
bCheckTexturePack= app.GetGameStarted() && (ui.GetMenuDisplayed(0)==false) && (app.GetUIAction(i)==eAppAction_Idle);
}
// make sure there's not a mount going on before using the textures
@@ -469,7 +469,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
CustomMessage_TickScene( &xuiMsg );
XuiSendMessage( app.GetCurrentHUDScene(i), &xuiMsg );
bool bDisplayGui=app.GetGameStarted() && !ui.GetMenuDisplayed(i) && !(app.GetXuiAction(i)==eAppAction_AutosaveSaveGameCapturedThumbnail) && app.GetGameSettings(i,eGameSetting_DisplayHUD)!=0;
bool bDisplayGui=app.GetGameStarted() && !ui.GetMenuDisplayed(i) && !(app.GetUIAction(i)==eAppAction_AutosaveSaveGameCapturedThumbnail) && app.GetGameSettings(i,eGameSetting_DisplayHUD)!=0;
if(bDisplayGui && pMinecraft->localplayers[i] != NULL)
{
XuiElementSetShow(app.GetCurrentHUDScene(i),TRUE);