LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-26 15:26:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: begin unglobbing std::vector

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:58:11 -06:00
committed by JuiceyDev
parent d2e8a0f9f5
commit 5fad08b9fd
286 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Minecraft.World/Level/Storage/McRegionLevelStorageSource.cpp
View File

@@ -32,12 +32,12 @@ std::wstring McRegionLevelStorageSource::getName()
return L"Scaevolus' McRegion";
}
vector<LevelSummary *> *McRegionLevelStorageSource::getLevelList()
std::vector<LevelSummary *> *McRegionLevelStorageSource::getLevelList()
{
// 4J Stu - We don't need to do directory lookups with the xbox save files
vector<LevelSummary *> *levels = new vector<LevelSummary *>;
std::vector<LevelSummary *> *levels = new std::vector<LevelSummary *>;
#if 0
vector<File *> *subFolders = baseDir.listFiles();
std::vector<File *> *subFolders = baseDir.listFiles();
File *file;
AUTO_VAR(itEnd, subFolders->end());
for (AUTO_VAR(it, subFolders->begin()); it != itEnd; it++)
@@ -117,10 +117,10 @@ bool McRegionLevelStorageSource::convertLevel(ConsoleSaveFile *saveFile, const s
#if 0
progress->progressStagePercentage(0);
vector<ChunkFile *> *normalRegions = new vector<ChunkFile *>;
vector<File *> *normalBaseFolders = new vector<File *>;
vector<ChunkFile *> *netherRegions = new vector<ChunkFile *>;
vector<File *> *netherBaseFolders = new vector<File *>;
std::vector<ChunkFile *> *normalRegions = new std::vector<ChunkFile *>;
std::vector<File *> *normalBaseFolders = new std::vector<File *>;
std::vector<ChunkFile *> *netherRegions = new std::vector<ChunkFile *>;
std::vector<File *> *netherBaseFolders = new std::vector<File *>;
ArrayList<ChunkFile> enderRegions = new ArrayList<ChunkFile>();
ArrayList<File> enderBaseFolders = new ArrayList<File>();
@@ -173,13 +173,13 @@ bool McRegionLevelStorageSource::convertLevel(ConsoleSaveFile *saveFile, const s
#if 0
// 4J - not required anymore
void McRegionLevelStorageSource::addRegions(File &baseFolder, vector<ChunkFile *> *dest, vector<File *> *firstLevelFolders)
void McRegionLevelStorageSource::addRegions(File &baseFolder, std::vector<ChunkFile *> *dest, std::vector<File *> *firstLevelFolders)
{
FolderFilter folderFilter;
ChunkFilter chunkFilter;
File *folder1;
vector<File *> *folderLevel1 = baseFolder.listFiles((FileFilter *) &folderFilter);
std::vector<File *> *folderLevel1 = baseFolder.listFiles((FileFilter *) &folderFilter);
AUTO_VAR(itEnd, folderLevel1->end());
for (AUTO_VAR(it, folderLevel1->begin()); it != itEnd; it++)
{
@@ -189,13 +189,13 @@ void McRegionLevelStorageSource::addRegions(File &baseFolder, vector<ChunkFile *
firstLevelFolders->push_back(folder1);
File *folder2;
vector<File *> *folderLevel2 = folder1->listFiles(&folderFilter);
std::vector<File *> *folderLevel2 = folder1->listFiles(&folderFilter);
AUTO_VAR(itEnd2, folderLevel2->end());
for (AUTO_VAR(it2, folderLevel2->begin()); it2 != itEnd; it2++)
{
folder2 = *it2; //folderLevel2->at(i2);
vector<File *> *chunkFiles = folder2->listFiles((FileFilter *) &chunkFilter);
std::vector<File *> *chunkFiles = folder2->listFiles((FileFilter *) &chunkFilter);
File *chunk;
AUTO_VAR(itEndFile, chunkFiles->end());
@@ -210,7 +210,7 @@ void McRegionLevelStorageSource::addRegions(File &baseFolder, vector<ChunkFile *
}
#endif
void McRegionLevelStorageSource::convertRegions(File &baseFolder, vector<ChunkFile *> *chunkFiles, int currentCount, int totalCount, ProgressListener *progress)
void McRegionLevelStorageSource::convertRegions(File &baseFolder, std::vector<ChunkFile *> *chunkFiles, int currentCount, int totalCount, ProgressListener *progress)
{
assert( false );
@@ -269,7 +269,7 @@ void McRegionLevelStorageSource::convertRegions(File &baseFolder, vector<ChunkFi
}
void McRegionLevelStorageSource::eraseFolders(vector<File *> *folders, int currentCount, int totalCount, ProgressListener *progress)
void McRegionLevelStorageSource::eraseFolders(std::vector<File *> *folders, int currentCount, int totalCount, ProgressListener *progress)
{
File *folder;
AUTO_VAR(itEnd, folders->end());
@@ -277,7 +277,7 @@ void McRegionLevelStorageSource::eraseFolders(vector<File *> *folders, int curre
{
folder = *it; //folders->at(i);
vector<File *> *files = folder->listFiles();
std::vector<File *> *files = folder->listFiles();
deleteRecursive(files);
folder->_delete();