From 3e89da8dffb48db9e53125ed7b0456dd78e18be6 Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Tue, 10 Mar 2026 19:21:10 +1100
Subject: [PATCH] Use standard byte buffers for save image metadata

---
 .../Platform/Common/Consoles_App.cpp          | 28 +++++++++----------
 .../Platform/Common/Consoles_App.h            |  4 +--
 .../Common/UI/UIScene_LoadOrJoinMenu.cpp      |  4 +--
 .../IO/Files/ConsoleSaveFileOriginal.cpp      |  2 +-
 .../IO/Files/ConsoleSaveFileSplit.cpp         |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp
index df027e2ae..a8f7f1bc1 100644
--- a/Minecraft.Client/Platform/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp
@@ -7631,9 +7631,9 @@ unsigned int CMinecraftApp::FromBigEndian(unsigned int uiValue)
 #endif
 }
 
-void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,std::uint32_t &uiTexturePack)
+void CMinecraftApp::GetImageTextData(std::uint8_t *imageData, unsigned int imageBytes, unsigned char *seedText, unsigned int &uiHostOptions, bool &bHostOptionsRead, std::uint32_t &uiTexturePack)
 {
-	unsigned char *ucPtr=pbImageData;
+	std::uint8_t *ucPtr = imageData;
 	unsigned int uiCount=0;
 	unsigned int uiChunkLen;
 	unsigned int uiChunkType;
@@ -7648,7 +7648,7 @@ void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsig
 
 	uiCount+=8;
 
-	while(uiCount<dwImageBytes)
+	while(uiCount < imageBytes)
 	{	
 		uiChunkLen=*(unsigned int *)&ucPtr[uiCount];
 		uiChunkLen=FromBigEndian(uiChunkLen);
@@ -7677,10 +7677,10 @@ void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsig
 					unsigned int uiValueC=0;
 					while(*pszKeyword!=0 && (pszKeyword < ucPtr + uiCount + uiChunkLen) )
 					{
-						pszSeed[uiValueC++]=*pszKeyword;
+						seedText[uiValueC++]=*pszKeyword;
 						pszKeyword++;
 					}
-					//memcpy(pszSeed,pszKeyword,uiChunkLen-8);
+					//memcpy(seedText,pszKeyword,uiChunkLen-8);
 				}
 				else if(strcmp(szKeyword,"4J_HOSTOPTIONS")==0)
 				{
@@ -7727,33 +7727,33 @@ void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsig
 	return;
 }
 
-unsigned int CMinecraftApp::CreateImageTextData(PBYTE bTextMetadata, __int64 seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId)
+unsigned int CMinecraftApp::CreateImageTextData(std::uint8_t *textMetadata, __int64 seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId)
 {
 	int iTextMetadataBytes = 0;
 	if(hasSeed)
 	{
-		strcpy((char *)bTextMetadata,"4J_SEED");
-		snprintf((char *)&bTextMetadata[8], 42, "%lld", (long long)seed);
+		strcpy((char *)textMetadata,"4J_SEED");
+		snprintf((char *)&textMetadata[8], 42, "%lld", (long long)seed);
 
 		// get the length
 		iTextMetadataBytes+=8;
-		while(bTextMetadata[iTextMetadataBytes]!=0) iTextMetadataBytes++;
+		while(textMetadata[iTextMetadataBytes]!=0) iTextMetadataBytes++;
 		++iTextMetadataBytes; // Add a null terminator at the end of the seed value
 	}
 
 	// Save the host options that this world was last played with
-	strcpy((char *)&bTextMetadata[iTextMetadataBytes],"4J_HOSTOPTIONS");
-	snprintf( (char *)&bTextMetadata[iTextMetadataBytes + 15], 9, "%X", uiHostOptions);
+	strcpy((char *)&textMetadata[iTextMetadataBytes],"4J_HOSTOPTIONS");
+	snprintf( (char *)&textMetadata[iTextMetadataBytes + 15], 9, "%X", uiHostOptions);
 
 	iTextMetadataBytes += 15;
-	while(bTextMetadata[iTextMetadataBytes]!=0) iTextMetadataBytes++;
+	while(textMetadata[iTextMetadataBytes]!=0) iTextMetadataBytes++;
 	++iTextMetadataBytes; // Add a null terminator at the end of the host options value
 
 	// Save the texture pack id
-	strcpy((char *)&bTextMetadata[iTextMetadataBytes],"4J_TEXTUREPACK");
+	strcpy((char *)&textMetadata[iTextMetadataBytes],"4J_TEXTUREPACK");
 
 	iTextMetadataBytes += 15;
-	while(bTextMetadata[iTextMetadataBytes]!=0) iTextMetadataBytes++;
+	while(textMetadata[iTextMetadataBytes]!=0) iTextMetadataBytes++;
 
 	return iTextMetadataBytes;
 }
diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h
index e5f1010dd..8951cc908 100644
--- a/Minecraft.Client/Platform/Common/Consoles_App.h
+++ b/Minecraft.Client/Platform/Common/Consoles_App.h
@@ -703,8 +703,8 @@ public:
 	bool			CanRecordStatsAndAchievements();
 
 	// World seed from png image
-	void GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,std::uint32_t &uiTexturePack);
-	unsigned int CreateImageTextData(PBYTE bTextMetadata, __int64 seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId);
+	void GetImageTextData(std::uint8_t *imageData, unsigned int imageBytes, unsigned char *seedText, unsigned int &uiHostOptions, bool &bHostOptionsRead, std::uint32_t &uiTexturePack);
+	unsigned int CreateImageTextData(std::uint8_t *textMetadata, __int64 seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId);
 
 	// Game rules
 	GameRuleManager m_gameRules;
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
index 4c02e5be4..9750c2169 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -2446,7 +2446,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 				StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage);			// Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
 				StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);		// Get the default save image (as set by SetDefaultImages) for use on saving games that 
 
