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

Merge branch 'upstream-dev' into cleanup/nullptr-replacement

Browse Source 
# 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
This commit is contained in:
MatthewBeshay
2026-03-30 16:28:40 +11:00
parent dfb0e3b03e 00cd713cc8
commit a0fdc643d1
265 changed files with 1408 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
View File

@@ -323,7 +323,7 @@ void ConsoleSaveFileSplit::RegionFileReference::ReleaseCompressed() {
FileEntry* ConsoleSaveFileSplit::GetRegionFileEntry(unsigned int regionIndex) {
// Is a region file - determine if we've got it as a separate file
AUTO_VAR(it, regionFiles.find(regionIndex));
auto it = regionFiles.find(regionIndex);
if (it != regionFiles.end()) {
// Already got it
return it->second->fileEntry;
@@ -376,7 +376,7 @@ ConsoleSaveFileSplit::ConsoleSaveFileSplit(ConsoleSaveFile* sourceSave,
sourceSave->getFilesWithPrefix(L"");
unsigned int bytesWritten = 0;
for (AUTO_VAR(it, sourceFiles->begin()); it != sourceFiles->end();
for (auto it = sourceFiles->begin(); it != sourceFiles->end();
++it) {
FileEntry* sourceEntry = *it;
sourceSave->setFilePointer(sourceEntry, 0,
@@ -545,7 +545,7 @@ ConsoleSaveFileSplit::~ConsoleSaveFileSplit() {
// Make sure we don't have any thumbnail data still waiting round - we can't
// need it now we've destroyed the save file anyway
for (AUTO_VAR(it, regionFiles.begin()); it != regionFiles.end(); it++) {
for (auto it = regionFiles.begin(); it != regionFiles.end(); it++) {
delete it->second;
}
@@ -895,7 +895,7 @@ void ConsoleSaveFileSplit::tick() {
// Get total amount of data written over the time period we are interested
// in averaging over. Remove any older data.
unsigned int bytesWritten = 0;
for (AUTO_VAR(it, writeHistory.begin()); it != writeHistory.end();) {
for (auto it = writeHistory.begin(); it != writeHistory.end();) {
if ((currentTime - it->writeTime) >
(WRITE_BANDWIDTH_MEASUREMENT_PERIOD_SECONDS * 1000)) {
it = writeHistory.erase(it);
@@ -907,7 +907,7 @@ void ConsoleSaveFileSplit::tick() {
// Compile a vector of dirty regions.
std::vector<DirtyRegionFile> dirtyRegions;
for (AUTO_VAR(it, regionFiles.begin()); it != regionFiles.end(); it++) {
for (auto it = regionFiles.begin(); it != regionFiles.end(); it++) {
DirtyRegionFile dirtyRegion;
if (it->second->dirty) {
@@ -965,7 +965,7 @@ void ConsoleSaveFileSplit::tick() {
unsigned int totalDirty = 0;
unsigned int totalDirtyBytes = 0;
int64_t oldestDirty = currentTime;
for (AUTO_VAR(it, regionFiles.begin()); it != regionFiles.end(); it++) {
for (auto it = regionFiles.begin(); it != regionFiles.end(); it++) {
if (it->second->dirty) {
if (it->second->lastWritten < oldestDirty) {
oldestDirty = it->second->lastWritten;
@@ -1219,7 +1219,7 @@ std::wstring ConsoleSaveFileSplit::GetNameFromNumericIdentifier(
// Compress any dirty region files, and tell the storage manager about them so
// that it will process them when we ask it to save sub files
void ConsoleSaveFileSplit::processSubfilesForWrite() {
for (AUTO_VAR(it, regionFiles.begin()); it != regionFiles.end(); it++) {
for (auto it = regionFiles.begin(); it != regionFiles.end(); it++) {
RegionFileReference* region = it->second;
if (region->dirty) {
region->Compress();
@@ -1236,7 +1236,7 @@ void ConsoleSaveFileSplit::processSubfilesForWrite() {
void ConsoleSaveFileSplit::processSubfilesAfterWrite() {
// This is called from the StorageManager.Tick() which should always be on
// the main thread
for (AUTO_VAR(it, regionFiles.begin()); it != regionFiles.end(); it++) {
for (auto it = regionFiles.begin(); it != regionFiles.end(); it++) {
RegionFileReference* region = it->second;
region->ReleaseCompressed();
}
@@ -1486,7 +1486,7 @@ std::vector<FileEntry*>* ConsoleSaveFileSplit::getRegionFilesByDimension(
unsigned int dimensionIndex) {
std::vector<FileEntry*>* files = nullptr;
for (AUTO_VAR(it, regionFiles.begin()); it != regionFiles.end(); ++it) {
for (auto it = regionFiles.begin(); it != regionFiles.end(); ++it) {
unsigned int entryDimension = ((it->first) >> 16) & 0xFF;
if (entryDimension == dimensionIndex) {
@@ -1583,7 +1583,7 @@ void ConsoleSaveFileSplit::ConvertToLocalPlatform() {
// convert each of the region files to the local platform
std::vector<FileEntry*>* allFilesInSave =
getFilesWithPrefix(std::wstring(L""));
for (AUTO_VAR(it, allFilesInSave->begin()); it < allFilesInSave->end();
for (auto it = allFilesInSave->begin(); it < allFilesInSave->end();
++it) {
FileEntry* fe = *it;
std::wstring fName(fe->data.filename);