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

chore: format Minecraft.World

Browse Source
This commit is contained in:
Tropical
2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
View File

@@ -7,97 +7,96 @@
#include "../../IO/Files/File.h"
#include "McRegionLevelStorage.h"
McRegionLevelStorage::McRegionLevelStorage(ConsoleSaveFile *saveFile, File dir, const std::wstring& levelName, bool createPlayerDir)
: DirectoryLevelStorage(saveFile, dir, levelName, createPlayerDir)
{
RegionFileCache::clear();
McRegionLevelStorage::McRegionLevelStorage(ConsoleSaveFile* saveFile, File dir,
const std::wstring& levelName,
bool createPlayerDir)
: DirectoryLevelStorage(saveFile, dir, levelName, createPlayerDir) {
RegionFileCache::clear();
}
McRegionLevelStorage::~McRegionLevelStorage()
{
// Make sure cache is clear, as the DirectoryLevelStorage destructor is going to be deleting the underlying ConsoleSaveFile
// reference so we don't want the RegionFileCache to still be referencing it either
RegionFileCache::clear();
McRegionLevelStorage::~McRegionLevelStorage() {
// Make sure cache is clear, as the DirectoryLevelStorage destructor is
// going to be deleting the underlying ConsoleSaveFile reference so we don't
// want the RegionFileCache to still be referencing it either
RegionFileCache::clear();
}
ChunkStorage *McRegionLevelStorage::createChunkStorage(Dimension *dimension)
{
//File folder = getFolder();
ChunkStorage* McRegionLevelStorage::createChunkStorage(Dimension* dimension) {
// File folder = getFolder();
if (dynamic_cast<HellDimension *>(dimension) != NULL)
{
if(app.GetResetNether())
{
if (dynamic_cast<HellDimension*>(dimension) != NULL) {
if (app.GetResetNether()) {
#ifdef SPLIT_SAVES
std::vector<FileEntry *> *netherFiles = m_saveFile->getRegionFilesByDimension(1);
if(netherFiles!=NULL)
{
unsigned int bytesWritten = 0;
for(AUTO_VAR(it, netherFiles->begin()); it != netherFiles->end(); ++it)
{
m_saveFile->zeroFile(*it, (*it)->getFileSize(), &bytesWritten);
}
delete netherFiles;
}
std::vector<FileEntry*>* netherFiles =
m_saveFile->getRegionFilesByDimension(1);
if (netherFiles != NULL) {
unsigned int bytesWritten = 0;
for (AUTO_VAR(it, netherFiles->begin());
it != netherFiles->end(); ++it) {
m_saveFile->zeroFile(*it, (*it)->getFileSize(),
&bytesWritten);
}
delete netherFiles;
}
#else
std::vector<FileEntry *> *netherFiles = m_saveFile->getFilesWithPrefix(LevelStorage::NETHER_FOLDER);
if(netherFiles!=NULL)
{
for(AUTO_VAR(it, netherFiles->begin()); it != netherFiles->end(); ++it)
{
m_saveFile->deleteFile(*it);
}
delete netherFiles;
}
std::vector<FileEntry*>* netherFiles =
m_saveFile->getFilesWithPrefix(LevelStorage::NETHER_FOLDER);
if (netherFiles != NULL) {
for (AUTO_VAR(it, netherFiles->begin());
it != netherFiles->end(); ++it) {
m_saveFile->deleteFile(*it);
}
delete netherFiles;
}
#endif
resetNetherPlayerPositions();
}
resetNetherPlayerPositions();
}
return new McRegionChunkStorage(m_saveFile, LevelStorage::NETHER_FOLDER);
return new McRegionChunkStorage(m_saveFile,
LevelStorage::NETHER_FOLDER);
}
if (dynamic_cast<TheEndDimension *>(dimension))
{
//File dir2 = new File(folder, LevelStorage.ENDER_FOLDER);
//dir2.mkdirs();
//return new ThreadedMcRegionChunkStorage(dir2);
// 4J-PB - save version 0 at this point means it's a create new world
int iSaveVersion=m_saveFile->getSaveVersion();
if((iSaveVersion!=0) && (iSaveVersion < SAVE_FILE_VERSION_NEW_END))
{
// For versions before TU9 (TU7 and 8) we generate a part of The End, but we want to scrap it if it exists so that it is replaced with the TU9+ version
app.DebugPrintf("Loaded save version number is: %d, required to keep The End is: %d\n",m_saveFile->getSaveVersion(), SAVE_FILE_VERSION_NEW_END);
if (dynamic_cast<TheEndDimension*>(dimension)) {
// File dir2 = new File(folder, LevelStorage.ENDER_FOLDER);
// dir2.mkdirs();
// return new ThreadedMcRegionChunkStorage(dir2);
std::vector<FileEntry *> *endFiles = m_saveFile->getFilesWithPrefix(LevelStorage::ENDER_FOLDER);
// 4J-PB - save version 0 at this point means it's a create new world
int iSaveVersion = m_saveFile->getSaveVersion();
// 4J-PB - There will be no End in early saves
if(endFiles!=NULL)
{
for(AUTO_VAR(it, endFiles->begin()); it != endFiles->end(); ++it)
{
m_saveFile->deleteFile(*it);
}
delete endFiles;
}
}
return new McRegionChunkStorage(m_saveFile, LevelStorage::ENDER_FOLDER);
}
if ((iSaveVersion != 0) && (iSaveVersion < SAVE_FILE_VERSION_NEW_END)) {
// For versions before TU9 (TU7 and 8) we generate a part of The
// End, but we want to scrap it if it exists so that it is replaced
// with the TU9+ version
app.DebugPrintf(
"Loaded save version number is: %d, required to keep The End "
"is: %d\n",
m_saveFile->getSaveVersion(), SAVE_FILE_VERSION_NEW_END);
std::vector<FileEntry*>* endFiles =
m_saveFile->getFilesWithPrefix(LevelStorage::ENDER_FOLDER);
// 4J-PB - There will be no End in early saves
if (endFiles != NULL) {
for (AUTO_VAR(it, endFiles->begin()); it != endFiles->end();
++it) {
m_saveFile->deleteFile(*it);
}
delete endFiles;
}
}
return new McRegionChunkStorage(m_saveFile, LevelStorage::ENDER_FOLDER);
}
return new McRegionChunkStorage(m_saveFile, L"");
}
void McRegionLevelStorage::saveLevelData(LevelData *levelData, std::vector<std::shared_ptr<Player> > *players)
{
void McRegionLevelStorage::saveLevelData(
LevelData* levelData, std::vector<std::shared_ptr<Player> >* players) {
levelData->setVersion(MCREGION_VERSION_ID);
MemSect(38);
MemSect(38);
DirectoryLevelStorage::saveLevelData(levelData, players);
MemSect(0);
MemSect(0);
}
void McRegionLevelStorage::closeAll()
{
RegionFileCache::clear();
}
void McRegionLevelStorage::closeAll() { RegionFileCache::clear(); }