From 26c3ac619710391f06b49c68fe7a3a4909878448 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Tue, 10 Mar 2026 01:05:18 +1100 Subject: [PATCH] Remove DWORD texture pack IDs from image metadata APIs --- Minecraft.Client/Platform/Common/Consoles_App.cpp | 2 +- Minecraft.Client/Platform/Common/Consoles_App.h | 2 +- .../Platform/PS3/Network/SonyRemoteStorage_PS3.cpp | 3 ++- .../Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index cc746122a..ca69329b7 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -7631,7 +7631,7 @@ unsigned int CMinecraftApp::FromBigEndian(unsigned int uiValue) #endif } -void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,DWORD &uiTexturePack) +void CMinecraftApp::GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,std::uint32_t &uiTexturePack) { unsigned char *ucPtr=pbImageData; unsigned int uiCount=0; diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h index e92b391b0..e5f1010dd 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.h +++ b/Minecraft.Client/Platform/Common/Consoles_App.h @@ -703,7 +703,7 @@ public: bool CanRecordStatsAndAchievements(); // World seed from png image - void GetImageTextData(PBYTE pbImageData, DWORD dwImageBytes,unsigned char *pszSeed,unsigned int &uiHostOptions,bool &bHostOptionsRead,DWORD &uiTexturePack); + 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); // Game rules diff --git a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.cpp b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.cpp index 4dbd9f224..c40bc20bd 100644 --- a/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.cpp +++ b/Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.cpp @@ -1,6 +1,7 @@ #include "../../../../Minecraft.World/Platform/stdafx.h" #include "SonyRemoteStorage_PS3.h" +#include #include #include #include @@ -341,7 +342,7 @@ bool SonyRemoteStorage_PS3::setDataInternal() { unsigned int uiHostOptions; bool bHostOptionsRead; - DWORD uiTexturePack; + std::uint32_t uiTexturePack = 0; char seed[22]; app.GetImageTextData(m_thumbnailData, m_thumbnailDataSize,(unsigned char *)seed, uiHostOptions, bHostOptionsRead, uiTexturePack); diff --git a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp index 1b7d0844b..1d7a22d42 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp +++ b/Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.cpp @@ -2,6 +2,7 @@ #include "SonyRemoteStorage_Vita.h" #include "SonyHttp_Vita.h" +#include #include #include #include @@ -313,7 +314,7 @@ bool SonyRemoteStorage_Vita::setDataInternal() { unsigned int uiHostOptions; bool bHostOptionsRead; - DWORD uiTexturePack; + std::uint32_t uiTexturePack = 0; char seed[22]; app.GetImageTextData(m_thumbnailData, m_thumbnailDataSize,(unsigned char *)seed, uiHostOptions, bHostOptionsRead, uiTexturePack);