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
2026-09-06 19:08:30 -04:00
parent 7b4821d329
commit afbd3fef00
36 changed files with 202 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/MinecraftServer.cpp
+18 -18
View File
@@ -1344,16 +1344,16 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
}
// Process delayed actions
eXuiServerAction eAction;
eUIServerAction eAction;
LPVOID param;
for(int i=0;i<XUSER_MAX_COUNT;i++)
{
eAction = app.GetXuiServerAction(i);
param = app.GetXuiServerActionParam(i);
eAction = app.GetUIServerAction(i);
param = app.GetUIServerActionParam(i);
switch(eAction)
{
case eXuiServerAction_AutoSaveGame:
case eUIServerAction_AutoSaveGame:
#if defined(_XBOX_ONE) || defined(__ORBIS__)
{
PIXBeginNamedEvent(0,"Autosave");
@@ -1402,7 +1402,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
}
break;
#endif
case eXuiServerAction_SaveGame:
case eUIServerAction_SaveGame:
app.EnterSaveNotificationSection();
if (players != NULL)
{
@@ -1418,7 +1418,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
// with the data from the nethers leveldata.
// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
ServerLevel *level = levels[levels.length - 1 - j];
level->save(true, Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));
level->save(true, Minecraft::GetInstance()->progressRenderer, (eAction==eUIServerAction_AutoSaveGame));
players->broadcastAll( shared_ptr<UpdateProgressPacket>( new UpdateProgressPacket(33 + (j*33) ) ) );
}
@@ -1426,11 +1426,11 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
{
saveGameRules();
levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));
levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, (eAction==eUIServerAction_AutoSaveGame));
}
app.LeaveSaveNotificationSection();
break;
case eXuiServerAction_DropItem:
case eUIServerAction_DropItem:
// Find the player, and drop the id at their feet
{
shared_ptr<ServerPlayer> player = players->players.at(0);
@@ -1438,7 +1438,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
player->drop( shared_ptr<ItemInstance>( new ItemInstance(id, 1, 0 ) ) );
}
break;
case eXuiServerAction_SpawnMob:
case eUIServerAction_SpawnMob:
{
shared_ptr<ServerPlayer> player = players->players.at(0);
eINSTANCEOF factory = (eINSTANCEOF)((size_t)param);
@@ -1448,38 +1448,38 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
player->level->addEntity(mob);
}
break;
case eXuiServerAction_PauseServer:
case eUIServerAction_PauseServer:
m_isServerPaused = ( (size_t) param == TRUE );
if( m_isServerPaused )
{
m_serverPausedEvent->Set();
}
break;
case eXuiServerAction_ToggleRain:
case eUIServerAction_ToggleRain:
{
bool isRaining = levels[0]->getLevelData()->isRaining();
levels[0]->getLevelData()->setRaining(!isRaining);
levels[0]->getLevelData()->setRainTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
}
break;
case eXuiServerAction_ToggleThunder:
case eUIServerAction_ToggleThunder:
{
bool isThundering = levels[0]->getLevelData()->isThundering();
levels[0]->getLevelData()->setThundering(!isThundering);
levels[0]->getLevelData()->setThunderTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
}
break;
case eXuiServerAction_ServerSettingChanged_Gamertags:
case eUIServerAction_ServerSettingChanged_Gamertags:
players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_OPTIONS, app.GetGameHostOption(eGameHostOption_Gamertags)) ) );
break;
case eXuiServerAction_ServerSettingChanged_BedrockFog:
case eUIServerAction_ServerSettingChanged_BedrockFog:
players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, app.GetGameHostOption(eGameHostOption_All)) ) );
break;
case eXuiServerAction_ServerSettingChanged_Difficulty:
case eUIServerAction_ServerSettingChanged_Difficulty:
players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_DIFFICULTY, Minecraft::GetInstance()->options->difficulty) ) );
break;
case eXuiServerAction_ExportSchematic:
case eUIServerAction_ExportSchematic:
#ifndef _CONTENT_PACKAGE
app.EnterSaveNotificationSection();
@@ -1510,7 +1510,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
app.LeaveSaveNotificationSection();
#endif
break;
case eXuiServerAction_SetCameraLocation:
case eUIServerAction_SetCameraLocation:
#ifndef _CONTENT_PACKAGE
{
DebugSetCameraPosition *pos = (DebugSetCameraPosition *)param;
@@ -1533,7 +1533,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
break;
}
app.SetXuiServerAction(i,eXuiServerAction_Idle);
app.SetUIServerAction(i,eUIServerAction_Idle);
}
Sleep(1);