cafeberry/cafeberry-dev
3
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

fix: fixed Xbox 360 build issues

Browse Source
This commit is contained in:
qloak
2026-07-31 15:49:59 -07:00
parent db7d47b0ff
commit 036bdcff81
213 changed files with 193105 additions and 237759 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Xbox/Xbox_App.cpp
+26 -1
View File
@@ -30,6 +30,10 @@
#include "..\Common\XUI\XUI_Scene_Furnace.h"
#include "..\Common\XUI\XUI_Scene_Inventory.h"
#include "..\Common\XUI\XUI_Scene_Trap.h"
#include "..\Common\XUI\XUI_Scene_Beacon.h"
#include "..\Common\XUI\XUI_Scene_Hopper.h"
#include "..\Common\XUI\XUI_Scene_HorseInventory.h"
#include "..\Common\XUI\XUI_Scene_Fireworks.h"
#include "..\Common\XUI\XUI_Control_ComboBox.h"
#include "..\Common\XUI\XUI_MultiGameInfo.h"
#include "..\Common\XUI\XUI_MultiGameJoinLoad.h"
@@ -140,6 +144,10 @@
#include "..\Common\XUI\XUI_Scene_Furnace.h"
#include "..\Common\XUI\XUI_Scene_Inventory.h"
#include "..\Common\XUI\XUI_Scene_Trap.h"
#include "..\Common\XUI\XUI_Scene_Beacon.h"
#include "..\Common\XUI\XUI_Scene_Hopper.h"
#include "..\Common\XUI\XUI_Scene_HorseInventory.h"
#include "..\Common\XUI\XUI_Scene_Fireworks.h"
#include "..\Common\XUI\XUI_Control_ComboBox.h"
#include "..\Common\XUI\XUI_MultiGameInfo.h"
#include "..\Common\XUI\XUI_MultiGameJoinLoad.h"
@@ -265,6 +273,10 @@ WCHAR *CConsoleMinecraftApp::wchSceneA[]=
L"xuiscene_trading",
L"xuiscene_anvil",
L"xuiscene_teleportmenu",
L"xuiscene_hopper",
L"xuiscene_beacon",
L"xuiscene_horse",
L"xuiscene_fireworks",
// L"xuiscene_TransferToXboxOne",
#ifdef _DEBUG_MENUS_ENABLED
@@ -521,6 +533,14 @@ HRESULT CConsoleMinecraftApp::RegisterXuiClasses()
if( FAILED( hr) ) return hr;
hr = CXuiSceneAnvil::Register();
if( FAILED( hr) ) return hr;
hr = CXuiSceneBeacon::Register();
if( FAILED( hr) ) return hr;
hr = CXuiSceneHopper::Register();
if( FAILED( hr) ) return hr;
hr = CXuiSceneHorseInventory::Register();
if( FAILED( hr) ) return hr;
hr = CXuiSceneFireworks::Register();
if( FAILED( hr) ) return hr;
hr = CXuiSceneTrading::Register();
if( FAILED( hr) ) return hr;
hr = CScene_Teleport::Register();
@@ -563,6 +583,10 @@ HRESULT CConsoleMinecraftApp::UnregisterXuiClasses()
CXuiSceneTrading::Unregister();
CXuiSceneAnvil::Unregister();
// CScene_TransferToXboxOne::Unregister();
CXuiSceneBeacon::Unregister();
CXuiSceneHopper::Unregister();
CXuiSceneHorseInventory::Unregister();
CXuiSceneFireworks::Unregister();
CXuiSceneHud::Unregister();
CScene_Win::Unregister();
CXuiCtrlMobEffect::Unregister();
@@ -3024,7 +3048,8 @@ void CConsoleMinecraftApp::GetFileFromTPD(eTPDFileType eType,PBYTE pbData,DWORD
LPCWSTR CConsoleMinecraftApp::GetString(int iID)
{
return StringTable.Lookup(iID);
LPCWSTR result = StringTable.Lookup(iID);
return result ? result : L"";
}
CXuiStringTable *CConsoleMinecraftApp::GetStringTable()
Minecraft.Client/Xbox/Xbox_UIController.cpp
+14 -2
View File
@@ -116,9 +116,9 @@ void ConsoleUIController::ShowTooltip( unsigned int iPad, unsigned int tooltip,
CXuiSceneBase::ShowTooltip(iPad,tooltip,show);
}
void ConsoleUIController::SetTooltips( unsigned int iPad, int iA, int iB, int iX, int iY, int iLT, int iRT, int iLB, int iRB, int iLS, bool forceUpdate)
void ConsoleUIController::SetTooltips( unsigned int iPad, int iA, int iB, int iX, int iY, int iLT, int iRT, int iLB, int iRB, int iLS, int iRS, int iBack, bool forceUpdate)
{
CXuiSceneBase::SetTooltips(iPad,iA,iB,iX,iY,iLT,iRT,iLB,iRB,iLS,forceUpdate);
CXuiSceneBase::SetTooltips(iPad,iA,iB,iX,iY,iLT,iRT,iLB,iRB,iLS,iRS,iBack,forceUpdate);
}
void ConsoleUIController::EnableTooltip( unsigned int iPad, unsigned int tooltip, bool enable )
@@ -319,6 +319,18 @@ C4JStorage::EMessageResult ConsoleUIController::RequestMessageBox(UINT uiTitle,
return StorageManager.RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pStringTable, pwchFormatString, dwFocusButton);
}
C4JStorage::EMessageResult ConsoleUIController::RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString)
{
return StorageManager.RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, NULL, pwchFormatString, 0);
}
C4JStorage::EMessageResult ConsoleUIController::RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString)
{
return StorageManager.RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, NULL, pwchFormatString, 0);
}
C4JStorage::EMessageResult ConsoleUIController::RequestUGCMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = NULL*/, LPVOID lpParam/* = NULL*/)
{
// Default title / messages
Minecraft.Client/Xbox/Xbox_UIController.h
+6 -2
View File
@@ -30,7 +30,7 @@ public:
virtual void SetTooltipText( unsigned int iPad, unsigned int tooltip, int iTextID );
virtual void SetEnableTooltips( unsigned int iPad, BOOL bVal );
virtual void ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show );
virtual void SetTooltips( unsigned int iPad, int iA, int iB=-1, int iX=-1, int iY=-1 , int iLT=-1, int iRT=-1, int iLB=-1, int iRB=-1, int iLS=-1, bool forceUpdate = false);
virtual void SetTooltips( unsigned int iPad, int iA, int iB=-1, int iX=-1, int iY=-1 , int iLT=-1, int iRT=-1, int iLB=-1, int iRB=-1, int iLS=-1, int iRS=-1, int iBack=-1, bool forceUpdate = false);
virtual void EnableTooltip( unsigned int iPad, unsigned int tooltip, bool enable );
virtual void RefreshTooltips(unsigned int iPad);
@@ -70,9 +70,13 @@ public:
virtual void SetWinUserIndex(unsigned int iPad);
virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY,
virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY,
int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, CXuiStringTable *pStringTable=NULL, WCHAR *pwchFormatString=NULL,DWORD dwFocusButton=0, bool bIsError = true);
virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
C4JStorage::EMessageResult RequestUGCMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = NULL, LPVOID lpParam = NULL);
};