-				BYTE bTextMetadata[88];
+				std::uint8_t bTextMetadata[88];
 				ZeroMemory(bTextMetadata,88);
 				int iTextMetadataBytes = app.CreateImageTextData(bTextMetadata, app.getRemoteStorage()->getSaveSeed(), true, app.getRemoteStorage()->getSaveHostOptions(), app.getRemoteStorage()->getSaveTexturePack() );
 
@@ -2606,7 +2606,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 					StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage);			// Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
 					StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);		// Get the default save image (as set by SetDefaultImages) for use on saving games that 
 
-					BYTE bTextMetadata[88];
+					std::uint8_t bTextMetadata[88];
 					ZeroMemory(bTextMetadata,88);
 					int iTextMetadataBytes = app.CreateImageTextData(bTextMetadata, app.getRemoteStorage()->getSaveSeed(), true, app.getRemoteStorage()->getSaveHostOptions(), app.getRemoteStorage()->getSaveTexturePack() );
 
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
index 4dd16bd4a..5e24905a1 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
@@ -762,7 +762,7 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
 		app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize,&pbDataSaveImage,&dwDataSizeSaveImage);
 #endif
 
-		BYTE bTextMetadata[88];
+		std::uint8_t bTextMetadata[88];
 		ZeroMemory(bTextMetadata,88);
 
 		__int64 seed = 0;
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
index 200fca5c5..cfd1ad53d 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
@@ -1426,7 +1426,7 @@ void ConsoleSaveFileSplit::Flush(bool autosave, bool updateThumbnail)
 			app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize,&pbDataSaveImage,&dwDataSizeSaveImage);
 #endif
 
-			BYTE bTextMetadata[88];
+			std::uint8_t bTextMetadata[88];
 			ZeroMemory(bTextMetadata,88);
 
 			__int64 seed = 0;