Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
View File

@@ -148,7 +148,7 @@ This should be tracked independently of saved games (restoring a save should not
*/
INT CTelemetryManager::GetSecondsSinceInitialize()
{
return static_cast<INT>(app.getAppTime() - m_initialiseTime);
return (INT)(app.getAppTime() - m_initialiseTime);
}
/*
@@ -165,21 +165,21 @@ INT CTelemetryManager::GetMode(DWORD dwUserId)
Minecraft *pMinecraft = Minecraft::GetInstance();
if( pMinecraft->localplayers[dwUserId] != nullptr && pMinecraft->localplayers[dwUserId]->level != nullptr && pMinecraft->localplayers[dwUserId]->level->getLevelData() != nullptr )
if( pMinecraft->localplayers[dwUserId] != NULL && pMinecraft->localplayers[dwUserId]->level != NULL && pMinecraft->localplayers[dwUserId]->level->getLevelData() != NULL )
{
GameType *gameType = pMinecraft->localplayers[dwUserId]->level->getLevelData()->getGameType();
if (gameType->isSurvival())
{
mode = static_cast<INT>(eTelem_ModeId_Survival);
mode = (INT)eTelem_ModeId_Survival;
}
else if (gameType->isCreative())
{
mode = static_cast<INT>(eTelem_ModeId_Creative);
mode = (INT)eTelem_ModeId_Creative;
}
else
{
mode = static_cast<INT>(eTelem_ModeId_Undefined);
mode = (INT)eTelem_ModeId_Undefined;
}
}
return mode;
@@ -198,11 +198,11 @@ INT CTelemetryManager::GetSubMode(DWORD dwUserId)
if(Minecraft::GetInstance()->isTutorial())
{
subMode = static_cast<INT>(eTelem_SubModeId_Tutorial);
subMode = (INT)eTelem_SubModeId_Tutorial;
}
else
{
subMode = static_cast<INT>(eTelem_SubModeId_Normal);
subMode = (INT)eTelem_SubModeId_Normal;
}
return subMode;
@@ -220,7 +220,7 @@ INT CTelemetryManager::GetLevelId(DWORD dwUserId)
{
INT levelId = (INT)eTelem_LevelId_Undefined;
levelId = static_cast<INT>(eTelem_LevelId_PlayerGeneratedLevel);
levelId = (INT)eTelem_LevelId_PlayerGeneratedLevel;
return levelId;
}
@@ -237,18 +237,18 @@ INT CTelemetryManager::GetSubLevelId(DWORD dwUserId)
Minecraft *pMinecraft = Minecraft::GetInstance();
if(pMinecraft->localplayers[dwUserId] != nullptr)
if(pMinecraft->localplayers[dwUserId] != NULL)
{
switch(pMinecraft->localplayers[dwUserId]->dimension)
{
case 0:
subLevelId = static_cast<INT>(eTelem_SubLevelId_Overworld);
subLevelId = (INT)eTelem_SubLevelId_Overworld;
break;
case -1:
subLevelId = static_cast<INT>(eTelem_SubLevelId_Nether);
subLevelId = (INT)eTelem_SubLevelId_Nether;
break;
case 1:
subLevelId = static_cast<INT>(eTelem_SubLevelId_End);
subLevelId = (INT)eTelem_SubLevelId_End;
break;
};
}
@@ -272,7 +272,7 @@ Helps differentiate level attempts when a play plays the same mode/level - espec
*/
INT CTelemetryManager::GetLevelInstanceID()
{
return static_cast<INT>(m_levelInstanceID);
return (INT)m_levelInstanceID;
}
/*
@@ -314,19 +314,19 @@ INT CTelemetryManager::GetSingleOrMultiplayer()
if(app.GetLocalPlayerCount() == 1 && g_NetworkManager.GetOnlinePlayerCount() == 0)
{
singleOrMultiplayer = static_cast<INT>(eSen_SingleOrMultiplayer_Single_Player);
singleOrMultiplayer = (INT)eSen_SingleOrMultiplayer_Single_Player;
}
else if(app.GetLocalPlayerCount() > 1 && g_NetworkManager.GetOnlinePlayerCount() == 0)
{
singleOrMultiplayer = static_cast<INT>(eSen_SingleOrMultiplayer_Multiplayer_Local);
singleOrMultiplayer = (INT)eSen_SingleOrMultiplayer_Multiplayer_Local;
}
else if(app.GetLocalPlayerCount() == 1 && g_NetworkManager.GetOnlinePlayerCount() > 0)
{
singleOrMultiplayer = static_cast<INT>(eSen_SingleOrMultiplayer_Multiplayer_Live);
singleOrMultiplayer = (INT)eSen_SingleOrMultiplayer_Multiplayer_Live;
}
else if(app.GetLocalPlayerCount() > 1 && g_NetworkManager.GetOnlinePlayerCount() > 0)
{
singleOrMultiplayer = static_cast<INT>(eSen_SingleOrMultiplayer_Multiplayer_Both_Local_and_Live);
singleOrMultiplayer = (INT)eSen_SingleOrMultiplayer_Multiplayer_Both_Local_and_Live;
}
return singleOrMultiplayer;
@@ -343,16 +343,16 @@ INT CTelemetryManager::GetDifficultyLevel(INT diff)
switch(diff)
{
case 0:
difficultyLevel = static_cast<INT>(eSen_DifficultyLevel_Easiest);
difficultyLevel = (INT)eSen_DifficultyLevel_Easiest;
break;
case 1:
difficultyLevel = static_cast<INT>(eSen_DifficultyLevel_Easier);
difficultyLevel = (INT)eSen_DifficultyLevel_Easier;
break;
case 2:
difficultyLevel = static_cast<INT>(eSen_DifficultyLevel_Normal);
difficultyLevel = (INT)eSen_DifficultyLevel_Normal;
break;
case 3:
difficultyLevel = static_cast<INT>(eSen_DifficultyLevel_Harder);
difficultyLevel = (INT)eSen_DifficultyLevel_Harder;
break;
}
@@ -372,11 +372,11 @@ INT CTelemetryManager::GetLicense()
if(ProfileManager.IsFullVersion())
{
license = static_cast<INT>(eSen_License_Full_Purchased_Title);
license = (INT)eSen_License_Full_Purchased_Title;
}
else
{
license = static_cast<INT>(eSen_License_Trial_or_Demo);
license = (INT)eSen_License_Trial_or_Demo;
}
return license;
}
@@ -411,15 +411,15 @@ INT CTelemetryManager::GetAudioSettings(DWORD dwUserId)
if(volume == 0)
{
audioSettings = static_cast<INT>(eSen_AudioSettings_Off);
audioSettings = (INT)eSen_AudioSettings_Off;
}
else if(volume == DEFAULT_VOLUME_LEVEL)
{
audioSettings = static_cast<INT>(eSen_AudioSettings_On_Default);
audioSettings = (INT)eSen_AudioSettings_On_Default;
}
else
{
audioSettings = static_cast<INT>(eSen_AudioSettings_On_CustomSetting);
audioSettings = (INT)eSen_AudioSettings_On_CustomSetting;
}
}
return audioSettings;