From 28614b922fb77149a54da1a87bebfbc98736f296 Mon Sep 17 00:00:00 2001
From: ModMaker101 <119018978+ModMaker101@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:08:36 -0400
Subject: Modernize project codebase (#906)

* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides

* Add safety checks and fix a issue with vector going OOR
---
 Minecraft.World/SavedDataStorage.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'Minecraft.World/SavedDataStorage.cpp')

diff --git a/Minecraft.World/SavedDataStorage.cpp b/Minecraft.World/SavedDataStorage.cpp
index 422b66dc..049a19fc 100644
--- a/Minecraft.World/SavedDataStorage.cpp
+++ b/Minecraft.World/SavedDataStorage.cpp
@@ -26,7 +26,7 @@ shared_ptr<SavedData> SavedDataStorage::get(const type_info& clazz, const wstrin
     if (it != cache.end()) return (*it).second;
 
 	shared_ptr<SavedData> data = nullptr;
-    if (levelStorage != NULL)
+    if (levelStorage != nullptr)
 	{
 		//File file = levelStorage->getDataFile(id);
 		ConsoleSavePath file = levelStorage->getDataFile(id);
@@ -37,15 +37,15 @@ shared_ptr<SavedData> SavedDataStorage::get(const type_info& clazz, const wstrin
 
 			if( clazz == typeid(MapItemSavedData) )
 			{
-				data = dynamic_pointer_cast<SavedData>( shared_ptr<MapItemSavedData>(new MapItemSavedData(id)) );
+				data = dynamic_pointer_cast<SavedData>(std::make_shared<MapItemSavedData>(id));
 			}
 			else if( clazz == typeid(Villages) )
 			{
-				data = dynamic_pointer_cast<SavedData>( shared_ptr<Villages>(new Villages(id) ) );
+				data = dynamic_pointer_cast<SavedData>(std::make_shared<Villages>(id));
 			}
 			else if( clazz == typeid(StructureFeatureSavedData) )
 			{
-				data = dynamic_pointer_cast<SavedData>( shared_ptr<StructureFeatureSavedData>( new StructureFeatureSavedData(id) ) );
+				data = dynamic_pointer_cast<SavedData>(std::make_shared<StructureFeatureSavedData>(id));
 			}
 			else
 			{
@@ -61,7 +61,7 @@ shared_ptr<SavedData> SavedDataStorage::get(const type_info& clazz, const wstrin
 		}
     }
 
-    if (data != NULL)
+    if (data != nullptr)
 	{
         cache.insert( unordered_map<wstring, shared_ptr<SavedData> >::value_type( id , data ) );
         savedDatas.push_back(data);
@@ -71,7 +71,7 @@ shared_ptr<SavedData> SavedDataStorage::get(const type_info& clazz, const wstrin
 
 void SavedDataStorage::set(const wstring& id, shared_ptr<SavedData> data)
 {
-	if (data == NULL)
+	if (data == nullptr)
 	{
 		// TODO 4J Stu - throw new RuntimeException("Can't set null data");
 		assert( false );
@@ -104,7 +104,7 @@ void SavedDataStorage::save()
 
 void SavedDataStorage::save(shared_ptr<SavedData> data)
 {
-    if (levelStorage == NULL) return;
+    if (levelStorage == nullptr) return;
     //File file = levelStorage->getDataFile(data->id);
 	ConsoleSavePath file = levelStorage->getDataFile(data->id);
 	if (!file.getName().empty())
@@ -127,7 +127,7 @@ void SavedDataStorage::loadAuxValues()
 {
     usedAuxIds.clear();
 
-    if (levelStorage == NULL) return;
+    if (levelStorage == nullptr) return;
     //File file = levelStorage->getDataFile(L"idcounts");
 	ConsoleSavePath file = levelStorage->getDataFile(L"idcounts");
 	if (!file.getName().empty() && levelStorage->getSaveFile()->doesFileExist( file ) )
@@ -163,7 +163,7 @@ int SavedDataStorage::getFreeAuxValueFor(const wstring& id)
     }
 
 	usedAuxIds[id] = val;
-    if (levelStorage == NULL) return val;
+    if (levelStorage == nullptr) return val;
     //File file = levelStorage->getDataFile(L"idcounts");
 	ConsoleSavePath file = levelStorage->getDataFile(L"idcounts");
     if (!file.getName().empty())
@@ -188,7 +188,7 @@ int SavedDataStorage::getFreeAuxValueFor(const wstring& id)
 // 4J Added
 int SavedDataStorage::getAuxValueForMap(PlayerUID xuid, int dimension, int centreXC, int centreZC, int scale)
 {
-	if( levelStorage == NULL )
+	if( levelStorage == nullptr )
 	{
 		switch(dimension)
 		{
-- 
cgit v1.2.3