backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix

Browse source
This commit is contained in:
NSDeathman 2026-03-15 23:50:59 +03:00
parent 4592e80b95
commit 6a8ea75a44
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BuildScripts/postbuild.ps1
View file

@ -6,11 +6,7 @@ param(
Write-Host "Post-build script started. Output Directory: $OutDir, Project Directory: $ProjectDir" Write-Host "Post-build script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
$directories = @( $directories = @(
"Common\Media", "Windows64\GameHDD",
"Common\res",
"Common\Trial",
"Common\Tutorial",
"Windows64Media"
) )
foreach ($dir in $directories) { foreach ($dir in $directories) {

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

@ -10054,7 +10054,7 @@ enum ETitleUpdateTexturePacks
}; };
#ifdef _WINDOWS64 #ifdef _WINDOWS64
wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\"; wstring titleUpdateTexturePackRoot = L"Assets\\Win64\\DLC\\";
#elif defined(__ORBIS__) #elif defined(__ORBIS__)
wstring titleUpdateTexturePackRoot = L"/app0/orbis/CU/DLC/"; wstring titleUpdateTexturePackRoot = L"/app0/orbis/CU/DLC/";
#elif defined(__PSVITA__) #elif defined(__PSVITA__)

2
Minecraft.Client/Common/GameRules/GameRuleManager.cpp
View file

@ -663,7 +663,7 @@ void GameRuleManager::loadDefaultGameRules()
#ifdef _WINDOWS64 #ifdef _WINDOWS64
File packedTutorialFile(L"Assets\\Win64\\Tutorial\\Tutorial.pck"); File packedTutorialFile(L"Assets\\Win64\\Tutorial\\Tutorial.pck");
if(!packedTutorialFile.exists()) packedTutorialFile = File(L"Windows64\\Tutorial\\Tutorial.pck"); if(!packedTutorialFile.exists()) packedTutorialFile = File(L"Assets\\Win64\\Tutorial\\Tutorial.pck");
#elif defined(__ORBIS__) #elif defined(__ORBIS__)
File packedTutorialFile(L"/app0/orbis/Tutorial/Tutorial.pck"); File packedTutorialFile(L"/app0/orbis/Tutorial/Tutorial.pck");
#elif defined(__PSVITA__) #elif defined(__PSVITA__)

2
Minecraft.Client/Common/Network/GameNetworkManager.cpp
View file

@ -232,7 +232,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
#ifdef _WINDOWS64 #ifdef _WINDOWS64
wstring fileRoot = L"Assets\\Win64\\Tutorial\\" + param->levelGen->getBaseSavePath(); wstring fileRoot = L"Assets\\Win64\\Tutorial\\" + param->levelGen->getBaseSavePath();
File root(fileRoot); File root(fileRoot);
if(!root.exists()) fileRoot = L"Windows64\\Tutorial\\" + param->levelGen->getBaseSavePath(); if(!root.exists()) fileRoot = L"Assets\\Win64\\Tutorial\\" + param->levelGen->getBaseSavePath();
#elif defined(__ORBIS__) #elif defined(__ORBIS__)
wstring fileRoot = L"/app0/orbis/Tutorial/" + param->levelGen->getBaseSavePath(); wstring fileRoot = L"/app0/orbis/Tutorial/" + param->levelGen->getBaseSavePath();
#elif defined(__PSVITA__) #elif defined(__PSVITA__)

10
Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
View file

@ -774,7 +774,7 @@ void UIScene_LoadOrJoinMenu::tick()
wchar_t wFilename[MAX_SAVEFILENAME_LENGTH]; wchar_t wFilename[MAX_SAVEFILENAME_LENGTH];
ZeroMemory(wFilename, sizeof(wFilename)); ZeroMemory(wFilename, sizeof(wFilename));
mbstowcs(wFilename, m_pSaveDetails->SaveInfoA[origIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1); mbstowcs(wFilename, m_pSaveDetails->SaveInfoA[origIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
wstring filePath = wstring(L"Saves\\") + wstring(wFilename) + wstring(L"\\saveData.ms"); wstring filePath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\saveData.ms");
wstring levelName = ReadLevelNameFromSaveFile(filePath); wstring levelName = ReadLevelNameFromSaveFile(filePath);
if (!levelName.empty()) if (!levelName.empty())
{ {
@ -1016,9 +1016,9 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
uiSaveC = 0; uiSaveC = 0;
#ifdef _XBOX #ifdef _XBOX
File savesDir(L"GAME:\\Saves"); File savesDir(L"GAME:\\GameHDD\\");
#else #else
File savesDir(L"Saves"); File savesDir(L"Windows64\\GameHDD\\");
#endif #endif
if( savesDir.exists() ) if( savesDir.exists() )
{ {
@ -1432,7 +1432,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
// Build the sidecar path: Windows64\GameHDD\{folder}\worldname.txt // Build the sidecar path: Windows64\GameHDD\{folder}\worldname.txt
wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {}; wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
mbstowcs(wFilename, pClass->m_saveDetails[listPos].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1); mbstowcs(wFilename, pClass->m_saveDetails[listPos].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
wstring sidecarPath = wstring(L"Saves\\") + wstring(wFilename) + wstring(L"\\worldname.txt"); wstring sidecarPath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\worldname.txt");
FILE *fw = nullptr; FILE *fw = nullptr;
if (_wfopen_s(&fw, sidecarPath.c_str(), L"w") == 0 && fw) if (_wfopen_s(&fw, sidecarPath.c_str(), L"w") == 0 && fw)
@ -2424,7 +2424,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {}; wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
mbstowcs_s(nullptr, wFilename, MAX_SAVEFILENAME_LENGTH, pClass->m_saveDetails[displayIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1); mbstowcs_s(nullptr, wFilename, MAX_SAVEFILENAME_LENGTH, pClass->m_saveDetails[displayIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
wchar_t wFolderPath[MAX_PATH] = {}; wchar_t wFolderPath[MAX_PATH] = {};
swprintf_s(wFolderPath, MAX_PATH, L"Saves\\%s", wFilename); swprintf_s(wFolderPath, MAX_PATH, L"Windows64\\GameHDD\\%s", wFilename);
bSuccess = Win64_DeleteSaveDirectory(wFolderPath); bSuccess = Win64_DeleteSaveDirectory(wFolderPath);
} }
UIScene_LoadOrJoinMenu::DeleteSaveDataReturned((LPVOID)pClass->GetCallbackUniqueId(), bSuccess); UIScene_LoadOrJoinMenu::DeleteSaveDataReturned((LPVOID)pClass->GetCallbackUniqueId(), bSuccess);