Skip to content

Pull up texture pack information when label is selected #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BluTac10 merged 2 commits into from
Apr 5, 2026
Merged

Pull up texture pack information when label is selected #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43de303
Make join/load parent class respond to focus change event
dognews Apr 5, 2026
521ff06
Update children to use new constructor
dognews Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions Minecraft.Client/Common/UI/IUIScene_StartGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,21 @@
#include "Minecraft.h"
#include "IUIScene_StartGame.h"

IUIScene_StartGame::IUIScene_StartGame(int iPad, UILayer *parentLayer) : UIScene(iPad, parentLayer)
IUIScene_StartGame::IUIScene_StartGame(int iPad, UILayer* parentLayer, int texturePackListID)
: UIScene(iPad, parentLayer), m_iTexturePackID(texturePackListID)
{
m_bIgnoreInput = false;
m_iTexturePacksNotInstalled=0;
m_iTexturePacksNotInstalled = 0;
m_texturePackDescDisplayed = false;
m_bShowTexturePackDescription = false;
m_iSetTexturePackDescription = -1;

Minecraft *pMinecraft = Minecraft::GetInstance();
Minecraft* pMinecraft = Minecraft::GetInstance();
m_currentTexturePackIndex = pMinecraft->skins->getTexturePackIndex(0);
}

//IUIScene_StartGame::IUIScene_StartGame(int iPad, UILayer* parentLayer) : IUIScene_StartGame(iPad, parentLayer, -1) {}

void IUIScene_StartGame::HandleDLCMountingComplete()
{
Minecraft *pMinecraft = Minecraft::GetInstance();
Expand Down Expand Up @@ -131,6 +134,19 @@ void IUIScene_StartGame::handleSelectionChanged(F64 selectedId)
}
}

void IUIScene_StartGame::handleFocusChange(F64 controlId, F64 childId)
{
if (static_cast<int>(controlId) == m_iTexturePackID) {
if (m_bShowTexturePackDescription) return;
// m_iSetTexturePackDescription = 0;

if (!m_texturePackDescDisplayed)
{
m_bShowTexturePackDescription = true;
}
}
}

void IUIScene_StartGame::UpdateTexturePackDescription(int index)
{
TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackByIndex(index);
Expand Down
7 changes: 5 additions & 2 deletions Minecraft.Client/Common/UI/IUIScene_StartGame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,22 @@ class IUIScene_StartGame : public UIScene
LaunchMoreOptionsMenuInitData m_MoreOptionsParams;
bool m_bIgnoreInput;

const int m_iTexturePackID;
int m_iTexturePacksNotInstalled;
unsigned int m_currentTexturePackIndex;
bool m_bShowTexturePackDescription;
bool m_texturePackDescDisplayed;
int m_iSetTexturePackDescription;

IUIScene_StartGame(int iPad, UILayer *parentLayer);
IUIScene_StartGame(int iPad, UILayer* parentLayer, int texturePackListID);
// This constructor should never be used!
//IUIScene_StartGame(int iPad, UILayer* parentLayer);

virtual void checkStateAndStartGame() = 0;

virtual void handleSelectionChanged(F64 selectedId);

virtual void HandleDLCMountingComplete();
virtual void handleFocusChange(F64 controlId, F64 childId);

void UpdateTexturePackDescription(int index);
void UpdateCurrentTexturePack(int iSlot);
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ int UIScene_CreateWorldMenu::m_iDifficultyTitleSettingA[4]=
IDS_DIFFICULTY_TITLE_HARD
};

UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILayer *parentLayer) : IUIScene_StartGame(iPad, parentLayer)
UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILayer *parentLayer) : IUIScene_StartGame(iPad, parentLayer, eControl_TexturePackList)
{
// Setup all the Iggy references we need for this scene
initialiseMovie();
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ int UIScene_LoadMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumb
return 0;
}

UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLayer) : IUIScene_StartGame(iPad, parentLayer)
UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLayer) : IUIScene_StartGame(iPad, parentLayer, eControl_TexturePackList)
{
// Setup all the Iggy references we need for this scene
initialiseMovie();
Expand Down
Loading