LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-31 02:26:38 +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

18
Minecraft.World/Level/Storage/SavedDataStorage.cpp
View File

@@ -21,7 +21,7 @@ SavedDataStorage::SavedDataStorage(LevelStorage* levelStorage) {
std::shared_ptr<SavedData> SavedDataStorage::get(const std::type_info& clazz,
const std::wstring& id) {
AUTO_VAR(it, cache.find(id));
auto it = cache.find(id);
if (it != cache.end()) return (*it).second;
std::shared_ptr<SavedData> data = nullptr;
@@ -76,9 +76,9 @@ void SavedDataStorage::set(const std::wstring& id,
// TODO 4J Stu - throw new RuntimeException("Can't set null data");
assert(false);
}
AUTO_VAR(it, cache.find(id));
auto it = cache.find(id);
if (it != cache.end()) {
AUTO_VAR(it2, find(savedDatas.begin(), savedDatas.end(), it->second));
auto it2 = find(savedDatas.begin(), savedDatas.end(), it->second);
if (it2 != savedDatas.end()) {
savedDatas.erase(it2);
}
@@ -89,8 +89,8 @@ void SavedDataStorage::set(const std::wstring& id,
}
void SavedDataStorage::save() {
AUTO_VAR(itEnd, savedDatas.end());
for (AUTO_VAR(it, savedDatas.begin()); it != itEnd; it++) {
auto itEnd = savedDatas.end();
for (auto it = savedDatas.begin(); it != itEnd; it++) {
std::shared_ptr<SavedData> data = *it; // savedDatas->at(i);
if (data->isDirty()) {
save(data);
@@ -135,8 +135,8 @@ void SavedDataStorage::loadAuxValues() {
Tag* tag;
std::vector<Tag*>* allTags = tags->getAllTags();
AUTO_VAR(itEnd, allTags->end());
for (AUTO_VAR(it, allTags->begin()); it != itEnd; it++) {
auto itEnd = allTags->end();
for (auto it = allTags->begin(); it != itEnd; it++) {
tag = *it; // tags->getAllTags()->at(i);
if (dynamic_cast<ShortTag*>(tag) != nullptr) {
@@ -151,7 +151,7 @@ void SavedDataStorage::loadAuxValues() {
}
int SavedDataStorage::getFreeAuxValueFor(const std::wstring& id) {
AUTO_VAR(it, usedAuxIds.find(id));
auto it = usedAuxIds.find(id);
short val = 0;
if (it != usedAuxIds.end()) {
val = (*it).second;
@@ -167,7 +167,7 @@ int SavedDataStorage::getFreeAuxValueFor(const std::wstring& id) {
// TODO 4J Stu - This was iterating over the keySet in Java, so
// potentially we are looking at more items?
AUTO_VAR(itEndAuxIds, usedAuxIds.end());
auto itEndAuxIds = usedAuxIds.end();
for (uaiMapType::iterator it2 = usedAuxIds.begin(); it2 != itEndAuxIds;
it2++) {
short value = it2->second;