From b02bcd27f5ab3997e3153d50f7988d2627d786de Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Tue, 10 Mar 2026 00:15:56 +1100
Subject: [PATCH] Remove Win32 byte pointers from texture pack icons

---
 Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp | 6 +++---
 Minecraft.Client/Textures/Packs/AbstractTexturePack.h   | 8 ++++----
 Minecraft.Client/Textures/Packs/TexturePack.h           | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp b/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp
index 56739429d..26f2b8012 100644
--- a/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp
+++ b/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp
@@ -373,14 +373,14 @@ std::wstring AbstractTexturePack::getXuiRootPath()
 	return szResourceLocator;
 }
 
-PBYTE AbstractTexturePack::getPackIcon(DWORD &dwImageBytes)
+uint8_t *AbstractTexturePack::getPackIcon(DWORD &dwImageBytes)
 {
 	if(m_iconSize == 0 || m_iconData == NULL) loadIcon();
 	dwImageBytes = m_iconSize;
 	return m_iconData;
 }
 
-PBYTE AbstractTexturePack::getPackComparison(DWORD &dwImageBytes)
+uint8_t *AbstractTexturePack::getPackComparison(DWORD &dwImageBytes)
 {
 	if(m_comparisonSize == 0 || m_comparisonData == NULL) loadComparison();
 
@@ -396,4 +396,4 @@ unsigned int AbstractTexturePack::getDLCParentPackId()
 unsigned char AbstractTexturePack::getDLCSubPackId()
 {
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Textures/Packs/AbstractTexturePack.h b/Minecraft.Client/Textures/Packs/AbstractTexturePack.h
index c861a88c0..dec6d1362 100644
--- a/Minecraft.Client/Textures/Packs/AbstractTexturePack.h
+++ b/Minecraft.Client/Textures/Packs/AbstractTexturePack.h
@@ -19,10 +19,10 @@ protected:
 	std::wstring desc1;
 	std::wstring desc2;
 
-	PBYTE m_iconData;
+	uint8_t *m_iconData;
 	DWORD m_iconSize;
 
-	PBYTE m_comparisonData;
+	uint8_t *m_comparisonData;
 	DWORD m_comparisonSize;
 
 	TexturePack *fallback;
@@ -84,8 +84,8 @@ public:
 	virtual void loadUI();
 	virtual void unloadUI();
 	virtual std::wstring getXuiRootPath();
-	virtual PBYTE getPackIcon(DWORD &dwImageBytes);
-	virtual PBYTE getPackComparison(DWORD &dwImageBytes);
+	virtual uint8_t *getPackIcon(DWORD &dwImageBytes);
+	virtual uint8_t *getPackComparison(DWORD &dwImageBytes);
 	virtual unsigned int getDLCParentPackId();
 	virtual unsigned char getDLCSubPackId();
 	virtual ColourTable *getColourTable() { return m_colourTable; }
diff --git a/Minecraft.Client/Textures/Packs/TexturePack.h b/Minecraft.Client/Textures/Packs/TexturePack.h
index edbabc796..2bd1b0364 100644
--- a/Minecraft.Client/Textures/Packs/TexturePack.h
+++ b/Minecraft.Client/Textures/Packs/TexturePack.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 
 #include "../../Platform/Common/App_enums.h"
 
@@ -46,8 +47,8 @@ public:
 	virtual void loadUI() = 0;
 	virtual void unloadUI() = 0;
 	virtual std::wstring getXuiRootPath() = 0;
-	virtual PBYTE getPackIcon(DWORD &dwImageBytes) = 0;
-	virtual PBYTE getPackComparison(DWORD &dwImageBytes) = 0;
+	virtual uint8_t *getPackIcon(DWORD &dwImageBytes) = 0;
+	virtual uint8_t *getPackComparison(DWORD &dwImageBytes) = 0;
 	virtual unsigned int getDLCParentPackId() = 0;
 	virtual unsigned char getDLCSubPackId() = 0;
 	virtual ColourTable *getColourTable() = 0;