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

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
View File

@@ -24,6 +24,11 @@ static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ]
{ IDS_HOW_TO_PLAY_FARMANIMALS, 0, 0}, // eHowToPlay_Breeding
{ IDS_HOW_TO_PLAY_BREEDANIMALS, 0, 0}, // eHowToPlay_Breeding
{ IDS_HOW_TO_PLAY_TRADING, UIScene_HowToPlay::eHowToPlay_LabelTrading_Inventory, 5}, // eHowToPlay_Trading
{ IDS_HOW_TO_PLAY_HORSES, 0, 0}, // eHowToPlay_Horses
{ IDS_HOW_TO_PLAY_BEACONS, 0, 0}, // eHowToPlay_Beacons
{ IDS_HOW_TO_PLAY_FIREWORKS, 0, 0}, // eHowToPlay_Fireworks
{ IDS_HOW_TO_PLAY_HOPPERS, 0, 0}, // eHowToPlay_Hoppers
{ IDS_HOW_TO_PLAY_DROPPERS, 0, 0}, // eHowToPlay_Droppers
{ IDS_HOW_TO_PLAY_NETHERPORTAL, 0, 0}, // eHowToPlay_NetherPortal
{ IDS_HOW_TO_PLAY_THEEND, 0, 0}, // eHowToPlay_NetherPortal
#ifdef _XBOX
@@ -56,6 +61,12 @@ int gs_pageToFlashMapping[eHowToPlay_NumPages] =
15, //eHowToPlay_Breeding,
22, //eHowToPlay_Trading,
24, //eHowToPlay_Horses
25, //eHowToPlay_Beacons
26, //eHowToPlay_Fireworks
27, //eHowToPlay_Hoppers
28, //eHowToPlay_Droppers
16, //eHowToPlay_NetherPortal,
17, //eHowToPlay_TheEnd,
#ifdef _XBOX
@@ -83,7 +94,7 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void *initData, UILayer *parentLa
m_labels[ eHowToPlay_LabelFChest].init(app.GetString(IDS_FURNACE));
m_labels[ eHowToPlay_LabelLCInventory].init(inventoryString);
m_labels[ eHowToPlay_LabelCreativeInventory].init(app.GetString(IDS_GROUPNAME_BUILDING_BLOCKS));
m_labels[ eHowToPlay_LabelLCChest].init(app.GetString(IDS_CHEST));
m_labels[ eHowToPlay_LabelLCChest].init(app.GetString(IDS_CHEST_LARGE));
m_labels[ eHowToPlay_LabelSCInventory].init(inventoryString);
m_labels[ eHowToPlay_LabelSCChest].init(app.GetString(IDS_CHEST));
m_labels[ eHowToPlay_LabelIInventory].init(inventoryString);
@@ -105,6 +116,18 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void *initData, UILayer *parentLa
m_labels[ eHowToPlay_LabelTrading_Offer1].init(app.GetString(IDS_ITEM_EMERALD));
m_labels[ eHowToPlay_LabelTrading_NeededForTrade].init(app.GetString(IDS_REQUIRED_ITEMS_FOR_TRADE));
m_labels[ eHowToPlay_LabelBeacon_PrimaryPower].init(app.GetString(IDS_CONTAINER_BEACON_PRIMARY_POWER));
m_labels[ eHowToPlay_LabelBeacon_SecondaryPower].init(app.GetString(IDS_CONTAINER_BEACON_SECONDARY_POWER));
m_labels[ eHowToPlay_LabelFireworksText].init(app.GetString(IDS_HOW_TO_PLAY_MENU_FIREWORKS));
m_labels[ eHowToPlay_LabelFireworksInventory].init(inventoryString.c_str());
m_labels[ eHowToPlay_LabelHopperText].init(app.GetString(IDS_TILE_HOPPER));
m_labels[ eHowToPlay_LabelHopperInventory].init(inventoryString.c_str());
m_labels[ eHowToPlay_LabelDropperText].init(app.GetString(IDS_TILE_DROPPER));
m_labels[ eHowToPlay_LabelDropperInventory].init(inventoryString.c_str());
wsTemp = app.GetString(IDS_VILLAGER_OFFERS_ITEM);
wsTemp = replaceAll(wsTemp,L"{*VILLAGER_TYPE*}",app.GetString(IDS_VILLAGER_PRIEST));
wsTemp.replace(wsTemp.find(L"%s"),2, app.GetString(IDS_TILE_LIGHT_GEM));
@@ -138,13 +161,9 @@ void UIScene_HowToPlay::updateTooltips()
int iPage = ( int )( m_eCurrPage );
int firstPage = eHowToPlay_WhatsNew;
#ifdef __PS3__
// If it's the blu ray, or the first Japanese digital game, there's no What's New until the first patch, which will take this line out
if(StorageManager.GetBootTypeDisc() || (app.GetProductSKU()==e_sku_SCEJ))
{
++firstPage;
}
#elif defined(__ORBIS__) || defined(_DURANGO) || defined(__PSVITA__)
// 4J Stu - Add back for future platforms
#if 0
// No What's New for the first PS4 and Xbox One builds
if(true)
{
@@ -212,18 +231,8 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
// Previous page
int iPrevPage = ( int )( m_eCurrPage ) - 1;
#ifdef __PS3__
// If it's the blu ray, or the first Japanese digital game, there's no What's New until the first patch, which will take this line out
if(StorageManager.GetBootTypeDisc() || (app.GetProductSKU()==e_sku_SCEJ))
{
if ( iPrevPage >= 0 && !((iPrevPage==eHowToPlay_WhatsNew)))
{
StartPage( ( EHowToPlayPage )( iPrevPage ) );
ui.PlayUISFX(eSFX_Press);
}
}
else
#elif defined(__ORBIS__) || defined(_DURANGO) || defined(__PSVITA__)
// 4J Stu - Add back for future platforms
#if 0
// No What's New for the first PS4 and Xbox One builds
if(true)
{
@@ -266,15 +275,21 @@ void UIScene_HowToPlay::StartPage( EHowToPlayPage ePage )
wstring replacedText = app.FormatHTMLString(m_iPad, app.GetString( pDef->m_iTextStringID ));
// 4J-PB - replace the title with the platform specific title, and the platform name
// replacedText = replaceAll(replacedText,L"{*TITLE_UPDATE_NAME*}",app.GetString(IDS_TITLE_UPDATE_NAME));
#ifndef _WINDOWS64
replacedText = replaceAll(replacedText,L"{*KICK_PLAYER_DESCRIPTION*}",app.GetString(IDS_KICK_PLAYER_DESCRIPTION));
#endif
#ifdef _XBOX_ONE
replacedText = replaceAll(replacedText,L"{*PLATFORM_NAME*}",app.GetString(IDS_PLATFORM_NAME));
#endif
replacedText = replaceAll(replacedText,L"{*BACK_BUTTON*}",app.GetString(IDS_BACK_BUTTON));
replacedText = replaceAll(replacedText,L"{*DISABLES_ACHIEVEMENTS*}",app.GetString(IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS));
// 4J-JEV: Temporary fix: LOC: Minecraft: XB1: KO: Font: Uncategorized: Squares appear instead of hyphens in FIREWORKS description
if (!ui.UsingBitmapFont())
{
replacedText = replaceAll(replacedText, L"\u00A9", L"(C)");
replacedText = replaceAll(replacedText, L"\u00AE", L"(R)");
replacedText = replaceAll(replacedText, L"\u2013", L"-");
}
// strip out any tab characters and repeated spaces
stripWhitespaceForHtml( replacedText, true );