backups/MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-04-23 07:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Skin pack names showing only first letter after 4JLibs update (#1518)

Browse source
This commit is contained in:
dtentiion 2026-04-17 04:35:14 +01:00 committed by GitHub
parent d0094a6409
commit cccfd860b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
View file

@ -1127,15 +1127,6 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
updatePackDisplay(); updatePackDisplay();
} }
std::wstring fakeWideToRealWide(const wchar_t* original)
{
const char* name = reinterpret_cast<const char*>(original);
int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, nullptr, 0);
std::wstring wName(len, 0);
MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
return wName.c_str();
}
void UIScene_SkinSelectMenu::updatePackDisplay() void UIScene_SkinSelectMenu::updatePackDisplay()
{ {
m_currentPackCount = app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS; m_currentPackCount = app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS;
@ -1143,18 +1134,16 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
if(m_packIndex >= SKIN_SELECT_MAX_DEFAULTS) if(m_packIndex >= SKIN_SELECT_MAX_DEFAULTS)
{ {
DLCPack *thisPack = app.m_dlcManager.getPack(m_packIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin); DLCPack *thisPack = app.m_dlcManager.getPack(m_packIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
// Fix the incorrect string type on title to display correctly setCentreLabel(thisPack->getName().c_str());
setCentreLabel(fakeWideToRealWide(thisPack->getName().c_str()));
//setCentreLabel(thisPack->getName().c_str());
} }
else else
{ {
switch(m_packIndex) switch(m_packIndex)
{ {
case SKIN_SELECT_PACK_DEFAULT: case SKIN_SELECT_PACK_DEFAULT:
setCentreLabel(app.GetString(IDS_NO_SKIN_PACK)); setCentreLabel(app.GetString(IDS_NO_SKIN_PACK));
break; break;
case SKIN_SELECT_PACK_FAVORITES: case SKIN_SELECT_PACK_FAVORITES:
setCentreLabel(app.GetString(IDS_FAVORITES_SKIN_PACK)); setCentreLabel(app.GetString(IDS_FAVORITES_SKIN_PACK));
break; break;
} }
@ -1164,18 +1153,16 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
if(nextPackIndex >= SKIN_SELECT_MAX_DEFAULTS) if(nextPackIndex >= SKIN_SELECT_MAX_DEFAULTS)
{ {
DLCPack *thisPack = app.m_dlcManager.getPack(nextPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin); DLCPack *thisPack = app.m_dlcManager.getPack(nextPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
// Fix the incorrect string type on title to display correctly setRightLabel(thisPack->getName().c_str());
setRightLabel(fakeWideToRealWide(thisPack->getName().c_str()));
//setRightLabel(thisPack->getName().c_str());
} }
else else
{ {
switch(nextPackIndex) switch(nextPackIndex)
{ {
case SKIN_SELECT_PACK_DEFAULT: case SKIN_SELECT_PACK_DEFAULT:
setRightLabel(app.GetString(IDS_NO_SKIN_PACK)); setRightLabel(app.GetString(IDS_NO_SKIN_PACK));
break; break;
case SKIN_SELECT_PACK_FAVORITES: case SKIN_SELECT_PACK_FAVORITES:
setRightLabel(app.GetString(IDS_FAVORITES_SKIN_PACK)); setRightLabel(app.GetString(IDS_FAVORITES_SKIN_PACK));
break; break;
} }
@ -1185,18 +1172,16 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
if(previousPackIndex >= SKIN_SELECT_MAX_DEFAULTS) if(previousPackIndex >= SKIN_SELECT_MAX_DEFAULTS)
{ {
DLCPack *thisPack = app.m_dlcManager.getPack(previousPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin); DLCPack *thisPack = app.m_dlcManager.getPack(previousPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
// Fix the incorrect string type on title to display correctly setLeftLabel(thisPack->getName().c_str());
setLeftLabel(fakeWideToRealWide(thisPack->getName().c_str()));
//setLeftLabel(thisPack->getName().c_str());
} }
else else
{ {
switch(previousPackIndex) switch(previousPackIndex)
{ {
case SKIN_SELECT_PACK_DEFAULT: case SKIN_SELECT_PACK_DEFAULT:
setLeftLabel(app.GetString(IDS_NO_SKIN_PACK)); setLeftLabel(app.GetString(IDS_NO_SKIN_PACK));
break; break;
case SKIN_SELECT_PACK_FAVORITES: case SKIN_SELECT_PACK_FAVORITES:
setLeftLabel(app.GetString(IDS_FAVORITES_SKIN_PACK)); setLeftLabel(app.GetString(IDS_FAVORITES_SKIN_PACK));
break; break;
} }