Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Foxify52/MinecraftConsoles

Browse Source
This commit is contained in:
Chris
2026-03-01 14:18:00 -05:00
parent 5484b78eca 38b442b1e3
commit c1aebee5b9
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Minecraft.Client/Common/DLC/DLCPack.cpp
View File

@@ -382,7 +382,10 @@ DWORD DLCPack::getFileIndexAt(DLCManager::EDLCType type, const wstring &path, bo
bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path) bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path)
{ {
if(type == DLCManager::e_DLCType_All) // Patch all DLC to be "purchased"
return true;
/*if(type == DLCManager::e_DLCType_All)
{ {
app.DebugPrintf("Unimplemented\n"); app.DebugPrintf("Unimplemented\n");
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
@@ -406,5 +409,5 @@ bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, const wstring &path)
{ {
//purchased //purchased
return true; return true;
} }*/
} }

4
Minecraft.Client/Common/DLC/DLCSkinFile.cpp
View File

@@ -205,7 +205,9 @@ bool DLCSkinFile::getParameterAsBool(DLCManager::EDLCParameterType type)
switch(type) switch(type)
{ {
case DLCManager::e_DLCParamType_Free: case DLCManager::e_DLCParamType_Free:
return m_bIsFree; // Patch all DLC to be "paid"
return false;
// return m_bIsFree;
default: default:
return false; return false;
} }

2
Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
View File

@@ -62,7 +62,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
LoadMenuInitData *params = (LoadMenuInitData *)initData; LoadMenuInitData *params = (LoadMenuInitData *)initData;
//m_labelGameName.init(app.GetString(IDS_WORLD_NAME)); m_labelGameName.init(app.GetString(IDS_WORLD_NAME));
m_labelSeed.init(L""); m_labelSeed.init(L"");
m_labelCreatedMode.init(app.GetString(IDS_CREATED_IN_SURVIVAL)); m_labelCreatedMode.init(app.GetString(IDS_CREATED_IN_SURVIVAL));

24
Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
View File

@@ -1249,7 +1249,13 @@ 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);
setCentreLabel(thisPack->getName().c_str()); // Fix the incorrect string type on title to display correctly
const char* name = static_cast<const char*>(thisPack->getName().c_str());
int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
std::wstring wName(len, 0);
MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
setCentreLabel(wName.c_str());
//setCentreLabel(thisPack->getName().c_str());
} }
else else
{ {
@@ -1268,7 +1274,13 @@ 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);
setRightLabel(thisPack->getName().c_str()); // Fix the incorrect string type on title to display correctly
const char* name = static_cast<const char*>(thisPack->getName().c_str());
int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
std::wstring wName(len, 0);
MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
setRightLabel(wName.c_str());
//setRightLabel(thisPack->getName().c_str());
} }
else else
{ {
@@ -1287,7 +1299,13 @@ 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);
setLeftLabel(thisPack->getName().c_str()); // Fix the incorrect string type on title to display correctly
const char* name = static_cast<const char*>(thisPack->getName().c_str());
int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
std::wstring wName(len, 0);
MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
setLeftLabel(wName.c_str());
//setLeftLabel(thisPack->getName().c_str());
} }
else else
{ {