LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-13 05:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

format XUI

Browse Source
This commit is contained in:
Tropical
2026-03-22 12:40:22 -05:00
parent a403bf5a4a
commit 4b2f614326
175 changed files with 31285 additions and 30912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
Minecraft.Client/Platform/Common/XUI/XUI_Scene_Trap.cpp
View File

@@ -13,110 +13,113 @@
// Name: CXuiSceneTrap::OnInit
// Desc: Message handler for XM_INIT
//--------------------------------------------------------------------------------------
HRESULT CXuiSceneTrap::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{
D3DXVECTOR3 vec;
MapChildControls();
XuiControlSetText(m_DispenserText,app.GetString(IDS_DISPENSER));
HRESULT CXuiSceneTrap::OnInit(XUIMessageInit* pInitData, BOOL& bHandled) {
D3DXVECTOR3 vec;
MapChildControls();
Minecraft *pMinecraft = Minecraft::GetInstance();
XuiControlSetText(m_DispenserText, app.GetString(IDS_DISPENSER));
TrapScreenInput* initData = (TrapScreenInput*)pInitData->pvInitData;
m_iPad=initData->iPad;
m_bSplitscreen=initData->bSplitscreen;
Minecraft* pMinecraft = Minecraft::GetInstance();
TrapScreenInput* initData = (TrapScreenInput*)pInitData->pvInitData;
m_iPad = initData->iPad;
m_bSplitscreen = initData->bSplitscreen;
#ifdef _XBOX
if( pMinecraft->localgameModes[initData->iPad] != NULL )
{
TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Trap_Menu, this);
}
if (pMinecraft->localgameModes[initData->iPad] != NULL) {
TutorialMode* gameMode =
(TutorialMode*)pMinecraft->localgameModes[initData->iPad];
m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Trap_Menu,
this);
}
#endif
// if we are in splitscreen, then we need to figure out if we want to move this scene
// if we are in splitscreen, then we need to figure out if we want to move
// this scene
if(m_bSplitscreen)
{
app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad);
}
if (m_bSplitscreen) {
app.AdjustSplitscreenScene(m_hObj, &m_OriginalPosition, m_iPad);
}
TrapMenu* menu = new TrapMenu( initData->inventory, initData->trap );
TrapMenu* menu = new TrapMenu(initData->inventory, initData->trap);
InitDataAssociations(initData->iPad, menu);
InitDataAssociations(initData->iPad, menu);
CXuiSceneAbstractContainer::Initialize( initData->iPad, menu, true, initData->trap->getContainerSize(), eSectionTrapUsing, eSectionTrapMax );
CXuiSceneAbstractContainer::Initialize(initData->iPad, menu, true,
initData->trap->getContainerSize(),
eSectionTrapUsing, eSectionTrapMax);
delete initData;
delete initData;
return S_OK;
return S_OK;
}
HRESULT CXuiSceneTrap::OnDestroy()
{
Minecraft *pMinecraft = Minecraft::GetInstance();
HRESULT CXuiSceneTrap::OnDestroy() {
Minecraft* pMinecraft = Minecraft::GetInstance();
#ifdef _XBOX
if( pMinecraft->localgameModes[m_iPad] != NULL )
{
TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
}
if (pMinecraft->localgameModes[m_iPad] != NULL) {
TutorialMode* gameMode =
(TutorialMode*)pMinecraft->localgameModes[m_iPad];
if (gameMode != NULL)
gameMode->getTutorial()->changeTutorialState(
m_previousTutorialState);
}
#endif
// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)
if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
return S_OK;
// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed
// after being killed by the client while accessing a chest during burst
// packet loss. We need to make sure that we call closeContainer() anytime
// this menu is closed, even if it is forced to close by some other reason
// (like the player dying)
if (Minecraft::GetInstance()->localplayers[m_iPad] != NULL)
Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
return S_OK;
}
CXuiControl* CXuiSceneTrap::GetSectionControl( ESceneSection eSection )
{
switch( eSection )
{
case eSectionTrapTrap:
return (CXuiControl *)m_trapControl;
break;
case eSectionTrapInventory:
return (CXuiControl *)m_inventoryControl;
break;
case eSectionTrapUsing:
return (CXuiControl *)m_useRowControl;
break;
default:
assert( false );
break;
}
return NULL;
CXuiControl* CXuiSceneTrap::GetSectionControl(ESceneSection eSection) {
switch (eSection) {
case eSectionTrapTrap:
return (CXuiControl*)m_trapControl;
break;
case eSectionTrapInventory:
return (CXuiControl*)m_inventoryControl;
break;
case eSectionTrapUsing:
return (CXuiControl*)m_useRowControl;
break;
default:
assert(false);
break;
}
return NULL;
}
CXuiCtrlSlotList* CXuiSceneTrap::GetSectionSlotList( ESceneSection eSection )
{
switch( eSection )
{
case eSectionTrapTrap:
return m_trapControl;
break;
case eSectionTrapInventory:
return m_inventoryControl;
break;
case eSectionTrapUsing:
return m_useRowControl;
break;
default:
assert( false );
break;
}
return NULL;
CXuiCtrlSlotList* CXuiSceneTrap::GetSectionSlotList(ESceneSection eSection) {
switch (eSection) {
case eSectionTrapTrap:
return m_trapControl;
break;
case eSectionTrapInventory:
return m_inventoryControl;
break;
case eSectionTrapUsing:
return m_useRowControl;
break;
default:
assert(false);
break;
}
return NULL;
}
// 4J Stu - Added to support auto-save. Need to re-associate on a navigate back
void CXuiSceneTrap::InitDataAssociations(int iPad, AbstractContainerMenu *menu, int startIndex /*= 0*/)
{
int containerSize = menu->getSize() - (27 + 9);
void CXuiSceneTrap::InitDataAssociations(int iPad, AbstractContainerMenu* menu,
int startIndex /*= 0*/) {
int containerSize = menu->getSize() - (27 + 9);
// TODO Inventory dimensions need defined as constants
m_trapControl->SetData( iPad, menu, 3, 3, 0 );
// TODO Inventory dimensions need defined as constants
m_trapControl->SetData(iPad, menu, 3, 3, 0);
CXuiSceneAbstractContainer::InitDataAssociations(iPad, menu, containerSize);
CXuiSceneAbstractContainer::InitDataAssociations(iPad, menu, containerSize);
}