LegacyConsole/GabsPuNs-MinecraftConsoles
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git synced 2026-06-22 19:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Folder Path Changes.

Browse Source
This commit is contained in:
GabsPuNs
2026-04-27 00:26:35 -04:00
parent d7478637b0
commit 1753c661f3
530 changed files with 60 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp
View File

@@ -715,7 +715,7 @@ int UIScene_LoadCreateJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam, PB
{
app.DebugPrintf("Save thumbnail data is nullptr, or has size 0\n");
wstring wsName = L"Graphics\\MinecraftIcon.png";
wstring wsName = L"Graphics/MinecraftIcon.png";
byteArray baIcon = app.getArchiveFile(wsName);
pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = baIcon.data;
pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].dwThumbnailSize = baIcon.length;
@@ -1588,7 +1588,7 @@ void UIScene_LoadCreateJoinMenu::tick()
ZeroMemory(wSaveTitle, sizeof(wSaveTitle));
mbstowcs_s(nullptr, wSaveTitle, MAX_DISPLAYNAME_LENGTH, m_pSaveDetails->SaveInfoA[origIdx].UTF8SaveTitle, _TRUNCATE);
wstring filePath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + std::wstring(wSaveTitle) + L".ms";
wstring filePath = wstring(L"Data/Saves/") + wstring(wFilename) + std::wstring(wSaveTitle) + L".ms";
HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
DWORD fileSize = 0;
@@ -3300,52 +3300,6 @@ ui.NavigateToScene (ProfileManager.GetPrimaryPad(), eUIScene_FullscreenProgress,
#endif //SONY_REMOTE_STORAGE_DOWNLOAD
#ifdef _WINDOWS64
static bool Win64_DeleteSaveDirectory(const wchar_t* wPath)
{
wchar_t wSearch[MAX_PATH];
swprintf_s(wSearch, MAX_PATH, L"%s\\*", wPath);
WIN32_FIND_DATAW fd;
HANDLE hFind = FindFirstFileW(wSearch, &fd);
if (hFind != INVALID_HANDLE_VALUE)
{
do
{
if (wcscmp(fd.cFileName, L".") == 0 || wcscmp(fd.cFileName, L"..") == 0)
continue;
wchar_t wChild[MAX_PATH];
swprintf_s(wChild, MAX_PATH, L"%s\\%s", wPath, fd.cFileName);
if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
Win64_DeleteSaveDirectory(wChild);
else
DeleteFileW(wChild);
}
while (FindNextFileW(hFind, &fd));
FindClose(hFind);
}
return RemoveDirectoryW(wPath) != 0;
}
#endif // _WINDOWS64
int UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
{
auto* pClass = static_cast<UIScene_LoadCreateJoinMenu*>(pParam);
@@ -3360,25 +3314,14 @@ int UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C
pClass->m_bIgnoreInput=false;
else
{
#ifdef _WINDOWS64
{
// Use m_saveDetails (sorted display order) so the correct folder is targeted
int displayIdx = pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC;
bool bSuccess = false;
if (pClass->m_saveDetails && displayIdx >= 0 && pClass->m_saveDetails[displayIdx].UTF8SaveFilename[0])
{
std::string narrowFilename(pClass->m_saveDetails[displayIdx].UTF8SaveFilename);
std::wstring wFilename(narrowFilename.begin(), narrowFilename.end());
std::wstring wFolderPath = L"Windows64\\GameHDD\\" + wFilename;
bSuccess = Win64_DeleteSaveDirectory(wFolderPath.c_str());
}
UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned(reinterpret_cast<LPVOID>(pClass->GetCallbackUniqueId()), bSuccess);
}
#else
StorageManager.DeleteSaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC], UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned, reinterpret_cast<LPVOID>(pClass->GetCallbackUniqueId())
);
#endif
int displayIdx = pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC;
if (pClass->m_saveDetails && displayIdx >= 0 && pClass->m_saveDetails[displayIdx].UTF8SaveFilename[0])
{
auto pSaveInfo = &pClass->m_pSaveDetails->SaveInfo[pClass->m_saveDetails[displayIdx].saveId];
StorageManager.DeleteSaveData(pSaveInfo, UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned, (LPVOID)pClass->GetCallbackUniqueId());
}
pClass->m_controlSavesTimer.setVisible( true );
}
}