backups/MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-04-29 10:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add setting data version variables and introduce settingfixer system

Browse source
This commit is contained in:
jvnpr 2026-03-10 03:49:00 -05:00
parent d7596aa28c
commit 6449cd82c3
5 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Minecraft.Client/Common/App_enums.h
View file

@ -178,6 +178,9 @@ enum eGameSetting
// PSVita
eGameSetting_PSVita_NetworkModeAdhoc,
// Add setting data version
eGameSetting_SettingDataVersion,
};

2
Minecraft.Client/Common/App_structs.h
View file

@ -108,6 +108,8 @@ typedef struct
// was 192
//unsigned char ucUnused[192-TUTORIAL_PROFILE_STORAGE_BYTES-sizeof(DWORD)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(LONG)-sizeof(LONG)-sizeof(DWORD)];
// 4J-PB - don't need to define the padded space, the union with ucReservedSpace will make the sizeof GAME_SETTINGS correct
unsigned int uiSettingDataVersion;
};
unsigned char ucReservedSpace[192];

40
Minecraft.Client/Common/Consoles_App.cpp
View file

@ -84,6 +84,8 @@ int CMinecraftApp::s_iHTMLFontSizesA[eHTMLSize_COUNT] =
#endif
};
// jvnpr -- update this anytime settingfixer needs to convert old settings to new settings!
const int currentSettingDataVersion = 1;
CMinecraftApp::CMinecraftApp()
{
@ -904,6 +906,8 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
app.SetGameHostOption(eGameHostOption_NaturalRegeneration, 1 );
app.SetGameHostOption(eGameHostOption_DoDaylightCycle, 1 );
app.SetGameSettings(iPad, eGameSetting_SettingDataVersion, currentSettingDataVersion);
// 4J-PB - leave these in, or remove from everywhere they are referenced!
// Although probably best to leave in unless we split the profile settings into platform specific classes - having different meaning per platform for the same bitmask could get confusing
//#ifdef __PS3__
@ -1362,6 +1366,7 @@ void CMinecraftApp::ApplyGameSettingsChanged(int iPad)
ActionGameSettings(iPad,eGameSetting_PS3_EULA_Read);
ActionGameSettings(iPad,eGameSetting_SettingDataVersion);
}
void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
@ -1596,9 +1601,33 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
case eGameSetting_PSVita_NetworkModeAdhoc:
//nothing to do here
break;
case eGameSetting_SettingDataVersion:
break;
}
}
void CMinecraftApp::SettingFixer()
{
unsigned int version = ProfileManager.GetPrimaryPad()]->uiSettingDataVersion
if (GameSettingsA[version != currentSettingDataVersion)
{
DebugPrintf("[SettingFixer]: Fixing Settings!\n");
/* ex:
if (version < 1) fix v1 setting changes;
if (version < 2) fix v2 setting changes;
...
*/
}
else
{
DebugPrintf("[SettingFixer]: Nothing to do.\n");
}
GameSettingsA[ProfileManager.GetPrimaryPad()]->uiSettingDataVersion = currentSettingDataVersion;
}
void CMinecraftApp::SetPlayerSkin(int iPad,const wstring &name)
{
DWORD skinId = app.getSkinIdFromPath(name);
@ -2306,7 +2335,14 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
GameSettingsA[iPad]->bSettingsChanged=true;
}
break;
case eGameSetting_SettingDataVersion:
if (GameSettingsA[iPad]->uiSettingDataVersion != ucVal)
{
GameSettingsA[iPad]->uiSettingDataVersion = ucVal;
ActionGameSettings(iPad, eVal);
GameSettingsA[iPad]->bSettingsChanged = true;
}
}
}
@ -2441,7 +2477,9 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
case eGameSetting_PSVita_NetworkModeAdhoc:
return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_PSVITANETWORKMODEADHOC)>>17;
case eGameSetting_SettingDataVersion:
return GameSettingsA[iPad]->uiSettingDataVersion;
}
return 0;
}

1
Minecraft.Client/Common/Consoles_App.h
View file

@ -241,6 +241,7 @@ public:
void SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucVal);
unsigned char GetGameSettings(int iPad,eGameSetting eVal);
unsigned char GetGameSettings(eGameSetting eVal); // for the primary pad
void SettingFixer(); // jvnpr -- used to convert any old settings values to new settings based on uiSettingDataVersion / eGameSetting_SettingDataVersion
void SetPlayerSkin(int iPad,const wstring &name);
void SetPlayerSkin(int iPad,DWORD dwSkinId);
void SetPlayerCape(int iPad,const wstring &name);

1
Minecraft.Client/Windows64/Windows64_Minecraft.cpp
View file

@ -1345,6 +1345,7 @@ static Minecraft* InitialiseMinecraftRuntime()
return nullptr;
app.InitGameSettings();
app.SettingFixer();
app.InitialiseTips();
return pMinecraft;