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.Client/Screen.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Minecraft.Client/Screen.cpp')

diff --git a/Minecraft.Client/Screen.cpp b/Minecraft.Client/Screen.cpp
index 9b753146..041f8175 100644
--- a/Minecraft.Client/Screen.cpp
+++ b/Minecraft.Client/Screen.cpp
@@ -14,13 +14,13 @@
 
 Screen::Screen()	// 4J added
 {
-	minecraft = NULL;
+	minecraft = nullptr;
 	width = 0;
     height = 0;
 	passEvents = false;
-	font = NULL;
-	particles = NULL;
-	clickedButton = NULL;
+	font = nullptr;
+	particles = nullptr;
+	clickedButton = nullptr;
 }
 
 void Screen::render(int xm, int ym, float a)
@@ -36,7 +36,7 @@ void Screen::keyPressed(wchar_t eventCharacter, int eventKey)
 {
 	if (eventKey == Keyboard::KEY_ESCAPE)
 	{
-		minecraft->setScreen(NULL);
+		minecraft->setScreen(nullptr);
 //    minecraft->grabMouse();	// 4J - removed
 	}
 }
@@ -44,12 +44,12 @@ void Screen::keyPressed(wchar_t eventCharacter, int eventKey)
 wstring Screen::getClipboard()
 {
 #ifdef _WINDOWS64
-	if (!OpenClipboard(NULL)) return wstring();
+	if (!OpenClipboard(nullptr)) return wstring();
 	HANDLE h = GetClipboardData(CF_UNICODETEXT);
 	wstring out;
 	if (h)
 	{
-		const wchar_t *p = reinterpret_cast<const wchar_t*>(GlobalLock(h));
+		const wchar_t *p = static_cast<const wchar_t*>(GlobalLock(h));
 		if (p) { out = p; GlobalUnlock(h); }
 	}
 	CloseClipboard();
@@ -62,7 +62,7 @@ wstring Screen::getClipboard()
 void Screen::setClipboard(const wstring& str)
 {
 #ifdef _WINDOWS64
-	if (!OpenClipboard(NULL)) return;
+	if (!OpenClipboard(nullptr)) return;
 	EmptyClipboard();
 	size_t len = (str.length() + 1) * sizeof(wchar_t);
 	HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, len);
@@ -89,10 +89,10 @@ void Screen::mouseClicked(int x, int y, int buttonNum)
 
 void Screen::mouseReleased(int x, int y, int buttonNum)
 {
-    if (clickedButton!=NULL && buttonNum==0)
+    if (clickedButton!=nullptr && buttonNum==0)
 	{
         clickedButton->released(x, y);
-        clickedButton = NULL;
+        clickedButton = nullptr;
     }
 }
 
@@ -284,7 +284,7 @@ void Screen::renderBackground()
 
 void Screen::renderBackground(int vo)
 {
-	if (minecraft->level != NULL)
+	if (minecraft->level != nullptr)
 	{
 		fillGradient(0, 0, width, height, 0xc0101010, 0xd0101010);
 	}
-- 
cgit v1.2.3