mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-04-24 19:03:43 +00:00
# Conflicts: # Minecraft.Client/Network/PlayerChunkMap.cpp # Minecraft.Client/Network/PlayerList.cpp # Minecraft.Client/Network/ServerChunkCache.cpp # Minecraft.Client/Platform/Common/Consoles_App.cpp # Minecraft.Client/Platform/Common/DLC/DLCManager.cpp # Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp # Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp # Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp # Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp # Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp # Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp # Minecraft.Client/Platform/Common/UI/UIController.cpp # Minecraft.Client/Platform/Common/UI/UIController.h # Minecraft.Client/Platform/Extrax64Stubs.cpp # Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h # Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h # Minecraft.Client/Player/EntityTracker.cpp # Minecraft.Client/Player/ServerPlayer.cpp # Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp # Minecraft.Client/Textures/Packs/DLCTexturePack.cpp # Minecraft.Client/Textures/Stitching/StitchedTexture.cpp # Minecraft.Client/Textures/Stitching/TextureMap.cpp # Minecraft.Client/Textures/Textures.cpp # Minecraft.World/Blocks/NotGateTile.cpp # Minecraft.World/Blocks/PressurePlateTile.cpp # Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp # Minecraft.World/Enchantments/EnchantmentHelper.cpp # Minecraft.World/Entities/HangingEntity.cpp # Minecraft.World/Entities/LeashFenceKnotEntity.cpp # Minecraft.World/Entities/LivingEntity.cpp # Minecraft.World/Entities/Mobs/Boat.cpp # Minecraft.World/Entities/Mobs/Minecart.cpp # Minecraft.World/Entities/Mobs/Witch.cpp # Minecraft.World/Entities/SyncedEntityData.cpp # Minecraft.World/Items/LeashItem.cpp # Minecraft.World/Items/PotionItem.cpp # Minecraft.World/Level/BaseMobSpawner.cpp # Minecraft.World/Level/CustomLevelSource.cpp # Minecraft.World/Level/Level.cpp # Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp # Minecraft.World/Level/Storage/McRegionLevelStorage.cpp # Minecraft.World/Level/Storage/RegionFileCache.cpp # Minecraft.World/Player/Player.cpp # Minecraft.World/WorldGen/Biomes/BiomeCache.cpp # Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp # Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
102 lines
4 KiB
C++
102 lines
4 KiB
C++
#include "../../Platform/stdafx.h"
|
|
#include "../../Headers/net.minecraft.world.entity.player.h"
|
|
#include "../../Headers/net.minecraft.world.level.chunk.storage.h"
|
|
#include "../../Headers/net.minecraft.world.level.dimension.h"
|
|
#include "../../IO/Files/ConsoleSaveFileIO.h"
|
|
#include "../LevelData.h"
|
|
#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() {
|
|
// 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();
|
|
|
|
if (dynamic_cast<HellDimension*>(dimension) != nullptr) {
|
|
if (app.GetResetNether()) {
|
|
#ifdef SPLIT_SAVES
|
|
std::vector<FileEntry*>* netherFiles =
|
|
m_saveFile->getRegionFilesByDimension(1);
|
|
if (netherFiles != nullptr) {
|
|
DWORD bytesWritten = 0;
|
|
for (auto 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 != nullptr) {
|
|
for (auto it = netherFiles->begin();
|
|
it != netherFiles->end(); ++it) {
|
|
m_saveFile->deleteFile(*it);
|
|
}
|
|
delete netherFiles;
|
|
}
|
|
#endif
|
|
resetNetherPlayerPositions();
|
|
}
|
|
|
|
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);
|
|
|
|
std::vector<FileEntry*>* endFiles =
|
|
m_saveFile->getFilesWithPrefix(LevelStorage::ENDER_FOLDER);
|
|
|
|
// 4J-PB - There will be no End in early saves
|
|
if (endFiles != nullptr) {
|
|
for (auto 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) {
|
|
levelData->setVersion(MCREGION_VERSION_ID);
|
|
MemSect(38);
|
|
DirectoryLevelStorage::saveLevelData(levelData, players);
|
|
MemSect(0);
|
|
}
|
|
|
|
void McRegionLevelStorage::closeAll() { RegionFileCache::clear(); } |