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/GenericStats.cpp | 142 +++++++++++++++++++--------------------
 1 file changed, 71 insertions(+), 71 deletions(-)

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

diff --git a/Minecraft.World/GenericStats.cpp b/Minecraft.World/GenericStats.cpp
index 1fa90151..d97c182a 100644
--- a/Minecraft.World/GenericStats.cpp
+++ b/Minecraft.World/GenericStats.cpp
@@ -4,161 +4,161 @@
 
 #include "GenericStats.h"
 
-GenericStats *GenericStats::instance = NULL;
+GenericStats *GenericStats::instance = nullptr;
 
 Stat* GenericStats::get_walkOneM()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_swimOneM()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_fallOneM()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_climbOneM()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_minecartOneM()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_boatOneM()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_pigOneM()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_portalsCreated()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_cowsMilked()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_netherLavaCollected()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_killMob()
 {
-	return NULL; 
+	return nullptr; 
 }
 
 Stat* GenericStats::get_killsZombie()
 { 
-	return NULL; 
+	return nullptr; 
 }
 
 Stat* GenericStats::get_killsSkeleton() 
 { 
-	return NULL; 
+	return nullptr; 
 }
 
 Stat* GenericStats::get_killsCreeper() 
 { 
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_killsSpider() 
 { 
-	return NULL; 
+	return nullptr; 
 }
 
 Stat* GenericStats::get_killsSpiderJockey() 
 { 
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_killsZombiePigman() 
 { 
-	return NULL; 
+	return nullptr; 
 }
 
 Stat* GenericStats::get_killsSlime() 
 { 
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_killsGhast() 
 { 
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_killsNetherZombiePigman() 
 { 
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_breedEntity(eINSTANCEOF entityId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_tamedEntity(eINSTANCEOF entityId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_curedEntity(eINSTANCEOF entityId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_craftedEntity(eINSTANCEOF entityId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_shearedEntity(eINSTANCEOF entityId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_totalBlocksMined()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_timePlayed()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_blocksPlaced(int blockId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_blocksMined(int blockId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_itemsCollected(int itemId, int itemAux)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_itemsCrafted(int itemId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_itemsSmelted(int itemId)
@@ -168,37 +168,37 @@ Stat* GenericStats::get_itemsSmelted(int itemId)
 
 Stat* GenericStats::get_itemsUsed(int itemId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat *GenericStats::get_itemsBought(int itemId)
 {
-	return NULL;	
+	return nullptr;	
 }
 
 Stat* GenericStats::get_killsEnderdragon()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_completeTheEnd()
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_changedDimension(int from, int to)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_enteredBiome(int biomeId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::get_achievement(eAward achievementId)
 {
-	return NULL;
+	return nullptr;
 }
 
 Stat* GenericStats::openInventory() 
@@ -286,7 +286,7 @@ Stat* GenericStats::snipeSkeleton()
 #ifndef _XBOX
 	return instance->get_achievement( eAward_snipeSkeleton );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -295,7 +295,7 @@ Stat* GenericStats::diamonds()
 #ifndef _XBOX
 	return instance->get_achievement( eAward_diamonds );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -304,7 +304,7 @@ Stat* GenericStats::ghast()
 #ifndef _XBOX
 	return instance->get_achievement( eAward_ghast );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -313,7 +313,7 @@ Stat* GenericStats::blazeRod()
 #ifndef _XBOX
 	return instance->get_achievement( eAward_blazeRod );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -322,7 +322,7 @@ Stat* GenericStats::potion()
 #ifndef _XBOX
 	return instance->get_achievement( eAward_potion );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -331,7 +331,7 @@ Stat* GenericStats::theEnd()
 #ifndef _XBOX
 	return instance->get_achievement( eAward_theEnd );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -340,7 +340,7 @@ Stat* GenericStats::winGame()
 #ifndef _XBOX
 	return instance->get_achievement( eAward_winGame );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -349,7 +349,7 @@ Stat* GenericStats::enchantments()
 #ifndef _XBOX
 	return instance->get_achievement( eAward_enchantments );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -358,7 +358,7 @@ Stat* GenericStats::overkill()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement( eAward_overkill );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -367,7 +367,7 @@ Stat* GenericStats::bookcase()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement( eAward_bookcase );
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -426,7 +426,7 @@ Stat* GenericStats::adventuringTime()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_adventuringTime);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -435,7 +435,7 @@ Stat* GenericStats::repopulation()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_repopulation);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -444,7 +444,7 @@ Stat* GenericStats::porkChop()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_eatPorkChop);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -453,7 +453,7 @@ Stat* GenericStats::diamondsToYou()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_diamondsToYou);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -462,7 +462,7 @@ Stat* GenericStats::passingTheTime()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_play100Days);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -471,7 +471,7 @@ Stat* GenericStats::archer()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_arrowKillCreeper);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -480,7 +480,7 @@ Stat* GenericStats::theHaggler()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_theHaggler);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -489,7 +489,7 @@ Stat* GenericStats::potPlanter()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_potPlanter);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -498,7 +498,7 @@ Stat* GenericStats::itsASign()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_itsASign);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -507,7 +507,7 @@ Stat* GenericStats::ironBelly()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_ironBelly);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -516,7 +516,7 @@ Stat* GenericStats::haveAShearfulDay()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_haveAShearfulDay);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -525,7 +525,7 @@ Stat* GenericStats::rainbowCollection()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_rainbowCollection);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -534,7 +534,7 @@ Stat* GenericStats::stayinFrosty()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_stayinFrosty);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -543,7 +543,7 @@ Stat* GenericStats::chestfulOfCobblestone()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_chestfulOfCobblestone);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -552,7 +552,7 @@ Stat* GenericStats::renewableEnergy()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_renewableEnergy);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -561,7 +561,7 @@ Stat* GenericStats::musicToMyEars()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_musicToMyEars);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -570,7 +570,7 @@ Stat* GenericStats::bodyGuard()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_bodyGuard);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -579,7 +579,7 @@ Stat* GenericStats::ironMan()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_ironMan);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -588,7 +588,7 @@ Stat* GenericStats::zombieDoctor()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_zombieDoctor);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -597,7 +597,7 @@ Stat* GenericStats::lionTamer()
 #ifdef _EXTENDED_ACHIEVEMENTS
 	return instance->get_achievement(eAward_lionTamer);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -835,7 +835,7 @@ byteArray GenericStats::param_itemsSmelted(int id, int aux, int count)
 
 byteArray GenericStats::param_itemsUsed(shared_ptr<Player> plr, shared_ptr<ItemInstance> itm)
 {
-	if ( (plr != NULL) && (itm != NULL) )	return instance->getParam_itemsUsed(plr, itm);
+	if ( (plr != nullptr) && (itm != nullptr) )	return instance->getParam_itemsUsed(plr, itm);
 	else									return instance->getParam_noArgs();
 }
 
@@ -846,7 +846,7 @@ byteArray GenericStats::param_itemsBought(int id, int aux, int count)
 
 byteArray GenericStats::param_mobKill(shared_ptr<Player> plr, shared_ptr<Mob> mob, DamageSource *dmgSrc)
 {
-	if ( (plr != NULL) && (mob != NULL) )	return instance->getParam_mobKill(plr, mob, dmgSrc);	
+	if ( (plr != nullptr) && (mob != nullptr) )	return instance->getParam_mobKill(plr, mob, dmgSrc);	
 	else									return instance->getParam_noArgs();
 }
 
-- 
cgit v1.2.3