diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index 71f6b7d6..2517fa8e 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -3692,7 +3692,7 @@ void CMinecraftApp::HandleXuiActions(void) else { #if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ - if(UIScene_LoadOrJoinMenu::isSaveTransferRunning()) + if(UIScene_LoadCreateJoinMenu::isSaveTransferRunning()) { // the save transfer is still in progress, delay jumping back to the main menu until we've cleaned up SetAction(i,eAppAction_EthernetDisconnected); diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc index e3a4995d..b742b3ac 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64.arc and b/Minecraft.Client/Common/Media/MediaWindows64.arc differ diff --git a/Minecraft.Client/Common/Media/languages.loc b/Minecraft.Client/Common/Media/languages.loc index 63d31076..d74d4f8b 100644 Binary files a/Minecraft.Client/Common/Media/languages.loc and b/Minecraft.Client/Common/Media/languages.loc differ diff --git a/Minecraft.Client/Common/Media/movies720.txt b/Minecraft.Client/Common/Media/movies720.txt index 524fcee0..5b2c336b 100644 --- a/Minecraft.Client/Common/Media/movies720.txt +++ b/Minecraft.Client/Common/Media/movies720.txt @@ -49,6 +49,7 @@ JoinMenu720.swf LanguagesMenu720.swf LanguagesMenuSplit720.swf LoadOrJoinMenu720.swf +LoadCreateJoinMenu720.swf LaunchMoreOptionsMenu720.swf LeaderboardMenu720.swf LoadMenu720.swf diff --git a/Minecraft.Client/Common/UI/IUIScene_ClassicCraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_ClassicCraftingMenu.cpp index c1f05195..b611524e 100644 --- a/Minecraft.Client/Common/UI/IUIScene_ClassicCraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_ClassicCraftingMenu.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "IUIScene_FurnaceMenu.h" +#include "IUIScene_ClassicCraftingMenu.h" #include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_ClassicCraftingMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) diff --git a/Minecraft.Client/Common/UI/UI.h b/Minecraft.Client/Common/UI/UI.h index a7c416f8..1adcef5e 100644 --- a/Minecraft.Client/Common/UI/UI.h +++ b/Minecraft.Client/Common/UI/UI.h @@ -69,7 +69,7 @@ #include "UIScene_MainMenu.h" #include "UIScene_LoadMenu.h" #include "UIScene_JoinMenu.h" -#include "UIScene_LoadOrJoinMenu.h" +#include "UIScene_LoadCreateJoinMenu.h" #include "UIScene_CreateWorldMenu.h" #include "UIScene_LaunchMoreOptionsMenu.h" #include "UIScene_FullscreenProgress.h" diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp index c1f1bac5..25cbab57 100644 --- a/Minecraft.Client/Common/UI/UIController.cpp +++ b/Minecraft.Client/Common/UI/UIController.cpp @@ -1907,7 +1907,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI #if 0 // Disable since we don't use this // If you're navigating to the multigamejoinload, and the player hasn't seen the updates message yet, display it now // display this message the first 3 times - if((scene==eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0)) + if((scene==eUIScene_LoadCreateJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0)) { scene=eUIScene_NewUpdateMessage; bSeenUpdateTextThisSession=true; diff --git a/Minecraft.Client/Common/UI/UIEnums.h b/Minecraft.Client/Common/UI/UIEnums.h index 45aff87d..121995af 100644 --- a/Minecraft.Client/Common/UI/UIEnums.h +++ b/Minecraft.Client/Common/UI/UIEnums.h @@ -68,7 +68,7 @@ enum EUIScene eUIScene_DeathMenu, eUIComponent_TutorialPopup, eUIScene_CreateWorldMenu, - eUIScene_LoadOrJoinMenu, + eUIScene_LoadCreateJoinMenu, eUIScene_JoinMenu, eUIScene_SignEntryMenu, eUIScene_InGameInfoMenu, diff --git a/Minecraft.Client/Common/UI/UILayer.cpp b/Minecraft.Client/Common/UI/UILayer.cpp index e1c388f5..e2ccbb7f 100644 --- a/Minecraft.Client/Common/UI/UILayer.cpp +++ b/Minecraft.Client/Common/UI/UILayer.cpp @@ -367,8 +367,8 @@ bool UILayer::NavigateToScene(int iPad, EUIScene scene, void *initData) case eUIScene_MainMenu: newScene = new UIScene_MainMenu(iPad, initData, this); break; - case eUIScene_LoadOrJoinMenu: - newScene = new UIScene_LoadOrJoinMenu(iPad, initData, this); + case eUIScene_LoadCreateJoinMenu: + newScene = new UIScene_LoadCreateJoinMenu(iPad, initData, this); break; case eUIScene_LoadMenu: newScene = new UIScene_LoadMenu(iPad, initData, this); diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp index ef72ec16..c576a044 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp @@ -34,6 +34,13 @@ int UIScene_CreateWorldMenu::m_iDifficultyTitleSettingA[4]= IDS_DIFFICULTY_TITLE_HARD }; +int UIScene_CreateWorldMenu::m_iGamemodeTitleSettingA[3]= +{ + IDS_SURVIVAL, + IDS_CREATIVE, + IDS_ADVENTURE +}; + UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILayer *parentLayer) : IUIScene_StartGame(iPad, parentLayer) { // Setup all the Iggy references we need for this scene @@ -48,7 +55,6 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay m_editWorldName.init(m_worldName, eControl_EditWorldName); - m_buttonGamemode.init(app.GetString(IDS_GAMEMODE_SURVIVAL),eControl_GameModeToggle); m_buttonMoreOptions.init(app.GetString(IDS_MORE_OPTIONS),eControl_MoreOptions); m_buttonCreateWorld.init(app.GetString(IDS_CREATE_NEW_WORLD),eControl_NewWorld); @@ -61,6 +67,9 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)])); m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty)); + swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_GAMEMODE ),app.GetString(m_iGamemodeTitleSettingA[0])); + m_sliderGamemode.init(TempString,eControl_GameModeToggle,0,2,0); + m_MoreOptionsParams.bGenerateOptions=TRUE; m_MoreOptionsParams.bStructures=TRUE; m_MoreOptionsParams.bFlatWorld=FALSE; @@ -457,25 +466,6 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId) #endif } break; - case eControl_GameModeToggle: - switch(m_iGameModeId) - { - case 0: // Creative - m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE)); - m_iGameModeId = GameType::CREATIVE->getId(); - m_bGameModeCreative = true; - break; - case 1: // Adventure - m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE)); - m_iGameModeId = GameType::ADVENTURE->getId(); - m_bGameModeCreative = false; - break; - case 2: // Survival - m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL)); - m_iGameModeId = GameType::SURVIVAL->getId(); - m_bGameModeCreative = false; - }; - break; case eControl_MoreOptions: ui.NavigateToScene(m_iPad, eUIScene_LaunchMoreOptionsMenu, &m_MoreOptionsParams); break; @@ -657,6 +647,29 @@ void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue) app.SetGameSettings(m_iPad,eGameSetting_Difficulty,value); swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value])); m_sliderDifficulty.setLabel(TempString); + break; + case eControl_GameModeToggle: + m_sliderGamemode.handleSliderMove(value); + + if (value == 1) + { + m_bGameModeCreative=true; + m_iGameModeId = GameType::CREATIVE->getId(); + } + else if (value == 2) + { + m_bGameModeCreative=false; + m_iGameModeId = GameType::ADVENTURE->getId(); + } + else + { + m_bGameModeCreative=false; + m_iGameModeId = GameType::SURVIVAL->getId(); + } + + swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_GAMEMODE ),app.GetString(m_iGamemodeTitleSettingA[value])); + m_sliderGamemode.setLabel(TempString); + break; } } diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h index 75bfe602..8b877e0e 100644 --- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h @@ -17,16 +17,16 @@ private: }; static int m_iDifficultyTitleSettingA[4]; - + static int m_iGamemodeTitleSettingA[3]; wstring m_worldName; wstring m_seed; UIControl m_controlMainPanel; UIControl_Label m_labelWorldName; - UIControl_Button m_buttonGamemode, m_buttonMoreOptions, m_buttonCreateWorld; + UIControl_Button m_buttonMoreOptions, m_buttonCreateWorld; UIControl_TextInput m_editWorldName; - UIControl_Slider m_sliderDifficulty; + UIControl_Slider m_sliderGamemode, m_sliderDifficulty; UIControl_CheckBox m_checkboxOnline; UIControl_BitmapIcon m_bitmapIcon, m_bitmapComparison; @@ -37,10 +37,10 @@ private: UI_MAP_ELEMENT( m_labelWorldName, "WorldName") UI_MAP_ELEMENT( m_editWorldName, "EditWorldName") UI_MAP_ELEMENT( m_texturePackList, "TexturePackSelector") - UI_MAP_ELEMENT( m_buttonGamemode, "GameModeToggle") UI_MAP_ELEMENT( m_checkboxOnline, "CheckboxOnline") UI_MAP_ELEMENT( m_buttonMoreOptions, "MoreOptions") UI_MAP_ELEMENT( m_buttonCreateWorld, "NewWorld") + UI_MAP_ELEMENT( m_sliderGamemode, "GameModeToggle") UI_MAP_ELEMENT( m_sliderDifficulty, "Difficulty") UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() diff --git a/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.h b/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.h index 3f9ace3a..3386872f 100644 --- a/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.h @@ -77,7 +77,7 @@ public: virtual void handleFocusChange(F64 controlId, F64 childId); virtual void handleInitFocus(F64 controlId, F64 childId); - virtual EUIScene getSceneType() { return eUIScene_LoadOrJoinMenu;} + virtual EUIScene getSceneType() { return eUIScene_LoadCreateJoinMenu;} // Returns true if lower scenes in this scenes layer, or in any layer below this scenes layers should be hidden virtual bool hidesLowerScenes() { return true; } diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp similarity index 89% rename from Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp rename to Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp index d7ad789a..c84872bd 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "UI.h" -#include "UIScene_LoadOrJoinMenu.h" +#include "UIScene_LoadCreateJoinMenu.h" #include "..\..\..\Minecraft.World\StringHelpers.h" #include "..\..\..\Minecraft.World\net.minecraft.world.item.h" @@ -145,9 +145,9 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath) #ifdef SONY_REMOTE_STORAGE_DOWNLOAD -unsigned long UIScene_LoadOrJoinMenu::m_ulFileSize=0L; -wstring UIScene_LoadOrJoinMenu::m_wstrStageText=L""; -bool UIScene_LoadOrJoinMenu::m_bSaveTransferRunning = false; +unsigned long UIScene_LoadCreateJoinMenu::m_ulFileSize=0L; +wstring UIScene_LoadCreateJoinMenu::m_wstrStageText=L""; +bool UIScene_LoadCreateJoinMenu::m_bSaveTransferRunning = false; #endif @@ -160,19 +160,19 @@ bool UIScene_LoadOrJoinMenu::m_bSaveTransferRunning = false; #endif #ifdef _XBOX_ONE -UIScene_LoadOrJoinMenu::ESaveTransferFiles UIScene_LoadOrJoinMenu::s_eSaveTransferFile; -unsigned long UIScene_LoadOrJoinMenu::s_ulFileSize=0L; -byteArray UIScene_LoadOrJoinMenu::s_transferData = byteArray(); -wstring UIScene_LoadOrJoinMenu::m_wstrStageText=L""; +UIScene_LoadCreateJoinMenu::ESaveTransferFiles UIScene_LoadCreateJoinMenu::s_eSaveTransferFile; +unsigned long UIScene_LoadCreateJoinMenu::s_ulFileSize=0L; +byteArray UIScene_LoadCreateJoinMenu::s_transferData = byteArray(); +wstring UIScene_LoadCreateJoinMenu::m_wstrStageText=L""; #ifdef _DEBUG_MENUS_ENABLED -C4JStorage::SAVETRANSFER_FILE_DETAILS UIScene_LoadOrJoinMenu::m_debugTransferDetails; +C4JStorage::SAVETRANSFER_FILE_DETAILS UIScene_LoadCreateJoinMenu::m_debugTransferDetails; #endif #endif -int UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes) +int UIScene_LoadCreateJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes) { - UIScene_LoadOrJoinMenu *pClass= static_cast(lpParam); + UIScene_LoadCreateJoinMenu *pClass= static_cast(lpParam); app.DebugPrintf("Received data for save thumbnail\n"); @@ -193,9 +193,9 @@ int UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE p return 0; } -int UIScene_LoadOrJoinMenu::LoadSaveCallback(LPVOID lpParam,bool bRes) +int UIScene_LoadCreateJoinMenu::LoadSaveCallback(LPVOID lpParam,bool bRes) { - //UIScene_LoadOrJoinMenu *pClass= (UIScene_LoadOrJoinMenu *)lpParam; + //UIScene_LoadCreateJoinMenu *pClass= (UIScene_LoadCreateJoinMenu *)lpParam; // Get the save data now if(bRes) { @@ -204,7 +204,7 @@ int UIScene_LoadOrJoinMenu::LoadSaveCallback(LPVOID lpParam,bool bRes) return 0; } -UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) +UIScene_LoadCreateJoinMenu::UIScene_LoadCreateJoinMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { constexpr uint64_t MAXIMUM_SAVE_STORAGE = 4LL * 1024LL * 1024LL * 1024LL; @@ -231,7 +231,6 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer m_controlSavesTimer.setVisible( true ); m_controlJoinTimer.setVisible( true ); - #if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) m_spaceIndicatorSaves.init(L"",eControl_SpaceIndicator,0, MAXIMUM_SAVE_STORAGE); #endif @@ -263,7 +262,6 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer app.AddDLCRequest(e_Marketplace_Content); // content is skin packs, texture packs and mash-up packs #endif - int iLB = -1; #ifdef _XBOX @@ -399,7 +397,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer } -UIScene_LoadOrJoinMenu::~UIScene_LoadOrJoinMenu() +UIScene_LoadCreateJoinMenu::~UIScene_LoadCreateJoinMenu() { g_NetworkManager.SetSessionsUpdatedCallback( nullptr, nullptr ); app.SetLiveLinkRequired( false ); @@ -427,7 +425,7 @@ UIScene_LoadOrJoinMenu::~UIScene_LoadOrJoinMenu() } } -void UIScene_LoadOrJoinMenu::updateTooltips() +void UIScene_LoadCreateJoinMenu::updateTooltips() { #if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ if(m_eSaveTransferState!=eSaveTransfer_Idle) @@ -523,7 +521,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips() } // -void UIScene_LoadOrJoinMenu::Initialise() +void UIScene_LoadCreateJoinMenu::Initialise() { m_iSaveListIndex = 0; m_iGameListIndex = 0; @@ -582,13 +580,13 @@ void UIScene_LoadOrJoinMenu::Initialise() app.m_dlcManager.checkForCorruptDLCAndAlert(); } -void UIScene_LoadOrJoinMenu::updateComponents() +void UIScene_LoadCreateJoinMenu::updateComponents() { m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true); m_parentLayer->showComponent(m_iPad,eUIComponent_Logo,true); } -void UIScene_LoadOrJoinMenu::handleDestroy() +void UIScene_LoadCreateJoinMenu::handleDestroy() { #ifdef __PSVITA__ app.DebugPrintf("missing InputManager.DestroyKeyboard on Vita !!!!!!\n"); @@ -600,7 +598,7 @@ void UIScene_LoadOrJoinMenu::handleDestroy() #endif } -void UIScene_LoadOrJoinMenu::handleGainFocus(bool navBack) +void UIScene_LoadCreateJoinMenu::handleGainFocus(bool navBack) { UIScene::handleGainFocus(navBack); @@ -665,18 +663,18 @@ void UIScene_LoadOrJoinMenu::handleGainFocus(bool navBack) } } -void UIScene_LoadOrJoinMenu::handleLoseFocus() +void UIScene_LoadCreateJoinMenu::handleLoseFocus() { // Kill load online timer killTimer(JOIN_LOAD_ONLINE_TIMER_ID); } -wstring UIScene_LoadOrJoinMenu::getMoviePath() +wstring UIScene_LoadCreateJoinMenu::getMoviePath() { return L"LoadOrJoinMenu"; } -void UIScene_LoadOrJoinMenu::tick() +void UIScene_LoadCreateJoinMenu::tick() { UIScene::tick(); @@ -693,7 +691,7 @@ void UIScene_LoadOrJoinMenu::tick() if(hasFocus(m_iPad)) { #ifdef SONY_REMOTE_STORAGE_DOWNLOAD - // if the loadOrJoin menu has focus again, we can clear the saveTransfer flag now. Added so we can delay the ehternet disconnect till it's cleaned up + // if the loadCreateJoin menu has focus again, we can clear the saveTransfer flag now. Added so we can delay the ehternet disconnect till it's cleaned up if(m_eSaveTransferState == eSaveTransfer_Idle) m_bSaveTransferRunning = false; #endif @@ -1011,7 +1009,7 @@ void UIScene_LoadOrJoinMenu::tick() } -void UIScene_LoadOrJoinMenu::GetSaveInfo() +void UIScene_LoadCreateJoinMenu::GetSaveInfo() { unsigned int uiSaveC=0; @@ -1089,7 +1087,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo() return; } -void UIScene_LoadOrJoinMenu::AddDefaultButtons() +void UIScene_LoadCreateJoinMenu::AddDefaultButtons() { m_iDefaultButtonsC = 0; m_iMashUpButtonsC=0; @@ -1143,7 +1141,7 @@ void UIScene_LoadOrJoinMenu::AddDefaultButtons() m_iDefaultButtonsC += i; } -void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled) +void UIScene_LoadCreateJoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled) { if(m_bIgnoreInput) return; @@ -1178,7 +1176,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr #ifdef _XBOX_ONE if(ProfileManager.IsSignedInLive( m_iPad )) { - UIScene_LoadOrJoinMenu::s_ulFileSize=0; + UIScene_LoadCreateJoinMenu::s_ulFileSize=0; LaunchSaveTransfer(); } #endif @@ -1204,14 +1202,14 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr uiIDA[0]=IDS_CONFIRM_CANCEL; uiIDA[1]=IDS_TITLE_RENAMESAVE; uiIDA[2]=IDS_TOOLTIPS_DELETESAVE; - ui.RequestAlertMessage(IDS_TOOLTIPS_SAVEOPTIONS, IDS_TEXT_SAVEOPTIONS, uiIDA, 3, iPad,&UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned,this); + ui.RequestAlertMessage(IDS_TOOLTIPS_SAVEOPTIONS, IDS_TEXT_SAVEOPTIONS, uiIDA, 3, iPad,&UIScene_LoadCreateJoinMenu::SaveOptionsDialogReturned,this); } else { UINT uiIDA[2]; uiIDA[0]=IDS_CONFIRM_CANCEL; uiIDA[1]=IDS_CONFIRM_OK; - ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, iPad,&UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned,this); + ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, iPad,&UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned,this); } ui.PlayUISFX(eSFX_Press); } @@ -1254,7 +1252,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr UINT uiIDA[2]; uiIDA[0]=IDS_PRO_NOTONLINE_ACCEPT; uiIDA[1]=IDS_PRO_NOTONLINE_DECLINE; - ui.RequestAlertMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(), &UIScene_LoadOrJoinMenu::MustSignInReturnedPSN, this); + ui.RequestAlertMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(), &UIScene_LoadCreateJoinMenu::MustSignInReturnedPSN, this); } else { @@ -1297,7 +1295,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr UINT uiIDA[2]; uiIDA[0]=IDS_CONFIRM_CANCEL; uiIDA[1]=IDS_CONFIRM_OK; - ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, iPad,&UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned,this); + ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, iPad,&UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned,this); } else { @@ -1319,7 +1317,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr numOptions = 4; uiIDA[3]=IDS_COPYSAVE; #endif - ui.RequestAlertMessage(IDS_TOOLTIPS_SAVEOPTIONS, IDS_TEXT_SAVEOPTIONS, uiIDA, numOptions, iPad,&UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned,this); + ui.RequestAlertMessage(IDS_TOOLTIPS_SAVEOPTIONS, IDS_TEXT_SAVEOPTIONS, uiIDA, numOptions, iPad,&UIScene_LoadCreateJoinMenu::SaveOptionsDialogReturned,this); } else { @@ -1328,7 +1326,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr UINT uiIDA[2]; uiIDA[0]=IDS_CONFIRM_CANCEL; uiIDA[1]=IDS_CONFIRM_OK; - ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2,iPad,&UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned,this); + ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2,iPad,&UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned,this); } } ui.PlayUISFX(eSFX_Press); @@ -1409,10 +1407,10 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr } } -int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,bool bRes) +int UIScene_LoadCreateJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,bool bRes) { // 4J HEG - No reason to set value if keyboard was cancelled - UIScene_LoadOrJoinMenu *pClass=static_cast(lpParam); + UIScene_LoadCreateJoinMenu *pClass=static_cast(lpParam); pClass->m_bIgnoreInput=false; if (bRes) { @@ -1429,7 +1427,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo { #if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined(__PSVITA__)) // open the save and overwrite the metadata - StorageManager.RenameSaveData(pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC, ui16Text,&UIScene_LoadOrJoinMenu::RenameSaveDataReturned,pClass); + StorageManager.RenameSaveData(pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC, ui16Text,&UIScene_LoadCreateJoinMenu::RenameSaveDataReturned,pClass); #elif defined(_WINDOWS64) { int listPos = pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC; @@ -1460,7 +1458,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo pClass->m_saveDetails[listPos].UTF8SaveName[127] = '\0'; // Reuse the existing callback to trigger the list repopulate - UIScene_LoadOrJoinMenu::RenameSaveDataReturned(pClass, true); + UIScene_LoadCreateJoinMenu::RenameSaveDataReturned(pClass, true); } #endif } @@ -1479,14 +1477,14 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo return 0; } -void UIScene_LoadOrJoinMenu::handleInitFocus(F64 controlId, F64 childId) +void UIScene_LoadCreateJoinMenu::handleInitFocus(F64 controlId, F64 childId) { - app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleInitFocus - %d , %d\n", static_cast(controlId), static_cast(childId)); + app.DebugPrintf(app.USER_SR, "UIScene_LoadCreateJoinMenu::handleInitFocus - %d , %d\n", static_cast(controlId), static_cast(childId)); } -void UIScene_LoadOrJoinMenu::handleFocusChange(F64 controlId, F64 childId) +void UIScene_LoadCreateJoinMenu::handleFocusChange(F64 controlId, F64 childId) { - app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleFocusChange - %d , %d\n", static_cast(controlId), static_cast(childId)); + app.DebugPrintf(app.USER_SR, "UIScene_LoadCreateJoinMenu::handleFocusChange - %d , %d\n", static_cast(controlId), static_cast(childId)); switch(static_cast(controlId)) { @@ -1508,15 +1506,15 @@ void UIScene_LoadOrJoinMenu::handleFocusChange(F64 controlId, F64 childId) #ifdef SONY_REMOTE_STORAGE_DOWNLOAD -void UIScene_LoadOrJoinMenu::remoteStorageGetSaveCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code) +void UIScene_LoadCreateJoinMenu::remoteStorageGetSaveCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code) { app.DebugPrintf("remoteStorageGetCallback err : 0x%08x\n", error_code); assert(error_code == 0); - ((UIScene_LoadOrJoinMenu*)lpParam)->LoadSaveFromCloud(); + ((UIScene_LoadCreateJoinMenu*)lpParam)->LoadSaveFromCloud(); } #endif -void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId) +void UIScene_LoadCreateJoinMenu::handlePress(F64 controlId, F64 childId) { switch(static_cast(controlId)) { @@ -1577,7 +1575,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId) UINT uiIDA[2]; uiIDA[0]=IDS_CONFIRM_CANCEL; uiIDA[1]=IDS_CONFIRM_OK; - ui.RequestAlertMessage(IDS_CORRUPT_OR_DAMAGED_SAVE_TITLE, IDS_CORRUPT_OR_DAMAGED_SAVE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned,this); + ui.RequestAlertMessage(IDS_CORRUPT_OR_DAMAGED_SAVE_TITLE, IDS_CORRUPT_OR_DAMAGED_SAVE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned,this); } else @@ -1653,7 +1651,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId) } } -void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) +void UIScene_LoadCreateJoinMenu::CheckAndJoinGame(int gameIndex) { if( m_buttonListGames.getItemCount() > 0 && gameIndex < m_currentSessions->size() ) { @@ -1740,7 +1738,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) } else { - ui.RequestErrorMessage( IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA,1,iPadNotSignedInLive, &UIScene_LoadOrJoinMenu::MustSignInReturnedPSN, this); + ui.RequestErrorMessage( IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA,1,iPadNotSignedInLive, &UIScene_LoadCreateJoinMenu::MustSignInReturnedPSN, this); } return; } @@ -1772,7 +1770,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) // UINT uiIDA[2]; // uiIDA[0]=IDS_CONFIRM_OK; // uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP; - // ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadOrJoinMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false); + // ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadCreateJoinMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false); m_bIgnoreInput=false; return; @@ -1839,7 +1837,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) //uiIDA[1]=IDS_TEXTURE_PACK_TRIALVERSION; uiIDA[1]=IDS_CONFIRM_CANCEL; - ui.RequestAlertMessage(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, m_iPad,&UIScene_LoadOrJoinMenu::TexturePackDialogReturned,this); + ui.RequestAlertMessage(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, m_iPad,&UIScene_LoadCreateJoinMenu::TexturePackDialogReturned,this); return; } @@ -1848,7 +1846,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) if(CGameNetworkManager::usingAdhocMode() && !SQRNetworkManager_AdHoc_Vita::GetAdhocStatus()) { // not connected to adhoc anymore, must have connected back to PSN to buy texture pack so sign in again - SQRNetworkManager_AdHoc_Vita::AttemptAdhocSignIn(&UIScene_LoadOrJoinMenu::SignInAdhocReturned, this); + SQRNetworkManager_AdHoc_Vita::AttemptAdhocSignIn(&UIScene_LoadCreateJoinMenu::SignInAdhocReturned, this); return; } #endif @@ -1864,7 +1862,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) } } -void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen) +void UIScene_LoadCreateJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen) { // Load data from disc //File saveFile( L"Tutorial\\Tutorial" ); @@ -1923,16 +1921,16 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen) ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams); } -void UIScene_LoadOrJoinMenu::UpdateGamesListCallback(LPVOID pParam) +void UIScene_LoadCreateJoinMenu::UpdateGamesListCallback(LPVOID pParam) { if(pParam != nullptr) { - UIScene_LoadOrJoinMenu *pScene = static_cast(pParam); + UIScene_LoadCreateJoinMenu *pScene = static_cast(pParam); pScene->UpdateGamesList(); } } -void UIScene_LoadOrJoinMenu::UpdateGamesList() +void UIScene_LoadCreateJoinMenu::UpdateGamesList() { // If we're ignoring input scene isn't active so do nothing if (m_bIgnoreInput) return; @@ -2124,12 +2122,12 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() updateTooltips(); } -void UIScene_LoadOrJoinMenu::HandleDLCMountingComplete() +void UIScene_LoadCreateJoinMenu::HandleDLCMountingComplete() { Initialise(); } -bool UIScene_LoadOrJoinMenu::DoesSavesListHaveFocus() +bool UIScene_LoadCreateJoinMenu::DoesSavesListHaveFocus() { if( m_buttonListSaves.hasFocus() ) { @@ -2142,7 +2140,7 @@ bool UIScene_LoadOrJoinMenu::DoesSavesListHaveFocus() return false; } -bool UIScene_LoadOrJoinMenu::DoesMashUpWorldHaveFocus() +bool UIScene_LoadCreateJoinMenu::DoesMashUpWorldHaveFocus() { if(m_buttonListSaves.hasFocus()) { @@ -2161,12 +2159,12 @@ bool UIScene_LoadOrJoinMenu::DoesMashUpWorldHaveFocus() else return false; } -bool UIScene_LoadOrJoinMenu::DoesGamesListHaveFocus() +bool UIScene_LoadCreateJoinMenu::DoesGamesListHaveFocus() { return m_buttonListGames.hasFocus(); } -void UIScene_LoadOrJoinMenu::handleTimerComplete(int id) +void UIScene_LoadCreateJoinMenu::handleTimerComplete(int id) { switch(id) { @@ -2263,7 +2261,7 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id) } -void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform savePlatform /*= SAVE_FILE_PLATFORM_LOCAL*/) +void UIScene_LoadCreateJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform savePlatform /*= SAVE_FILE_PLATFORM_LOCAL*/) { // we'll only be coming in here when the tutorial is loaded now @@ -2321,7 +2319,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform save } #ifdef SONY_REMOTE_STORAGE_DOWNLOAD -void UIScene_LoadOrJoinMenu::LoadSaveFromCloud() +void UIScene_LoadCreateJoinMenu::LoadSaveFromCloud() { wchar_t wFileName[128]; @@ -2412,9 +2410,9 @@ static bool Win64_DeleteSaveDirectory(const wchar_t* wPath) } #endif // _WINDOWS64 -int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = static_cast(pParam); + UIScene_LoadCreateJoinMenu* pClass = static_cast(pParam); // results switched for this dialog // Check that we have a valid save selected (can get a bad index if the save list has been refreshed) @@ -2441,10 +2439,10 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt swprintf_s(wFolderPath, MAX_PATH, L"Windows64\\GameHDD\\%s", wFilename); bSuccess = Win64_DeleteSaveDirectory(wFolderPath); } - UIScene_LoadOrJoinMenu::DeleteSaveDataReturned((LPVOID)pClass->GetCallbackUniqueId(), bSuccess); + UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned((LPVOID)pClass->GetCallbackUniqueId(), bSuccess); } #else - StorageManager.DeleteSaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC], UIScene_LoadOrJoinMenu::DeleteSaveDataReturned, (LPVOID)pClass->GetCallbackUniqueId()); + StorageManager.DeleteSaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC], UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned, (LPVOID)pClass->GetCallbackUniqueId()); #endif pClass->m_controlSavesTimer.setVisible( true ); } @@ -2457,10 +2455,10 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt return 0; } -int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes) +int UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes) { ui.EnterCallbackIdCriticalSection(); - UIScene_LoadOrJoinMenu* pClass = static_cast(ui.GetSceneFromCallbackId((size_t)lpParam)); + UIScene_LoadCreateJoinMenu* pClass = static_cast(ui.GetSceneFromCallbackId((size_t)lpParam)); if(pClass) { @@ -2478,9 +2476,9 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes) } -int UIScene_LoadOrJoinMenu::RenameSaveDataReturned(LPVOID lpParam,bool bRes) +int UIScene_LoadCreateJoinMenu::RenameSaveDataReturned(LPVOID lpParam,bool bRes) { - UIScene_LoadOrJoinMenu* pClass = static_cast(lpParam); + UIScene_LoadCreateJoinMenu* pClass = static_cast(lpParam); if(bRes) { @@ -2496,7 +2494,7 @@ int UIScene_LoadOrJoinMenu::RenameSaveDataReturned(LPVOID lpParam,bool bRes) #ifdef __ORBIS__ -void UIScene_LoadOrJoinMenu::LoadRemoteFileFromDisk(char* remoteFilename) +void UIScene_LoadCreateJoinMenu::LoadRemoteFileFromDisk(char* remoteFilename) { wchar_t wSaveName[128]; mbstowcs(wSaveName, remoteFilename, strlen(remoteFilename)+1); // plus null @@ -2510,9 +2508,9 @@ void UIScene_LoadOrJoinMenu::LoadRemoteFileFromDisk(char* remoteFilename) #endif -int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = static_cast(pParam); + UIScene_LoadCreateJoinMenu* pClass = static_cast(pParam); // results switched for this dialog // EMessage_ResultAccept means cancel @@ -2530,14 +2528,14 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS kbData.title = app.GetString(IDS_RENAME_WORLD_TITLE); kbData.defaultText = wSaveName; kbData.maxChars = 25; - kbData.callback = &UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback; + kbData.callback = &UIScene_LoadCreateJoinMenu::KeyboardCompleteWorldNameCallback; kbData.lpParam = pClass; kbData.pcMode = g_KBMInput.IsKBMActive(); ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData); } #elif defined _DURANGO // bring up a keyboard - InputManager.RequestKeyboard(app.GetString(IDS_RENAME_WORLD_TITLE), (pClass->m_saveDetails[pClass->m_iSaveListIndex-pClass->m_iDefaultButtonsC]).UTF16SaveName,(DWORD)0,25,&UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback,pClass,C_4JInput::EKeyboardMode_Default); + InputManager.RequestKeyboard(app.GetString(IDS_RENAME_WORLD_TITLE), (pClass->m_saveDetails[pClass->m_iSaveListIndex-pClass->m_iDefaultButtonsC]).UTF16SaveName,(DWORD)0,25,&UIScene_LoadCreateJoinMenu::KeyboardCompleteWorldNameCallback,pClass,C_4JInput::EKeyboardMode_Default); #else // bring up a keyboard wchar_t wSaveName[128]; @@ -2545,7 +2543,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS ZeroMemory(wSaveName, 128 * sizeof(wchar_t) ); mbstowcs(wSaveName, pClass->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC].UTF8SaveName, strlen(pClass->m_saveDetails->UTF8SaveName)+1); // plus null LPWSTR ptr = wSaveName; - InputManager.RequestKeyboard(app.GetString(IDS_RENAME_WORLD_TITLE),wSaveName,(DWORD)0,25,&UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback,pClass,C_4JInput::EKeyboardMode_Default); + InputManager.RequestKeyboard(app.GetString(IDS_RENAME_WORLD_TITLE),wSaveName,(DWORD)0,25,&UIScene_LoadCreateJoinMenu::KeyboardCompleteWorldNameCallback,pClass,C_4JInput::EKeyboardMode_Default); #endif } break; @@ -2557,7 +2555,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS UINT uiIDA[2]; uiIDA[0]=IDS_CONFIRM_CANCEL; uiIDA[1]=IDS_CONFIRM_OK; - ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, iPad,&UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned,pClass); + ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, iPad,&UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned,pClass); } break; @@ -2568,7 +2566,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS uiIDA[0]=IDS_CONFIRM_OK; uiIDA[1]=IDS_CONFIRM_CANCEL; - ui.RequestAlertMessage(IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_TEXT, uiIDA, 2, iPad,&UIScene_LoadOrJoinMenu::SaveTransferDialogReturned,pClass); + ui.RequestAlertMessage(IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_TEXT, uiIDA, 2, iPad,&UIScene_LoadCreateJoinMenu::SaveTransferDialogReturned,pClass); } break; #endif // SONY_REMOTE_STORAGE_UPLOAD @@ -2579,7 +2577,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS uiIDA[0]=IDS_CONFIRM_OK; uiIDA[1]=IDS_CONFIRM_CANCEL; - ui.RequestAlertMessage(IDS_COPYSAVE, IDS_TEXT_COPY_SAVE, uiIDA, 2, iPad,&UIScene_LoadOrJoinMenu::CopySaveDialogReturned,pClass); + ui.RequestAlertMessage(IDS_COPYSAVE, IDS_TEXT_COPY_SAVE, uiIDA, 2, iPad,&UIScene_LoadCreateJoinMenu::CopySaveDialogReturned,pClass); } break; #endif @@ -2599,9 +2597,9 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS #if defined (__PSVITA__) -int UIScene_LoadOrJoinMenu::SignInAdhocReturned(void *pParam,bool bContinue, int iPad) +int UIScene_LoadCreateJoinMenu::SignInAdhocReturned(void *pParam,bool bContinue, int iPad) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)pParam; pClass->m_bIgnoreInput = false; return 0; @@ -2609,13 +2607,13 @@ int UIScene_LoadOrJoinMenu::SignInAdhocReturned(void *pParam,bool bContinue, int -int UIScene_LoadOrJoinMenu::MustSignInTexturePack(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::MustSignInTexturePack(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)pParam; if(result==C4JStorage::EMessage_ResultAccept) { - SQRNetworkManager_Vita::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack, pClass); + SQRNetworkManager_Vita::AttemptPSNSignIn(&UIScene_LoadCreateJoinMenu::MustSignInReturnedTexturePack, pClass); } else { @@ -2626,9 +2624,9 @@ int UIScene_LoadOrJoinMenu::MustSignInTexturePack(void *pParam,int iPad,C4JStora } -int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bContinue, int iPad) +int UIScene_LoadCreateJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bContinue, int iPad) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)pParam; int commerceState = app.GetCommerceState(); while( commerceState != CConsoleMinecraftApp::eCommerce_State_Offline && @@ -2681,9 +2679,9 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bCon #endif -int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu *pClass = static_cast(pParam); + UIScene_LoadCreateJoinMenu *pClass = static_cast(pParam); // Exit with or without saving if(result==C4JStorage::EMessage_ResultAccept) @@ -2699,7 +2697,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS UINT uiIDA[2]; uiIDA[0]=IDS_PRO_NOTONLINE_ACCEPT; uiIDA[1]=IDS_PRO_NOTONLINE_DECLINE; - ui.RequestAlertMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 2, ProfileManager.GetPrimaryPad(),&UIScene_LoadOrJoinMenu::MustSignInTexturePack,pClass); + ui.RequestAlertMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 2, ProfileManager.GetPrimaryPad(),&UIScene_LoadCreateJoinMenu::MustSignInTexturePack,pClass); return; } #endif @@ -2765,18 +2763,18 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS } #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ -int UIScene_LoadOrJoinMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)pParam; if(result==C4JStorage::EMessage_ResultAccept) { #if defined(__PS3__) - SQRNetworkManager_PS3::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::PSN_SignInReturned, pClass); + SQRNetworkManager_PS3::AttemptPSNSignIn(&UIScene_LoadCreateJoinMenu::PSN_SignInReturned, pClass); #elif defined __PSVITA__ - SQRNetworkManager_Vita::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::PSN_SignInReturned, pClass); + SQRNetworkManager_Vita::AttemptPSNSignIn(&UIScene_LoadCreateJoinMenu::PSN_SignInReturned, pClass); #else - SQRNetworkManager_Orbis::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::PSN_SignInReturned, pClass, false, iPad); + SQRNetworkManager_Orbis::AttemptPSNSignIn(&UIScene_LoadCreateJoinMenu::PSN_SignInReturned, pClass, false, iPad); #endif } else @@ -2787,9 +2785,9 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStora return 0; } -int UIScene_LoadOrJoinMenu::PSN_SignInReturned(void *pParam,bool bContinue, int iPad) +int UIScene_LoadCreateJoinMenu::PSN_SignInReturned(void *pParam,bool bContinue, int iPad) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)pParam; if(bContinue==true) { switch(pClass->m_eAction) @@ -2823,10 +2821,10 @@ int UIScene_LoadOrJoinMenu::PSN_SignInReturned(void *pParam,bool bContinue, int #ifdef SONY_REMOTE_STORAGE_DOWNLOAD -void UIScene_LoadOrJoinMenu::LaunchSaveTransfer() +void UIScene_LoadCreateJoinMenu::LaunchSaveTransfer() { LoadingInputParams *loadingParams = new LoadingInputParams(); - loadingParams->func = &UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc; + loadingParams->func = &UIScene_LoadCreateJoinMenu::DownloadSonyCrossSaveThreadProc; loadingParams->lpParam = (LPVOID)this; UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData(); @@ -2836,7 +2834,7 @@ void UIScene_LoadOrJoinMenu::LaunchSaveTransfer() completionData->iPad = DEFAULT_XUI_MENU_USER; loadingParams->completionData = completionData; - loadingParams->cancelFunc=&UIScene_LoadOrJoinMenu::CancelSaveTransferCallback; + loadingParams->cancelFunc=&UIScene_LoadCreateJoinMenu::CancelSaveTransferCallback; loadingParams->m_cancelFuncParam=this; loadingParams->cancelText=IDS_TOOLTIPS_CANCEL; @@ -2846,9 +2844,9 @@ void UIScene_LoadOrJoinMenu::LaunchSaveTransfer() -int UIScene_LoadOrJoinMenu::CreateDummySaveDataCallback(LPVOID lpParam,bool bRes) +int UIScene_LoadCreateJoinMenu::CreateDummySaveDataCallback(LPVOID lpParam,bool bRes) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) lpParam; if(bRes) { pClass->m_eSaveTransferState = eSaveTransfer_GetSavesInfo; @@ -2862,9 +2860,9 @@ int UIScene_LoadOrJoinMenu::CreateDummySaveDataCallback(LPVOID lpParam,bool bRes return 0; } -int UIScene_LoadOrJoinMenu::CrossSaveGetSavesInfoCallback(LPVOID lpParam, SAVE_DETAILS *pSaveDetails, bool bRes) +int UIScene_LoadCreateJoinMenu::CrossSaveGetSavesInfoCallback(LPVOID lpParam, SAVE_DETAILS *pSaveDetails, bool bRes) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) lpParam; if(bRes) { pClass->m_eSaveTransferState = eSaveTransfer_GetFileData; @@ -2877,9 +2875,9 @@ int UIScene_LoadOrJoinMenu::CrossSaveGetSavesInfoCallback(LPVOID lpParam, SAVE_D return 0; } -int UIScene_LoadOrJoinMenu::LoadCrossSaveDataCallback( void *pParam,bool bIsCorrupt, bool bIsOwner ) +int UIScene_LoadCreateJoinMenu::LoadCrossSaveDataCallback( void *pParam,bool bIsCorrupt, bool bIsOwner ) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) pParam; if(bIsCorrupt == false && bIsOwner) { pClass->m_eSaveTransferState = eSaveTransfer_CreatingNewSave; @@ -2893,24 +2891,24 @@ int UIScene_LoadOrJoinMenu::LoadCrossSaveDataCallback( void *pParam,bool bIsCorr return 0; } -int UIScene_LoadOrJoinMenu::CrossSaveFinishedCallback(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::CrossSaveFinishedCallback(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) pParam; pClass->m_eSaveTransferState = eSaveTransfer_Idle; return 0; } -int UIScene_LoadOrJoinMenu::CrossSaveDeleteOnErrorReturned(LPVOID lpParam,bool bRes) +int UIScene_LoadCreateJoinMenu::CrossSaveDeleteOnErrorReturned(LPVOID lpParam,bool bRes) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) lpParam; pClass->m_eSaveTransferState = eSaveTransfer_ErrorMesssage; return 0; } -int UIScene_LoadOrJoinMenu::RemoteSaveNotFoundCallback(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::RemoteSaveNotFoundCallback(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) pParam; pClass->m_eSaveTransferState = eSaveTransfer_Idle; return 0; } @@ -2920,14 +2918,14 @@ int UIScene_LoadOrJoinMenu::RemoteSaveNotFoundCallback(void *pParam,int iPad,C4J bool g_bForceVitaSaveWipe = false; -int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter ) +int UIScene_LoadCreateJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter ) { m_bSaveTransferRunning = true; #ifdef __PS3__ StorageManager.SetSaveTransferInProgress(true); #endif Compression::UseDefaultThreadStorage(); - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParameter; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) lpParameter; pClass->m_saveTransferDownloadCancelled = false; m_bSaveTransferRunning = true; bool bAbortCalled = false; @@ -2952,7 +2950,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter case eSaveTransfer_Idle: break; case eSaveTransfer_GetRemoteSaveInfo: - app.DebugPrintf("UIScene_LoadOrJoinMenu getSaveInfo\n"); + app.DebugPrintf("UIScene_LoadCreateJoinMenu getSaveInfo\n"); app.getRemoteStorage()->getSaveInfo(); pClass->m_eSaveTransferState = eSaveTransfer_GettingRemoteSaveInfo; break; @@ -3016,7 +3014,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter StorageManager.SetSaveImages(pbThumbnailData,dwThumbnailDataSize,pbDataSaveImage,dwDataSizeSaveImage,bTextMetadata,iTextMetadataBytes); app.getRemoteStorage()->waitForStorageManagerIdle(); - C4JStorage::ESaveGameState saveState = StorageManager.SaveSaveData( &UIScene_LoadOrJoinMenu::CreateDummySaveDataCallback, lpParameter ); + C4JStorage::ESaveGameState saveState = StorageManager.SaveSaveData( &UIScene_LoadCreateJoinMenu::CreateDummySaveDataCallback, lpParameter ); if(saveState == C4JStorage::ESaveGame_Save) { pClass->m_eSaveTransferState = eSaveTransfer_CreatingDummyFile; @@ -3043,7 +3041,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter app.getRemoteStorage()->waitForStorageManagerIdle(); app.DebugPrintf("CALL GetSavesInfo B\n"); - C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(pClass->m_iPad,&UIScene_LoadOrJoinMenu::CrossSaveGetSavesInfoCallback,pClass,"save"); + C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(pClass->m_iPad,&UIScene_LoadCreateJoinMenu::CrossSaveGetSavesInfoCallback,pClass,"save"); pClass->m_eSaveTransferState = eSaveTransfer_GettingSavesInfo; } break; @@ -3277,7 +3275,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter { // delete the save file app.getRemoteStorage()->waitForStorageManagerIdle(); - C4JStorage::ESaveGameState eDeleteStatus = StorageManager.DeleteSaveData(&pSaveDetails->SaveInfoA[saveInfoIndex],UIScene_LoadOrJoinMenu::CrossSaveDeleteOnErrorReturned,pClass); + C4JStorage::ESaveGameState eDeleteStatus = StorageManager.DeleteSaveData(&pSaveDetails->SaveInfoA[saveInfoIndex],UIScene_LoadCreateJoinMenu::CrossSaveDeleteOnErrorReturned,pClass); if(eDeleteStatus == C4JStorage::ESaveGame_Delete) { pClass->m_eSaveTransferState = eSaveTransfer_ErrorDeletingSave; @@ -3353,9 +3351,9 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter } -void UIScene_LoadOrJoinMenu::SaveTransferReturned(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code) +void UIScene_LoadCreateJoinMenu::SaveTransferReturned(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) lpParam; if(s == SonyRemoteStorage::e_getDataSucceeded) { @@ -3368,14 +3366,14 @@ void UIScene_LoadOrJoinMenu::SaveTransferReturned(LPVOID lpParam, SonyRemoteStor } } -ConsoleSaveFile* UIScene_LoadOrJoinMenu::SonyCrossSaveConvert() +ConsoleSaveFile* UIScene_LoadCreateJoinMenu::SonyCrossSaveConvert() { return nullptr; } -void UIScene_LoadOrJoinMenu::CancelSaveTransferCallback(LPVOID lpParam) +void UIScene_LoadCreateJoinMenu::CancelSaveTransferCallback(LPVOID lpParam) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) lpParam; pClass->m_saveTransferDownloadCancelled = true; ui.SetTooltips( DEFAULT_XUI_MENU_USER, -1, -1, -1, -1,-1,-1,-1,-1); // MGH - added - remove the "cancel" tooltip, so the player knows it's underway (really needs a "cancelling" message) } @@ -3386,10 +3384,10 @@ void UIScene_LoadOrJoinMenu::CancelSaveTransferCallback(LPVOID lpParam) #ifdef SONY_REMOTE_STORAGE_UPLOAD -void UIScene_LoadOrJoinMenu::LaunchSaveUpload() +void UIScene_LoadCreateJoinMenu::LaunchSaveUpload() { LoadingInputParams *loadingParams = new LoadingInputParams(); - loadingParams->func = &UIScene_LoadOrJoinMenu::UploadSonyCrossSaveThreadProc; + loadingParams->func = &UIScene_LoadCreateJoinMenu::UploadSonyCrossSaveThreadProc; loadingParams->lpParam = (LPVOID)this; UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData(); @@ -3400,7 +3398,7 @@ void UIScene_LoadOrJoinMenu::LaunchSaveUpload() loadingParams->completionData = completionData; // 4J-PB - Waiting for Sony to fix canceling a save upload - loadingParams->cancelFunc=&UIScene_LoadOrJoinMenu::CancelSaveUploadCallback; + loadingParams->cancelFunc=&UIScene_LoadCreateJoinMenu::CancelSaveUploadCallback; loadingParams->m_cancelFuncParam = this; loadingParams->cancelText=IDS_TOOLTIPS_CANCEL; @@ -3408,18 +3406,18 @@ void UIScene_LoadOrJoinMenu::LaunchSaveUpload() } -int UIScene_LoadOrJoinMenu::CrossSaveUploadFinishedCallback(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::CrossSaveUploadFinishedCallback(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) pParam; pClass->m_eSaveUploadState = eSaveUpload_Idle; return 0; } -int UIScene_LoadOrJoinMenu::UploadSonyCrossSaveThreadProc( LPVOID lpParameter ) +int UIScene_LoadCreateJoinMenu::UploadSonyCrossSaveThreadProc( LPVOID lpParameter ) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParameter; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) lpParameter; pClass->m_saveTransferUploadCancelled = false; bool bAbortCalled = false; Minecraft *pMinecraft=Minecraft::GetInstance(); @@ -3506,9 +3504,9 @@ int UIScene_LoadOrJoinMenu::UploadSonyCrossSaveThreadProc( LPVOID lpParameter ) } -void UIScene_LoadOrJoinMenu::SaveUploadReturned(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code) +void UIScene_LoadCreateJoinMenu::SaveUploadReturned(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) lpParam; if(pClass->m_saveTransferUploadCancelled) { @@ -3525,9 +3523,9 @@ void UIScene_LoadOrJoinMenu::SaveUploadReturned(LPVOID lpParam, SonyRemoteStorag } } -void UIScene_LoadOrJoinMenu::CancelSaveUploadCallback(LPVOID lpParam) +void UIScene_LoadCreateJoinMenu::CancelSaveUploadCallback(LPVOID lpParam) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu *) lpParam; pClass->m_saveTransferUploadCancelled = true; app.DebugPrintf("m_saveTransferUploadCancelled = true\n"); ui.SetTooltips( DEFAULT_XUI_MENU_USER, -1, -1, -1, -1,-1,-1,-1,-1); // MGH - added - remove the "cancel" tooltip, so the player knows it's underway (really needs a "cancelling" message) @@ -3535,9 +3533,9 @@ void UIScene_LoadOrJoinMenu::CancelSaveUploadCallback(LPVOID lpParam) pClass->m_bIgnoreInput = true; } -int UIScene_LoadOrJoinMenu::SaveTransferDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::SaveTransferDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)pParam; // results switched for this dialog if(result==C4JStorage::EMessage_ResultAccept) { @@ -3556,7 +3554,7 @@ int UIScene_LoadOrJoinMenu::SaveTransferDialogReturned(void *pParam,int iPad,C4J #if defined _XBOX_ONE -void UIScene_LoadOrJoinMenu::LaunchSaveTransfer() +void UIScene_LoadCreateJoinMenu::LaunchSaveTransfer() { SaveTransferStateContainer *stateContainer = new SaveTransferStateContainer(); stateContainer->m_iProgress = 0; @@ -3567,7 +3565,7 @@ void UIScene_LoadOrJoinMenu::LaunchSaveTransfer() stateContainer->m_pClass = this; LoadingInputParams *loadingParams = new LoadingInputParams(); - loadingParams->func = &UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc; + loadingParams->func = &UIScene_LoadCreateJoinMenu::DownloadXbox360SaveThreadProc; loadingParams->lpParam = (LPVOID)stateContainer; UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData(); @@ -3578,7 +3576,7 @@ void UIScene_LoadOrJoinMenu::LaunchSaveTransfer() completionData->bRequiresUserAction=TRUE; loadingParams->completionData = completionData; - loadingParams->cancelFunc=&UIScene_LoadOrJoinMenu::CancelSaveTransferCallback; + loadingParams->cancelFunc=&UIScene_LoadCreateJoinMenu::CancelSaveTransferCallback; loadingParams->m_cancelFuncParam=stateContainer; loadingParams->cancelText=IDS_TOOLTIPS_CANCEL; @@ -3587,7 +3585,7 @@ void UIScene_LoadOrJoinMenu::LaunchSaveTransfer() -int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter ) +int UIScene_LoadCreateJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter ) { Compression::UseDefaultThreadStorage(); @@ -3602,7 +3600,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter ) pStateContainer->m_bSaveTransferInProgress=true; - UIScene_LoadOrJoinMenu::s_eSaveTransferFile = eSaveTransferFile_Marker; + UIScene_LoadCreateJoinMenu::s_eSaveTransferFile = eSaveTransferFile_Marker; RequestFileSize( pStateContainer, L"completemarker" ); while((pStateContainer->m_eSaveTransferState!=C4JStorage::eSaveTransfer_Idle) && pStateContainer->m_bSaveTransferInProgress && !pStateContainer->m_bSaveTransferCancelled) @@ -3612,10 +3610,10 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter ) case C4JStorage::eSaveTransfer_Idle: break; case C4JStorage::eSaveTransfer_FileSizeRetrieved: - switch(UIScene_LoadOrJoinMenu::s_eSaveTransferFile) + switch(UIScene_LoadCreateJoinMenu::s_eSaveTransferFile) { case eSaveTransferFile_Marker: - if(UIScene_LoadOrJoinMenu::s_ulFileSize == 0) + if(UIScene_LoadCreateJoinMenu::s_ulFileSize == 0) { pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_NONE_FOUND); pStateContainer->m_eSaveTransferState=C4JStorage::eSaveTransfer_Idle; @@ -3637,25 +3635,25 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter ) break; case C4JStorage::eSaveTransfer_FileDataRetrieved: - switch(UIScene_LoadOrJoinMenu::s_eSaveTransferFile) + switch(UIScene_LoadCreateJoinMenu::s_eSaveTransferFile) { case eSaveTransferFile_Marker: // MGH - the marker file now contains the save file version number // if the version is higher than we handle, cancel the download. - if(UIScene_LoadOrJoinMenu::s_transferData[0] > SAVE_FILE_VERSION_NUMBER) + if(UIScene_LoadCreateJoinMenu::s_transferData[0] > SAVE_FILE_VERSION_NUMBER) { pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_NONE_FOUND); pStateContainer->m_eSaveTransferState=C4JStorage::eSaveTransfer_Idle; } else { - UIScene_LoadOrJoinMenu::s_eSaveTransferFile = eSaveTransferFile_Metadata; + UIScene_LoadCreateJoinMenu::s_eSaveTransferFile = eSaveTransferFile_Metadata; RequestFileSize( pStateContainer, L"metadata" ); } break; case eSaveTransferFile_Metadata: { - ByteArrayInputStream bais(UIScene_LoadOrJoinMenu::s_transferData); + ByteArrayInputStream bais(UIScene_LoadCreateJoinMenu::s_transferData); DataInputStream dis(&bais); wstring saveTitle = dis.readUTF(); @@ -3700,8 +3698,8 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter ) delete ba.data; } - UIScene_LoadOrJoinMenu::s_transferData = byteArray(); - UIScene_LoadOrJoinMenu::s_eSaveTransferFile = eSaveTransferFile_SaveData; + UIScene_LoadCreateJoinMenu::s_transferData = byteArray(); + UIScene_LoadCreateJoinMenu::s_eSaveTransferFile = eSaveTransferFile_SaveData; RequestFileSize( pStateContainer, L"savedata" ); } break; @@ -3710,7 +3708,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter ) #ifdef SPLIT_SAVES if(!pStateContainer->m_bSaveTransferCancelled) { - ConsoleSaveFileOriginal oldFormatSave( L"Temp name", UIScene_LoadOrJoinMenu::s_transferData.data, UIScene_LoadOrJoinMenu::s_transferData.length, false, SAVE_FILE_PLATFORM_X360 ); + ConsoleSaveFileOriginal oldFormatSave( L"Temp name", UIScene_LoadCreateJoinMenu::s_transferData.data, UIScene_LoadCreateJoinMenu::s_transferData.length, false, SAVE_FILE_PLATFORM_X360 ); pSave = new ConsoleSaveFileSplit( &oldFormatSave, false, pMinecraft->progressRenderer ); pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING); @@ -3722,8 +3720,8 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter ) pSave = new ConsoleSaveFileOriginal( wSaveName, m_transferData.data, m_transferData.length, false, SAVE_FILE_PLATFORM_X360 ); pStateContainer->m_eSaveTransferState=C4JStorage::eSaveTransfer_Converting; #endif - delete UIScene_LoadOrJoinMenu::s_transferData.data; - UIScene_LoadOrJoinMenu::s_transferData = byteArray(); + delete UIScene_LoadCreateJoinMenu::s_transferData.data; + UIScene_LoadCreateJoinMenu::s_transferData = byteArray(); } break; }; @@ -3808,7 +3806,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter ) return 0; } -void UIScene_LoadOrJoinMenu::RequestFileSize( SaveTransferStateContainer *pClass, wchar_t *filename ) +void UIScene_LoadCreateJoinMenu::RequestFileSize( SaveTransferStateContainer *pClass, wchar_t *filename ) { Minecraft *pMinecraft=Minecraft::GetInstance(); @@ -3834,20 +3832,20 @@ void UIScene_LoadOrJoinMenu::RequestFileSize( SaveTransferStateContainer *pClass pMinecraft->progressRenderer->progressStart(IDS_SAVETRANSFER_TITLE_GET); pMinecraft->progressRenderer->progressStage( IDS_SAVETRANSFER_STAGE_GET_DETAILS ); Sleep(1); - pClass->m_eSaveTransferState=StorageManager.SaveTransferGetDetails(pClass->m_iPad,C4JStorage::eGlobalStorage_TitleUser,filename,&UIScene_LoadOrJoinMenu::SaveTransferReturned,pClass); + pClass->m_eSaveTransferState=StorageManager.SaveTransferGetDetails(pClass->m_iPad,C4JStorage::eGlobalStorage_TitleUser,filename,&UIScene_LoadCreateJoinMenu::SaveTransferReturned,pClass); } while(pClass->m_eSaveTransferState == C4JStorage::eSaveTransfer_Busy && !pClass->m_bSaveTransferCancelled ); } } -void UIScene_LoadOrJoinMenu::RequestFileData( SaveTransferStateContainer *pClass, wchar_t *filename ) +void UIScene_LoadCreateJoinMenu::RequestFileData( SaveTransferStateContainer *pClass, wchar_t *filename ) { Minecraft *pMinecraft=Minecraft::GetInstance(); WCHAR wcTemp[256]; pMinecraft->progressRenderer->progressStagePercentage(0); - swprintf(wcTemp,app.GetString(IDS_SAVETRANSFER_STAGE_GET_DATA),0,UIScene_LoadOrJoinMenu::s_ulFileSize); + swprintf(wcTemp,app.GetString(IDS_SAVETRANSFER_STAGE_GET_DATA),0,UIScene_LoadCreateJoinMenu::s_ulFileSize); m_wstrStageText=wcTemp; pMinecraft->progressRenderer->progressStage( m_wstrStageText ); @@ -3879,13 +3877,13 @@ void UIScene_LoadOrJoinMenu::RequestFileData( SaveTransferStateContainer *pClass pMinecraft->progressRenderer->progressStart(IDS_SAVETRANSFER_TITLE_GET); pMinecraft->progressRenderer->progressStage( -1 ); Sleep(1); - pClass->m_eSaveTransferState=StorageManager.SaveTransferGetData(pClass->m_iPad,C4JStorage::eGlobalStorage_TitleUser,filename,&UIScene_LoadOrJoinMenu::SaveTransferReturned,&UIScene_LoadOrJoinMenu::SaveTransferUpdateProgress,pClass,pClass); + pClass->m_eSaveTransferState=StorageManager.SaveTransferGetData(pClass->m_iPad,C4JStorage::eGlobalStorage_TitleUser,filename,&UIScene_LoadCreateJoinMenu::SaveTransferReturned,&UIScene_LoadCreateJoinMenu::SaveTransferUpdateProgress,pClass,pClass); } while(pClass->m_eSaveTransferState == C4JStorage::eSaveTransfer_Busy && !pClass->m_bSaveTransferCancelled ); } } -int UIScene_LoadOrJoinMenu::SaveTransferReturned(LPVOID lpParam,C4JStorage::SAVETRANSFER_FILE_DETAILS *pSaveTransferDetails) +int UIScene_LoadCreateJoinMenu::SaveTransferReturned(LPVOID lpParam,C4JStorage::SAVETRANSFER_FILE_DETAILS *pSaveTransferDetails) { SaveTransferStateContainer* pClass = (SaveTransferStateContainer *) lpParam; app.DebugPrintf("Save Transfer - size is %d\n",pSaveTransferDetails->ulFileLen); @@ -3894,19 +3892,19 @@ int UIScene_LoadOrJoinMenu::SaveTransferReturned(LPVOID lpParam,C4JStorage::SAVE if(pSaveTransferDetails->pbData==nullptr) { pClass->m_eSaveTransferState=C4JStorage::eSaveTransfer_FileSizeRetrieved; - UIScene_LoadOrJoinMenu::s_ulFileSize=pSaveTransferDetails->ulFileLen; + UIScene_LoadCreateJoinMenu::s_ulFileSize=pSaveTransferDetails->ulFileLen; } else { - delete UIScene_LoadOrJoinMenu::s_transferData.data; - UIScene_LoadOrJoinMenu::s_transferData = byteArray(pSaveTransferDetails->pbData, UIScene_LoadOrJoinMenu::s_ulFileSize); + delete UIScene_LoadCreateJoinMenu::s_transferData.data; + UIScene_LoadCreateJoinMenu::s_transferData = byteArray(pSaveTransferDetails->pbData, UIScene_LoadCreateJoinMenu::s_ulFileSize); pClass->m_eSaveTransferState=C4JStorage::eSaveTransfer_FileDataRetrieved; } return 0; } -int UIScene_LoadOrJoinMenu::SaveTransferUpdateProgress(LPVOID lpParam,unsigned long ulBytesReceived) +int UIScene_LoadCreateJoinMenu::SaveTransferUpdateProgress(LPVOID lpParam,unsigned long ulBytesReceived) { WCHAR wcTemp[256]; @@ -3922,10 +3920,10 @@ int UIScene_LoadOrJoinMenu::SaveTransferUpdateProgress(LPVOID lpParam,unsigned l } else { - unsigned int uiProgress=(unsigned int)(((float)ulBytesReceived/float(UIScene_LoadOrJoinMenu::s_ulFileSize))*100.0f); + unsigned int uiProgress=(unsigned int)(((float)ulBytesReceived/float(UIScene_LoadCreateJoinMenu::s_ulFileSize))*100.0f); pMinecraft->progressRenderer->progressStagePercentage(uiProgress); - swprintf(wcTemp,app.GetString(IDS_SAVETRANSFER_STAGE_GET_DATA),((float)(ulBytesReceived))/1024000.0f,((float)UIScene_LoadOrJoinMenu::s_ulFileSize)/1024000.0f); + swprintf(wcTemp,app.GetString(IDS_SAVETRANSFER_STAGE_GET_DATA),((float)(ulBytesReceived))/1024000.0f,((float)UIScene_LoadCreateJoinMenu::s_ulFileSize)/1024000.0f); m_wstrStageText=wcTemp; pMinecraft->progressRenderer->progressStage( m_wstrStageText ); } @@ -3933,20 +3931,20 @@ int UIScene_LoadOrJoinMenu::SaveTransferUpdateProgress(LPVOID lpParam,unsigned l return 0; } -void UIScene_LoadOrJoinMenu::CancelSaveTransferCallback(LPVOID lpParam) +void UIScene_LoadCreateJoinMenu::CancelSaveTransferCallback(LPVOID lpParam) { SaveTransferStateContainer* pClass = (SaveTransferStateContainer *) lpParam; if(!pClass->m_bSaveTransferCancelled) { - StorageManager.CancelSaveTransfer(UIScene_LoadOrJoinMenu::CancelSaveTransferCompleteCallback,pClass); + StorageManager.CancelSaveTransfer(UIScene_LoadCreateJoinMenu::CancelSaveTransferCompleteCallback,pClass); pClass->m_bSaveTransferCancelled=true; } //pClass->m_bSaveTransferInProgress=false; } -int UIScene_LoadOrJoinMenu::CancelSaveTransferCompleteCallback(LPVOID lpParam) +int UIScene_LoadCreateJoinMenu::CancelSaveTransferCompleteCallback(LPVOID lpParam) { SaveTransferStateContainer* pClass = (SaveTransferStateContainer *) lpParam; // change the state to idle to get the download thread to terminate @@ -3954,9 +3952,9 @@ int UIScene_LoadOrJoinMenu::CancelSaveTransferCompleteCallback(LPVOID lpParam) return 0; } -int UIScene_LoadOrJoinMenu::NeedSyncMessageReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::NeedSyncMessageReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu *pClass = (UIScene_LoadOrJoinMenu *)pParam; + UIScene_LoadCreateJoinMenu *pClass = (UIScene_LoadCreateJoinMenu *)pParam; LoadMenuInitData *params = (LoadMenuInitData *)pParam; if( result == C4JStorage::EMessage_ResultAccept ) @@ -3978,7 +3976,7 @@ int UIScene_LoadOrJoinMenu::NeedSyncMessageReturned(void *pParam,int iPad,C4JSto #ifdef _XBOX_ONE -void UIScene_LoadOrJoinMenu::HandleDLCLicenseChange() +void UIScene_LoadCreateJoinMenu::HandleDLCLicenseChange() { // may have installed Halloween on this menu app.StartInstallDLCProcess(m_iPad); @@ -3986,16 +3984,16 @@ void UIScene_LoadOrJoinMenu::HandleDLCLicenseChange() #endif #if defined _XBOX_ONE || defined __ORBIS__ -int UIScene_LoadOrJoinMenu::CopySaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::CopySaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)pParam; if(result==C4JStorage::EMessage_ResultAccept) { LoadingInputParams *loadingParams = new LoadingInputParams(); void *uniqueId = (LPVOID)pClass->GetCallbackUniqueId(); - loadingParams->func = &UIScene_LoadOrJoinMenu::CopySaveThreadProc; + loadingParams->func = &UIScene_LoadCreateJoinMenu::CopySaveThreadProc; loadingParams->lpParam = uniqueId; loadingParams->waitForThreadToDelete = true; @@ -4006,7 +4004,7 @@ int UIScene_LoadOrJoinMenu::CopySaveDialogReturned(void *pParam,int iPad,C4JStor completionData->iPad = DEFAULT_XUI_MENU_USER; loadingParams->completionData = completionData; - loadingParams->cancelFunc=&UIScene_LoadOrJoinMenu::CancelCopySaveCallback; + loadingParams->cancelFunc=&UIScene_LoadCreateJoinMenu::CancelCopySaveCallback; loadingParams->m_cancelFuncParam=uniqueId; loadingParams->cancelText=IDS_TOOLTIPS_CANCEL; @@ -4020,28 +4018,28 @@ int UIScene_LoadOrJoinMenu::CopySaveDialogReturned(void *pParam,int iPad,C4JStor return 0; } -int UIScene_LoadOrJoinMenu::CopySaveThreadProc( LPVOID lpParameter ) +int UIScene_LoadCreateJoinMenu::CopySaveThreadProc( LPVOID lpParameter ) { Minecraft *pMinecraft=Minecraft::GetInstance(); pMinecraft->progressRenderer->progressStart(IDS_PROGRESS_COPYING_SAVE); pMinecraft->progressRenderer->progressStage( -1 ); ui.EnterCallbackIdCriticalSection(); - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParameter); + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParameter); if( pClass ) { pClass->m_bCopying = true; pClass->m_bCopyingCancelled = false; ui.LeaveCallbackIdCriticalSection(); // Copy save data takes two callbacks - one for completion, and one for progress. The progress callback also lets us cancel the operation, if we return false. - StorageManager.CopySaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC],UIScene_LoadOrJoinMenu::CopySaveDataReturned,UIScene_LoadOrJoinMenu::CopySaveDataProgress,lpParameter); + StorageManager.CopySaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC],UIScene_LoadCreateJoinMenu::CopySaveDataReturned,UIScene_LoadCreateJoinMenu::CopySaveDataProgress,lpParameter); bool bContinue = true; do { Sleep(100); ui.EnterCallbackIdCriticalSection(); - pClass = (UIScene_LoadOrJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParameter); + pClass = (UIScene_LoadCreateJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParameter); if( pClass ) { bContinue = pClass->m_bCopying; @@ -4061,10 +4059,10 @@ int UIScene_LoadOrJoinMenu::CopySaveThreadProc( LPVOID lpParameter ) return 0; } -int UIScene_LoadOrJoinMenu::CopySaveDataReturned(LPVOID lpParam, bool success, C4JStorage::ESaveGameState stat) +int UIScene_LoadCreateJoinMenu::CopySaveDataReturned(LPVOID lpParam, bool success, C4JStorage::ESaveGameState stat) { ui.EnterCallbackIdCriticalSection(); - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParam); + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParam); if(pClass) { @@ -4110,11 +4108,11 @@ int UIScene_LoadOrJoinMenu::CopySaveDataReturned(LPVOID lpParam, bool success, C return 0; } -bool UIScene_LoadOrJoinMenu::CopySaveDataProgress(LPVOID lpParam, int percent) +bool UIScene_LoadCreateJoinMenu::CopySaveDataProgress(LPVOID lpParam, int percent) { bool bContinue = false; ui.EnterCallbackIdCriticalSection(); - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParam); + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParam); if( pClass ) { bContinue = !pClass->m_bCopyingCancelled; @@ -4126,10 +4124,10 @@ bool UIScene_LoadOrJoinMenu::CopySaveDataProgress(LPVOID lpParam, int percent) return bContinue; } -void UIScene_LoadOrJoinMenu::CancelCopySaveCallback(LPVOID lpParam) +void UIScene_LoadCreateJoinMenu::CancelCopySaveCallback(LPVOID lpParam) { ui.EnterCallbackIdCriticalSection(); - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParam); + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParam); if( pClass ) { pClass->m_bCopyingCancelled = true; @@ -4137,10 +4135,10 @@ void UIScene_LoadOrJoinMenu::CancelCopySaveCallback(LPVOID lpParam) ui.LeaveCallbackIdCriticalSection(); } -int UIScene_LoadOrJoinMenu::CopySaveErrorDialogFinishedCallback(void *pParam,int iPad,C4JStorage::EMessageResult result) +int UIScene_LoadCreateJoinMenu::CopySaveErrorDialogFinishedCallback(void *pParam,int iPad,C4JStorage::EMessageResult result) { ui.EnterCallbackIdCriticalSection(); - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)ui.GetSceneFromCallbackId((size_t)pParam); + UIScene_LoadCreateJoinMenu* pClass = (UIScene_LoadCreateJoinMenu*)ui.GetSceneFromCallbackId((size_t)pParam); if( pClass ) { pClass->m_bCopying = false; @@ -4154,7 +4152,7 @@ int UIScene_LoadOrJoinMenu::CopySaveErrorDialogFinishedCallback(void *pParam,int #ifdef _WINDOWS64 // adding servers bellow -void UIScene_LoadOrJoinMenu::BeginAddServer() +void UIScene_LoadCreateJoinMenu::BeginAddServer() { m_addServerPhase = eAddServer_IP; m_addServerIP.clear(); @@ -4164,15 +4162,15 @@ void UIScene_LoadOrJoinMenu::BeginAddServer() kbData.title = L"Server Address"; kbData.defaultText = L""; kbData.maxChars = 128; - kbData.callback = &UIScene_LoadOrJoinMenu::AddServerKeyboardCallback; + kbData.callback = &UIScene_LoadCreateJoinMenu::AddServerKeyboardCallback; kbData.lpParam = this; kbData.pcMode = g_KBMInput.IsKBMActive(); ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData); } -int UIScene_LoadOrJoinMenu::AddServerKeyboardCallback(LPVOID lpParam, bool bRes) +int UIScene_LoadCreateJoinMenu::AddServerKeyboardCallback(LPVOID lpParam, bool bRes) { - UIScene_LoadOrJoinMenu *pClass = static_cast(lpParam); + UIScene_LoadCreateJoinMenu *pClass = static_cast(lpParam); if (!bRes) { @@ -4207,7 +4205,7 @@ int UIScene_LoadOrJoinMenu::AddServerKeyboardCallback(LPVOID lpParam, bool bRes) kbData.title = L"Server Port"; kbData.defaultText = L"25565"; kbData.maxChars = 6; - kbData.callback = &UIScene_LoadOrJoinMenu::AddServerKeyboardCallback; + kbData.callback = &UIScene_LoadCreateJoinMenu::AddServerKeyboardCallback; kbData.lpParam = pClass; kbData.pcMode = g_KBMInput.IsKBMActive(); ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData); @@ -4222,7 +4220,7 @@ int UIScene_LoadOrJoinMenu::AddServerKeyboardCallback(LPVOID lpParam, bool bRes) kbData.title = L"Server Name"; kbData.defaultText = L"Minecraft Server"; kbData.maxChars = 64; - kbData.callback = &UIScene_LoadOrJoinMenu::AddServerKeyboardCallback; + kbData.callback = &UIScene_LoadCreateJoinMenu::AddServerKeyboardCallback; kbData.lpParam = pClass; kbData.pcMode = g_KBMInput.IsKBMActive(); ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData); @@ -4247,7 +4245,7 @@ int UIScene_LoadOrJoinMenu::AddServerKeyboardCallback(LPVOID lpParam, bool bRes) return 0; } -void UIScene_LoadOrJoinMenu::AppendServerToFile(const wstring& ip, const wstring& port, const wstring& name) +void UIScene_LoadCreateJoinMenu::AppendServerToFile(const wstring& ip, const wstring& port, const wstring& name) { char narrowIP[256] = {}; char narrowPort[16] = {}; diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h b/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.h similarity index 97% rename from Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h rename to Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.h index 76a7ed43..4aba565c 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.h @@ -13,7 +13,7 @@ class LevelGenerationOptions; #endif -class UIScene_LoadOrJoinMenu : public UIScene +class UIScene_LoadCreateJoinMenu : public UIScene { private: enum EControls @@ -107,8 +107,8 @@ private: bool m_bUpdateSaveSize; public: - UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer *parentLayer); - virtual ~UIScene_LoadOrJoinMenu(); + UIScene_LoadCreateJoinMenu(int iPad, void *initData, UILayer *parentLayer); + virtual ~UIScene_LoadCreateJoinMenu(); virtual void updateTooltips(); virtual void updateComponents(); @@ -122,7 +122,7 @@ public: virtual void handleFocusChange(F64 controlId, F64 childId); virtual void handleInitFocus(F64 controlId, F64 childId); - virtual EUIScene getSceneType() { return eUIScene_LoadOrJoinMenu;} + virtual EUIScene getSceneType() { return eUIScene_LoadCreateJoinMenu;} static void UpdateGamesListCallback(LPVOID pParam); #ifdef _XBOX_ONE @@ -204,7 +204,7 @@ private: bool m_bSaveTransferCancelled; int m_iPad; C4JStorage::eSaveTransferState m_eSaveTransferState; - UIScene_LoadOrJoinMenu *m_pClass; + UIScene_LoadCreateJoinMenu *m_pClass; } SaveTransferStateContainer; enum ESaveTransferFiles { diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp index 07483b6e..8d396c1a 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp @@ -32,6 +32,13 @@ int UIScene_LoadMenu::m_iDifficultyTitleSettingA[4]= IDS_DIFFICULTY_TITLE_HARD }; +int UIScene_LoadMenu::m_iGamemodeTitleSettingA[3]= +{ + IDS_SURVIVAL, + IDS_CREATIVE, + IDS_ADVENTURE +}; + int UIScene_LoadMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes) { UIScene_LoadMenu *pClass= static_cast(ui.GetSceneFromCallbackId((size_t)lpParam)); @@ -70,7 +77,6 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye m_labelSeed.init(L""); m_labelCreatedMode.init(app.GetString(IDS_CREATED_IN_SURVIVAL)); - m_buttonGamemode.init(app.GetString(IDS_GAMEMODE_SURVIVAL),eControl_GameMode); m_buttonMoreOptions.init(app.GetString(IDS_MORE_OPTIONS),eControl_MoreOptions); m_buttonLoadWorld.init(app.GetString(IDS_LOAD),eControl_LoadWorld); m_texturePackList.init(app.GetString(IDS_DLC_MENU_TEXTUREPACKS), eControl_TexturePackList); @@ -83,6 +89,9 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)])); m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty)); + swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_GAMEMODE ),app.GetString(m_iGamemodeTitleSettingA[0])); + m_sliderGamemode.init(TempString,eControl_GameModeToggle,0,2,0); + m_MoreOptionsParams.bGenerateOptions=FALSE; m_MoreOptionsParams.bPVP = TRUE; m_MoreOptionsParams.bTrust = TRUE; @@ -429,7 +438,7 @@ void UIScene_LoadMenu::tick() if( m_bThumbnailGetFailed ) { // On Durango, this can happen if a save is still not been synchronised (user cancelled, or some error). Return back to give them a choice to pick another save. - ui.NavigateBack(m_iPad, false, eUIScene_LoadOrJoinMenu); + ui.NavigateBack(m_iPad, false, eUIScene_LoadCreateJoinMenu); return; } @@ -521,26 +530,6 @@ void UIScene_LoadMenu::tick() m_labelCreatedMode.setLabel( app.GetString(IDS_CREATED_IN_SURVIVAL) ); } - switch(app.GetGameHostOption(uiHostOptions,eGameHostOption_GameType)) - { - case 1: // Creative - m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE)); - m_bGameModeCreative=true; - m_iGameModeId = GameType::CREATIVE->getId(); - break; - case 2: // Adventure - m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE)); - m_bGameModeCreative=false; - m_iGameModeId = GameType::ADVENTURE->getId(); - break; - case 0: // Survival - default: - m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL)); - m_bGameModeCreative=false; - m_iGameModeId = GameType::SURVIVAL->getId(); - break; - }; - bool bGameSetting_Online=(app.GetGameSettings(m_iPad,eGameSetting_Online)!=0); if(app.GetGameHostOption(uiHostOptions,eGameHostOption_FriendsOfFriends) && !(m_bMultiplayerAllowed && bGameSetting_Online)) { @@ -698,26 +687,6 @@ void UIScene_LoadMenu::handlePress(F64 controlId, F64 childId) switch(static_cast(controlId)) { - case eControl_GameMode: - switch(m_iGameModeId) - { - case 0: // Survival - m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE)); - m_iGameModeId = GameType::CREATIVE->getId(); - m_bGameModeCreative = true; - break; - case 1: // Creative - m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE)); - m_iGameModeId = GameType::ADVENTURE->getId(); - m_bGameModeCreative = false; - break; - case 2: // Adventure - m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL)); - m_iGameModeId = GameType::SURVIVAL->getId(); - m_bGameModeCreative = false; - break; - }; - break; case eControl_MoreOptions: ui.NavigateToScene(m_iPad, eUIScene_LaunchMoreOptionsMenu, &m_MoreOptionsParams); break; @@ -953,6 +922,29 @@ void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue) app.SetGameSettings(m_iPad,eGameSetting_Difficulty,value); swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value])); m_sliderDifficulty.setLabel(TempString); + break; + case eControl_GameModeToggle: + m_sliderGamemode.handleSliderMove(value); + + if (value == 1) + { + m_bGameModeCreative=true; + m_iGameModeId = GameType::CREATIVE->getId(); + } + else if (value == 2) + { + m_bGameModeCreative=false; + m_iGameModeId = GameType::ADVENTURE->getId(); + } + else + { + m_bGameModeCreative=false; + m_iGameModeId = GameType::SURVIVAL->getId(); + } + + swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_GAMEMODE ),app.GetString(m_iGamemodeTitleSettingA[value])); + m_sliderGamemode.setLabel(TempString); + break; } } diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.h b/Minecraft.Client/Common/UI/UIScene_LoadMenu.h index 53d66d55..8faf02ee 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.h @@ -7,7 +7,7 @@ class UIScene_LoadMenu : public IUIScene_StartGame private: enum EControls { - eControl_GameMode, + eControl_GameModeToggle, eControl_Difficulty, eControl_MoreOptions, eControl_LoadWorld, @@ -16,11 +16,12 @@ private: }; static int m_iDifficultyTitleSettingA[4]; + static int m_iGamemodeTitleSettingA[3]; UIControl m_controlMainPanel; UIControl_Label m_labelGameName, m_labelSeed, m_labelCreatedMode; - UIControl_Button m_buttonGamemode, m_buttonMoreOptions, m_buttonLoadWorld; - UIControl_Slider m_sliderDifficulty; + UIControl_Button m_buttonMoreOptions, m_buttonLoadWorld; + UIControl_Slider m_sliderGamemode, m_sliderDifficulty; UIControl_BitmapIcon m_bitmapIcon; UIControl_CheckBox m_checkboxOnline; @@ -32,7 +33,7 @@ private: UI_MAP_ELEMENT( m_labelCreatedMode, "CreatedMode") UI_MAP_ELEMENT( m_labelSeed, "Seed") UI_MAP_ELEMENT( m_texturePackList, "TexturePackSelector") - UI_MAP_ELEMENT( m_buttonGamemode, "GameModeToggle") + UI_MAP_ELEMENT( m_sliderGamemode, "GameModeToggle") UI_MAP_ELEMENT( m_checkboxOnline, "CheckboxOnline") UI_MAP_ELEMENT( m_buttonMoreOptions, "MoreOptions") UI_MAP_ELEMENT( m_buttonLoadWorld, "LoadSettings") diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp index 93f1edf1..db388829 100644 --- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp @@ -782,7 +782,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in #ifdef _XBOX_ONE ui.ShowPlayerDisplayname(true); #endif - proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu); + proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadCreateJoinMenu); } else { @@ -845,7 +845,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in #ifdef _XBOX_ONE ui.ShowPlayerDisplayname(true); #endif - proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu); + proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadCreateJoinMenu); #endif } } @@ -859,7 +859,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in #ifdef _XBOX_ONE ui.ShowPlayerDisplayname(true); #endif - proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu); + proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadCreateJoinMenu); #endif } } @@ -1419,7 +1419,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad) #ifdef _XBOX_ONE ui.ShowPlayerDisplayname(true); #endif - proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu); + proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadCreateJoinMenu); #endif } else @@ -1491,7 +1491,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad) #ifdef _XBOX_ONE ui.ShowPlayerDisplayname(true); #endif - proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadOrJoinMenu); + proceedToScene(ProfileManager.GetPrimaryPad(), eUIScene_LoadCreateJoinMenu); #endif } } diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp index 4126c559..4a1bd5d3 100644 --- a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp +++ b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp @@ -1271,7 +1271,7 @@ HRESULT CScene_Main::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled ) { XuiKillTimer(m_hObj,DLC_INSTALLED_TIMER_ID); m_Timer.SetShow(FALSE); - app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_LoadOrJoinMenu); + app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_LoadCreateJoinMenu); } } diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png index 74fa8bfd..8d9a79c9 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png index c875df39..4035ebd1 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png index 6b59c0a3..322f67e5 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png differ diff --git a/Minecraft.Client/PSVita/PSVita_App.cpp b/Minecraft.Client/PSVita/PSVita_App.cpp index 8c9236c7..84c3b79f 100644 --- a/Minecraft.Client/PSVita/PSVita_App.cpp +++ b/Minecraft.Client/PSVita/PSVita_App.cpp @@ -1239,7 +1239,7 @@ void CConsoleMinecraftApp::Callback_SaveGameIncomplete(void *pParam, C4JStorage: if (saveIncompleteType == C4JStorage::ESaveIncomplete_OutOfQuota || saveIncompleteType == C4JStorage::ESaveIncomplete_OutOfLocalStorage) { - if(UIScene_LoadOrJoinMenu::isSaveTransferRunning()) + if(UIScene_LoadCreateJoinMenu::isSaveTransferRunning()) { // 4J MGH - if we're trying to save from the save transfer stuff, only show "ok", and we won't try to save again if(saveIncompleteType == C4JStorage::ESaveIncomplete_OutOfQuota) blocksRequired = -1; @@ -1262,7 +1262,7 @@ void CConsoleMinecraftApp::Callback_SaveGameIncomplete(void *pParam, C4JStorage: int CConsoleMinecraftApp::NoSaveSpaceReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) { - if(result==C4JStorage::EMessage_ResultAccept && !UIScene_LoadOrJoinMenu::isSaveTransferRunning()) // MGH - we won't try to save again during a save tranfer + if(result==C4JStorage::EMessage_ResultAccept && !UIScene_LoadCreateJoinMenu::isSaveTransferRunning()) // MGH - we won't try to save again during a save tranfer { int blocksRequired = (int)pParam; if(blocksRequired > 0) diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 75794e98..2e7dae90 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -1246,7 +1246,7 @@ static Minecraft* InitialiseMinecraftRuntime() { app.loadMediaArchive(); - RenderManager.Initialise(g_pd3dDevice, g_pSwapChain); +// RenderManager.Initialise(g_pd3dDevice, g_pSwapChain); app.loadStringTable(); ui.init(g_pd3dDevice, g_pImmediateContext, g_pRenderTargetView, g_pDepthStencilView, g_rScreenWidth, g_rScreenHeight); diff --git a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml index da9c587f..80c626fb 100644 --- a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml +++ b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml @@ -6196,6 +6196,10 @@ Would you like to unlock the full game now? Difficulty + + Game Mode + + Music diff --git a/Minecraft.Client/Windows64Media/strings.h b/Minecraft.Client/Windows64Media/strings.h index d7c63cf0..322063db 100644 --- a/Minecraft.Client/Windows64Media/strings.h +++ b/Minecraft.Client/Windows64Media/strings.h @@ -1,7 +1,7 @@ #pragma once // Auto-generated by StringTable builder — do not edit manually. // Source language: en-US -// Total strings: 2312 +// Total strings: 2313 #define IDS_NULL 0 #define IDS_OK 1 @@ -1560,758 +1560,759 @@ #define IDS_GROUPNAME_MATERIALS 1554 #define IDS_RETURNEDTOMENU_TITLE 1555 #define IDS_SLIDER_DIFFICULTY 1556 -#define IDS_SLIDER_MUSIC 1557 -#define IDS_SLIDER_SOUND 1558 -#define IDS_SLIDER_GAMMA 1559 -#define IDS_SLIDER_SENSITIVITY_INGAME 1560 -#define IDS_SLIDER_SENSITIVITY_INMENU 1561 -#define IDS_DIFFICULTY_TITLE_PEACEFUL 1562 -#define IDS_DIFFICULTY_TITLE_EASY 1563 -#define IDS_DIFFICULTY_TITLE_NORMAL 1564 -#define IDS_DIFFICULTY_TITLE_HARD 1565 -#define IDS_DIFFICULTY_PEACEFUL 1566 -#define IDS_DIFFICULTY_EASY 1567 -#define IDS_DIFFICULTY_NORMAL 1568 -#define IDS_DIFFICULTY_HARD 1569 -#define IDS_TRIALOVER_TITLE 1570 -#define IDS_MULTIPLAYER_FULL_TITLE 1571 -#define IDS_MULTIPLAYER_FULL_TEXT 1572 -#define IDS_SIGN_TITLE 1573 -#define IDS_SIGN_TITLE_TEXT 1574 -#define IDS_NAME_TITLE 1575 -#define IDS_NAME_TITLE_TEXT 1576 -#define IDS_NAME_CAPTION 1577 -#define IDS_NAME_CAPTION_TEXT 1578 -#define IDS_NAME_DESC 1579 -#define IDS_NAME_DESC_TEXT 1580 -#define IDS_INVENTORY 1581 -#define IDS_INGREDIENTS 1582 -#define IDS_BREWING_STAND 1583 -#define IDS_CHEST 1584 -#define IDS_ENCHANT 1585 -#define IDS_FURNACE 1586 -#define IDS_INGREDIENT 1587 -#define IDS_FUEL 1588 -#define IDS_DISPENSER 1589 -#define IDS_CONTAINER_ANIMAL 1590 -#define IDS_CONTAINER_DROPPER 1591 -#define IDS_CONTAINER_HOPPER 1592 -#define IDS_CONTAINER_BEACON 1593 -#define IDS_CONTAINER_BEACON_PRIMARY_POWER 1594 -#define IDS_CONTAINER_BEACON_SECONDARY_POWER 1595 -#define IDS_CONTAINER_MINECART 1596 -#define IDS_NO_DLCOFFERS 1597 -#define IDS_PLAYER_JOINED 1598 -#define IDS_PLAYER_LEFT 1599 -#define IDS_PLAYER_KICKED 1600 -#define IDS_TEXT_DELETE_SAVE 1601 -#define IDS_STRINGVERIFY_AWAITING_APPROVAL 1602 -#define IDS_STRINGVERIFY_CENSORED 1603 -#define IDS_NOWPLAYING 1604 -#define IDS_DEFAULTS_TITLE 1605 -#define IDS_DEFAULTS_TEXT 1606 -#define IDS_FATAL_ERROR_TITLE 1607 -#define IDS_GAME_HOST_NAME 1608 -#define IDS_GAME_HOST_NAME_UNKNOWN 1609 -#define IDS_GUEST_ORDER_CHANGED_TITLE 1610 -#define IDS_GUEST_ORDER_CHANGED_TEXT 1611 -#define IDS_MUST_SIGN_IN_TITLE 1612 -#define IDS_MUST_SIGN_IN_TEXT 1613 -#define IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE 1614 -#define IDS_FAILED_TO_CREATE_GAME_TITLE 1615 -#define IDS_DEFAULT_SKINS 1616 -#define IDS_NO_SKIN_PACK 1617 -#define IDS_FAVORITES_SKIN_PACK 1618 -#define IDS_BANNED_LEVEL_TITLE 1619 -#define IDS_PLAYER_BANNED_LEVEL 1620 -#define IDS_ACTION_BAN_LEVEL_TITLE 1621 -#define IDS_ACTION_BAN_LEVEL_DESCRIPTION 1622 -#define IDS_BUTTON_REMOVE_FROM_BAN_LIST 1623 -#define IDS_SLIDER_AUTOSAVE 1624 -#define IDS_SLIDER_AUTOSAVE_OFF 1625 -#define IDS_MINUTES 1626 -#define IDS_CANT_PLACE_NEAR_SPAWN_TITLE 1627 -#define IDS_CANT_PLACE_NEAR_SPAWN_TEXT 1628 -#define IDS_SLIDER_INTERFACEOPACITY 1629 -#define IDS_PROGRESS_AUTOSAVING_LEVEL 1630 -#define IDS_SLIDER_UISIZE 1631 -#define IDS_SLIDER_UISIZESPLITSCREEN 1632 -#define IDS_SEED 1633 -#define IDS_UNLOCK_DLC_TITLE 1634 -#define IDS_UNLOCK_DLC_SKIN 1635 -#define IDS_UNLOCK_DLC_TEXTUREPACK_TITLE 1636 -#define IDS_UNLOCK_DLC_TEXTUREPACK_TEXT 1637 -#define IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE 1638 -#define IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT 1639 -#define IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE 1640 -#define IDS_DLC_TEXTUREPACK_UNLOCK_TITLE 1641 -#define IDS_DLC_TEXTUREPACK_GET_TRIAL_TITLE 1642 -#define IDS_DLC_TEXTUREPACK_GET_FULL_TITLE 1643 -#define IDS_DLC_TEXTUREPACK_NOT_PRESENT 1644 -#define IDS_TEXTURE_PACK_TRIALVERSION 1645 -#define IDS_TEXTUREPACK_FULLVERSION 1646 -#define IDS_UNLOCK_KICK_PLAYER_TITLE 1647 -#define IDS_UNLOCK_KICK_PLAYER 1648 -#define IDS_GAMERPICS 1649 -#define IDS_THEMES 1650 -#define IDS_SKINS 1651 -#define IDS_ALLOWFRIENDSOFFRIENDS 1652 -#define IDS_NOTALLOWED_FRIENDSOFFRIENDS 1653 -#define IDS_CANTJOIN_TITLE 1654 -#define IDS_SELECTED 1655 -#define IDS_SELECTED_SKIN 1656 -#define IDS_CORRUPT_DLC_TITLE 1657 -#define IDS_CORRUPT_DLC 1658 -#define IDS_CORRUPT_DLC_MULTIPLE 1659 -#define IDS_GAME_MODE_CHANGED 1660 -#define IDS_RENAME_WORLD_TITLE 1661 -#define IDS_RENAME_WORLD_TEXT 1662 -#define IDS_GAMEMODE_SURVIVAL 1663 -#define IDS_GAMEMODE_CREATIVE 1664 -#define IDS_GAMEMODE_ADVENTURE 1665 -#define IDS_SURVIVAL 1666 -#define IDS_CREATIVE 1667 -#define IDS_ADVENTURE 1668 -#define IDS_CREATED_IN_SURVIVAL 1669 -#define IDS_CREATED_IN_CREATIVE 1670 -#define IDS_CHECKBOX_RENDER_CLOUDS 1671 -#define IDS_TEXT_SAVEOPTIONS 1672 -#define IDS_TITLE_RENAMESAVE 1673 -#define IDS_AUTOSAVE_COUNTDOWN 1674 -#define IDS_ON 1675 -#define IDS_OFF 1676 -#define IDS_LEVELTYPE_NORMAL 1677 -#define IDS_LEVELTYPE_SUPERFLAT 1678 -#define IDS_GAMEOPTION_SEED 1679 -#define IDS_GAMEOPTION_ONLINE 1680 -#define IDS_GAMEOPTION_INVITEONLY 1681 -#define IDS_GAMEOPTION_ALLOWFOF 1682 -#define IDS_GAMEOPTION_PVP 1683 -#define IDS_GAMEOPTION_TRUST 1684 -#define IDS_GAMEOPTION_FIRE_SPREADS 1685 -#define IDS_GAMEOPTION_TNT_EXPLODES 1686 -#define IDS_GAMEOPTION_RESET_NETHER 1687 -#define IDS_GAMEOPTION_STRUCTURES 1688 -#define IDS_GAMEOPTION_SUPERFLAT 1689 -#define IDS_GAMEOPTION_BONUS_CHEST 1690 -#define IDS_GAMEOPTION_MOB_GRIEFING 1691 -#define IDS_GAMEOPTION_KEEP_INVENTORY 1692 -#define IDS_GAMEOPTION_MOB_SPAWNING 1693 -#define IDS_GAMEOPTION_MOB_LOOT 1694 -#define IDS_GAMEOPTION_TILE_DROPS 1695 -#define IDS_GAMEOPTION_NATURAL_REGEN 1696 -#define IDS_GAMEOPTION_DAYLIGHT_CYCLE 1697 -#define IDS_DLC_MENU_SKINPACKS 1698 -#define IDS_DLC_MENU_THEMES 1699 -#define IDS_DLC_MENU_GAMERPICS 1700 -#define IDS_DLC_MENU_AVATARITEMS 1701 -#define IDS_DLC_MENU_TEXTUREPACKS 1702 -#define IDS_DLC_MENU_MASHUPPACKS 1703 -#define IDS_DEATH_INFIRE 1704 -#define IDS_DEATH_ONFIRE 1705 -#define IDS_DEATH_LAVA 1706 -#define IDS_DEATH_INWALL 1707 -#define IDS_DEATH_DROWN 1708 -#define IDS_DEATH_STARVE 1709 -#define IDS_DEATH_CACTUS 1710 -#define IDS_DEATH_FALL 1711 -#define IDS_DEATH_OUTOFWORLD 1712 -#define IDS_DEATH_GENERIC 1713 -#define IDS_DEATH_EXPLOSION 1714 -#define IDS_DEATH_MAGIC 1715 -#define IDS_DEATH_DRAGON_BREATH 1716 -#define IDS_DEATH_MOB 1717 -#define IDS_DEATH_PLAYER 1718 -#define IDS_DEATH_ARROW 1719 -#define IDS_DEATH_FIREBALL 1720 -#define IDS_DEATH_THROWN 1721 -#define IDS_DEATH_INDIRECT_MAGIC 1722 -#define IDS_DEATH_FELL_ACCIDENT_LADDER 1723 -#define IDS_DEATH_FELL_ACCIDENT_VINES 1724 -#define IDS_DEATH_FELL_ACCIDENT_WATER 1725 -#define IDS_DEATH_FELL_ACCIDENT_GENERIC 1726 -#define IDS_DEATH_FELL_KILLER 1727 -#define IDS_DEATH_FELL_ASSIST 1728 -#define IDS_DEATH_FELL_ASSIST_ITEM 1729 -#define IDS_DEATH_FELL_FINISH 1730 -#define IDS_DEATH_FELL_FINISH_ITEM 1731 -#define IDS_DEATH_INFIRE_PLAYER 1732 -#define IDS_DEATH_ONFIRE_PLAYER 1733 -#define IDS_DEATH_LAVA_PLAYER 1734 -#define IDS_DEATH_DROWN_PLAYER 1735 -#define IDS_DEATH_CACTUS_PLAYER 1736 -#define IDS_DEATH_EXPLOSION_PLAYER 1737 -#define IDS_DEATH_WITHER 1738 -#define IDS_DEATH_PLAYER_ITEM 1739 -#define IDS_DEATH_ARROW_ITEM 1740 -#define IDS_DEATH_FIREBALL_ITEM 1741 -#define IDS_DEATH_THROWN_ITEM 1742 -#define IDS_DEATH_INDIRECT_MAGIC_ITEM 1743 -#define IDS_CHECKBOX_RENDER_BEDROCKFOG 1744 -#define IDS_CHECKBOX_DISPLAY_HUD 1745 -#define IDS_CHECKBOX_DISPLAY_HAND 1746 -#define IDS_CHECKBOX_DEATH_MESSAGES 1747 -#define IDS_CHECKBOX_ANIMATED_CHARACTER 1748 -#define IDS_CHECKBOX_CUSTOM_SKIN_ANIM 1749 -#define IDS_PRIV_MINE_TOGGLE_ON 1750 -#define IDS_PRIV_MINE_TOGGLE_OFF 1751 -#define IDS_PRIV_BUILD_TOGGLE_ON 1752 -#define IDS_PRIV_BUILD_TOGGLE_OFF 1753 -#define IDS_PRIV_USE_DOORS_TOGGLE_ON 1754 -#define IDS_PRIV_USE_DOORS_TOGGLE_OFF 1755 -#define IDS_PRIV_USE_CONTAINERS_TOGGLE_ON 1756 -#define IDS_PRIV_USE_CONTAINERS_TOGGLE_OFF 1757 -#define IDS_PRIV_ATTACK_MOB_TOGGLE_ON 1758 -#define IDS_PRIV_ATTACK_MOB_TOGGLE_OFF 1759 -#define IDS_PRIV_ATTACK_PLAYER_TOGGLE_ON 1760 -#define IDS_PRIV_ATTACK_PLAYER_TOGGLE_OFF 1761 -#define IDS_PRIV_ATTACK_ANIMAL_TOGGLE_ON 1762 -#define IDS_PRIV_ATTACK_ANIMAL_TOGGLE_OFF 1763 -#define IDS_PRIV_MODERATOR_TOGGLE_ON 1764 -#define IDS_PRIV_MODERATOR_TOGGLE_OFF 1765 -#define IDS_PRIV_FLY_TOGGLE_ON 1766 -#define IDS_PRIV_FLY_TOGGLE_OFF 1767 -#define IDS_PRIV_EXHAUSTION_TOGGLE_ON 1768 -#define IDS_PRIV_EXHAUSTION_TOGGLE_OFF 1769 -#define IDS_PRIV_INVISIBLE_TOGGLE_ON 1770 -#define IDS_PRIV_INVISIBLE_TOGGLE_OFF 1771 -#define IDS_PRIV_INVULNERABLE_TOGGLE_ON 1772 -#define IDS_PRIV_INVULNERABLE_TOGGLE_OFF 1773 -#define IDS_DLC_COST 1774 -#define IDS_BOSS_ENDERDRAGON_HEALTH 1775 -#define IDS_PLAYER_ENTERED_END 1776 -#define IDS_PLAYER_LEFT_END 1777 -#define IDS_WIN_TEXT 1778 -#define IDS_WIN_TEXT_PART_2 1779 -#define IDS_WIN_TEXT_PART_3 1780 -#define IDS_RESETNETHER_TITLE 1781 -#define IDS_RESETNETHER_TEXT 1782 -#define IDS_RESET_NETHER 1783 -#define IDS_DONT_RESET_NETHER 1784 -#define IDS_CANT_SHEAR_MOOSHROOM 1785 -#define IDS_MAX_PIGS_SHEEP_COWS_CATS_SPAWNED 1786 -#define IDS_MAX_MOOSHROOMS_SPAWNED 1787 -#define IDS_MAX_WOLVES_SPAWNED 1788 -#define IDS_MAX_CHICKENS_SPAWNED 1789 -#define IDS_MAX_SQUID_SPAWNED 1790 -#define IDS_MAX_BATS_SPAWNED 1791 -#define IDS_MAX_ENEMIES_SPAWNED 1792 -#define IDS_MAX_VILLAGERS_SPAWNED 1793 -#define IDS_MAX_HANGINGENTITIES 1794 -#define IDS_CANT_SPAWN_IN_PEACEFUL 1795 -#define IDS_MAX_PIGS_SHEEP_COWS_CATS_BRED 1796 -#define IDS_MAX_WOLVES_BRED 1797 -#define IDS_MAX_CHICKENS_BRED 1798 -#define IDS_MAX_HORSES_BRED 1799 -#define IDS_MAX_MUSHROOMCOWS_BRED 1800 -#define IDS_MAX_BOATS 1801 -#define IDS_MAX_SKULL_TILES 1802 -#define IDS_INVERT_LOOK 1803 -#define IDS_SOUTHPAW 1804 -#define IDS_YOU_DIED 1805 -#define IDS_RESPAWN 1806 -#define IDS_DOWNLOADABLE_CONTENT_OFFERS 1807 -#define IDS_CHANGE_SKIN 1808 -#define IDS_HOW_TO_PLAY 1809 -#define IDS_CONTROLS 1810 -#define IDS_SETTINGS 1811 -#define IDS_LANGUAGE_SELECTOR 1812 -#define IDS_CREDITS 1813 -#define IDS_REINSTALL_CONTENT 1814 -#define IDS_DEBUG_SETTINGS 1815 -#define IDS_FIRE_SPREADS 1816 -#define IDS_TNT_EXPLODES 1817 -#define IDS_PLAYER_VS_PLAYER 1818 -#define IDS_TRUST_PLAYERS 1819 -#define IDS_HOST_PRIVILEGES 1820 -#define IDS_GENERATE_STRUCTURES 1821 -#define IDS_SUPERFLAT_WORLD 1822 -#define IDS_BONUS_CHEST 1823 -#define IDS_WORLD_OPTIONS 1824 -#define IDS_GAME_OPTIONS 1825 -#define IDS_MOB_GRIEFING 1826 -#define IDS_KEEP_INVENTORY 1827 -#define IDS_MOB_SPAWNING 1828 -#define IDS_MOB_LOOT 1829 -#define IDS_TILE_DROPS 1830 -#define IDS_NATURAL_REGEN 1831 -#define IDS_DAYLIGHT_CYCLE 1832 -#define IDS_CAN_BUILD_AND_MINE 1833 -#define IDS_CAN_USE_DOORS_AND_SWITCHES 1834 -#define IDS_CAN_OPEN_CONTAINERS 1835 -#define IDS_CAN_ATTACK_PLAYERS 1836 -#define IDS_CAN_ATTACK_ANIMALS 1837 -#define IDS_MODERATOR 1838 -#define IDS_KICK_PLAYER 1839 -#define IDS_CAN_FLY 1840 -#define IDS_DISABLE_EXHAUSTION 1841 -#define IDS_INVISIBLE 1842 -#define IDS_HOST_OPTIONS 1843 -#define IDS_PLAYERS_INVITE 1844 -#define IDS_ONLINE_GAME 1845 -#define IDS_INVITE_ONLY 1846 -#define IDS_MORE_OPTIONS 1847 -#define IDS_LOAD 1848 -#define IDS_DEFAULT_WORLD_NAME 1849 -#define IDS_WORLD_NAME 1850 -#define IDS_CREATE_NEW_WORLD_SEED 1851 -#define IDS_CREATE_NEW_WORLD_RANDOM_SEED 1852 -#define IDS_PLAYERS 1853 -#define IDS_JOIN_GAME 1854 -#define IDS_START_GAME 1855 -#define IDS_NO_GAMES_FOUND 1856 -#define IDS_PLAY_GAME 1857 -#define IDS_LEADERBOARDS 1858 -#define IDS_HELP_AND_OPTIONS 1859 -#define IDS_UNLOCK_FULL_GAME 1860 -#define IDS_RESUME_GAME 1861 -#define IDS_SAVE_GAME 1862 -#define IDS_LABEL_DIFFICULTY 1863 -#define IDS_LABEL_GAME_TYPE 1864 -#define IDS_LABEL_STRUCTURES 1865 -#define IDS_LABEL_LEVEL_TYPE 1866 -#define IDS_LABEL_PvP 1867 -#define IDS_LABEL_TRUST 1868 -#define IDS_LABEL_TNT 1869 -#define IDS_LABEL_FIRE_SPREADS 1870 -#define IDS_REINSTALL_THEME 1871 -#define IDS_REINSTALL_GAMERPIC_1 1872 -#define IDS_REINSTALL_GAMERPIC_2 1873 -#define IDS_REINSTALL_AVATAR_ITEM_1 1874 -#define IDS_REINSTALL_AVATAR_ITEM_2 1875 -#define IDS_REINSTALL_AVATAR_ITEM_3 1876 -#define IDS_OPTIONS 1877 -#define IDS_AUDIO 1878 -#define IDS_CONTROL 1879 -#define IDS_GRAPHICS 1880 -#define IDS_USER_INTERFACE 1881 -#define IDS_RESET_TO_DEFAULTS 1882 -#define IDS_VIEW_BOBBING 1883 -#define IDS_HINTS 1884 -#define IDS_IN_GAME_TOOLTIPS 1885 -#define IDS_CHECKBOX_VERTICAL_SPLIT_SCREEN 1886 -#define IDS_DONE 1887 -#define IDS_EDIT_SIGN_MESSAGE 1888 -#define IDS_SOCIAL_TEXT 1889 -#define IDS_SOCIAL_LABEL_CAPTION 1890 -#define IDS_SOCIAL_DEFAULT_CAPTION 1891 -#define IDS_SOCIAL_LABEL_DESCRIPTION 1892 -#define IDS_DEFAULT_TEXTUREPACK 1893 -#define IDS_POTION_EMPTY 1894 -#define IDS_POTION_MOVESPEED 1895 -#define IDS_POTION_MOVESLOWDOWN 1896 -#define IDS_POTION_DIGSPEED 1897 -#define IDS_POTION_DIGSLOWDOWN 1898 -#define IDS_POTION_DAMAGEBOOST 1899 -#define IDS_POTION_WEAKNESS 1900 -#define IDS_POTION_HEAL 1901 -#define IDS_POTION_HARM 1902 -#define IDS_POTION_JUMP 1903 -#define IDS_POTION_CONFUSION 1904 -#define IDS_POTION_REGENERATION 1905 -#define IDS_POTION_RESISTANCE 1906 -#define IDS_POTION_FIRERESISTANCE 1907 -#define IDS_POTION_WATERBREATHING 1908 -#define IDS_POTION_INVISIBILITY 1909 -#define IDS_POTION_BLINDNESS 1910 -#define IDS_POTION_NIGHTVISION 1911 -#define IDS_POTION_HUNGER 1912 -#define IDS_POTION_POISON 1913 -#define IDS_POTION_WITHER 1914 -#define IDS_POTION_HEALTHBOOST 1915 -#define IDS_POTION_ABSORPTION 1916 -#define IDS_POTION_SATURATION 1917 -#define IDS_POTION_MOVESPEED_POSTFIX 1918 -#define IDS_POTION_MOVESLOWDOWN_POSTFIX 1919 -#define IDS_POTION_DIGSPEED_POSTFIX 1920 -#define IDS_POTION_DIGSLOWDOWN_POSTFIX 1921 -#define IDS_POTION_DAMAGEBOOST_POSTFIX 1922 -#define IDS_POTION_WEAKNESS_POSTFIX 1923 -#define IDS_POTION_HEAL_POSTFIX 1924 -#define IDS_POTION_HARM_POSTFIX 1925 -#define IDS_POTION_JUMP_POSTFIX 1926 -#define IDS_POTION_CONFUSION_POSTFIX 1927 -#define IDS_POTION_REGENERATION_POSTFIX 1928 -#define IDS_POTION_RESISTANCE_POSTFIX 1929 -#define IDS_POTION_FIRERESISTANCE_POSTFIX 1930 -#define IDS_POTION_WATERBREATHING_POSTFIX 1931 -#define IDS_POTION_INVISIBILITY_POSTFIX 1932 -#define IDS_POTION_BLINDNESS_POSTFIX 1933 -#define IDS_POTION_NIGHTVISION_POSTFIX 1934 -#define IDS_POTION_HUNGER_POSTFIX 1935 -#define IDS_POTION_POISON_POSTFIX 1936 -#define IDS_POTION_WITHER_POSTFIX 1937 -#define IDS_POTION_HEALTHBOOST_POSTFIX 1938 -#define IDS_POTION_ABSORPTION_POSTFIX 1939 -#define IDS_POTION_SATURATION_POSTFIX 1940 -#define IDS_POTION_POTENCY_0 1941 -#define IDS_POTION_POTENCY_1 1942 -#define IDS_POTION_POTENCY_2 1943 -#define IDS_POTION_POTENCY_3 1944 -#define IDS_POTION_PREFIX_GRENADE 1945 -#define IDS_POTION_PREFIX_MUNDANE 1946 -#define IDS_POTION_PREFIX_UNINTERESTING 1947 -#define IDS_POTION_PREFIX_BLAND 1948 -#define IDS_POTION_PREFIX_CLEAR 1949 -#define IDS_POTION_PREFIX_MILKY 1950 -#define IDS_POTION_PREFIX_DIFFUSE 1951 -#define IDS_POTION_PREFIX_ARTLESS 1952 -#define IDS_POTION_PREFIX_THIN 1953 -#define IDS_POTION_PREFIX_AWKWARD 1954 -#define IDS_POTION_PREFIX_FLAT 1955 -#define IDS_POTION_PREFIX_BULKY 1956 -#define IDS_POTION_PREFIX_BUNGLING 1957 -#define IDS_POTION_PREFIX_BUTTERED 1958 -#define IDS_POTION_PREFIX_SMOOTH 1959 -#define IDS_POTION_PREFIX_SUAVE 1960 -#define IDS_POTION_PREFIX_DEBONAIR 1961 -#define IDS_POTION_PREFIX_THICK 1962 -#define IDS_POTION_PREFIX_ELEGANT 1963 -#define IDS_POTION_PREFIX_FANCY 1964 -#define IDS_POTION_PREFIX_CHARMING 1965 -#define IDS_POTION_PREFIX_DASHING 1966 -#define IDS_POTION_PREFIX_REFINED 1967 -#define IDS_POTION_PREFIX_CORDIAL 1968 -#define IDS_POTION_PREFIX_SPARKLING 1969 -#define IDS_POTION_PREFIX_POTENT 1970 -#define IDS_POTION_PREFIX_FOUL 1971 -#define IDS_POTION_PREFIX_ODORLESS 1972 -#define IDS_POTION_PREFIX_RANK 1973 -#define IDS_POTION_PREFIX_HARSH 1974 -#define IDS_POTION_PREFIX_ACRID 1975 -#define IDS_POTION_PREFIX_GROSS 1976 -#define IDS_POTION_PREFIX_STINKY 1977 -#define IDS_POTION_DESC_WATER_BOTTLE 1978 -#define IDS_POTION_DESC_EMPTY 1979 -#define IDS_POTION_DESC_MOVESPEED 1980 -#define IDS_POTION_DESC_MOVESLOWDOWN 1981 -#define IDS_POTION_DESC_DAMAGEBOOST 1982 -#define IDS_POTION_DESC_WEAKNESS 1983 -#define IDS_POTION_DESC_HEAL 1984 -#define IDS_POTION_DESC_HARM 1985 -#define IDS_POTION_DESC_REGENERATION 1986 -#define IDS_POTION_DESC_FIRERESISTANCE 1987 -#define IDS_POTION_DESC_POISON 1988 -#define IDS_POTION_EFFECTS_WHENDRANK 1989 -#define IDS_ATTRIBUTE_NAME_HORSE_JUMPSTRENGTH 1990 -#define IDS_ATTRIBUTE_NAME_ZOMBIE_SPAWNREINFORCEMENTS 1991 -#define IDS_ATTRIBUTE_NAME_GENERIC_MAXHEALTH 1992 -#define IDS_ATTRIBUTE_NAME_GENERIC_FOLLOWRANGE 1993 -#define IDS_ATTRIBUTE_NAME_GENERIC_KNOCKBACKRESISTANCE 1994 -#define IDS_ATTRIBUTE_NAME_GENERIC_MOVEMENTSPEED 1995 -#define IDS_ATTRIBUTE_NAME_GENERIC_ATTACKDAMAGE 1996 -#define IDS_ENCHANTMENT_DAMAGE_ALL 1997 -#define IDS_ENCHANTMENT_DAMAGE_UNDEAD 1998 -#define IDS_ENCHANTMENT_DAMAGE_ARTHROPODS 1999 -#define IDS_ENCHANTMENT_KNOCKBACK 2000 -#define IDS_ENCHANTMENT_FIRE 2001 -#define IDS_ENCHANTMENT_PROTECT_ALL 2002 -#define IDS_ENCHANTMENT_PROTECT_FIRE 2003 -#define IDS_ENCHANTMENT_PROTECT_FALL 2004 -#define IDS_ENCHANTMENT_PROTECT_EXPLOSION 2005 -#define IDS_ENCHANTMENT_PROTECT_PROJECTILE 2006 -#define IDS_ENCHANTMENT_OXYGEN 2007 -#define IDS_ENCHANTMENT_WATER_WORKER 2008 -#define IDS_ENCHANTMENT_DIGGING 2009 -#define IDS_ENCHANTMENT_UNTOUCHING 2010 -#define IDS_ENCHANTMENT_DURABILITY 2011 -#define IDS_ENCHANTMENT_LOOT_BONUS 2012 -#define IDS_ENCHANTMENT_LOOT_BONUS_DIGGER 2013 -#define IDS_ENCHANTMENT_ARROW_DAMAGE 2014 -#define IDS_ENCHANTMENT_ARROW_FIRE 2015 -#define IDS_ENCHANTMENT_ARROW_KNOCKBACK 2016 -#define IDS_ENCHANTMENT_ARROW_INFINITE 2017 -#define IDS_ENCHANTMENT_LEVEL_1 2018 -#define IDS_ENCHANTMENT_LEVEL_2 2019 -#define IDS_ENCHANTMENT_LEVEL_3 2020 -#define IDS_ENCHANTMENT_LEVEL_4 2021 -#define IDS_ENCHANTMENT_LEVEL_5 2022 -#define IDS_ENCHANTMENT_LEVEL_6 2023 -#define IDS_ENCHANTMENT_LEVEL_7 2024 -#define IDS_ENCHANTMENT_LEVEL_8 2025 -#define IDS_ENCHANTMENT_LEVEL_9 2026 -#define IDS_ENCHANTMENT_LEVEL_10 2027 -#define IDS_DESC_EMERALDORE 2028 -#define IDS_DESC_ENDERCHEST 2029 -#define IDS_DESC_TRIPWIRE_SOURCE 2030 -#define IDS_DESC_TRIPWIRE 2031 -#define IDS_DESC_EMERALDBLOCK 2032 -#define IDS_DESC_COBBLESTONE_WALL 2033 -#define IDS_DESC_ANVIL 2034 -#define IDS_DESC_NETHER_QUARTZ_ORE 2035 -#define IDS_DESC_QUARTZ_BLOCK 2036 -#define IDS_DESC_EMERALD 2037 -#define IDS_DESC_FLOWERPOT 2038 -#define IDS_DESC_CARROTS 2039 -#define IDS_DESC_POTATO 2040 -#define IDS_DESC_POTATO_BAKED 2041 -#define IDS_DESC_POTATO_POISONOUS 2042 -#define IDS_DESC_CARROT_GOLDEN 2043 -#define IDS_DESC_CARROT_ON_A_STICK 2044 -#define IDS_DESC_PUMPKIN_PIE 2045 -#define IDS_DESC_ENCHANTED_BOOK 2046 -#define IDS_DESC_NETHER_QUARTZ 2047 -#define IDS_DESC_CARPET 2048 -#define IDS_ITEM_EMERALD 2049 -#define IDS_FLOWERPOT 2050 -#define IDS_CARROTS 2051 -#define IDS_POTATO 2052 -#define IDS_ITEM_POTATO_BAKED 2053 -#define IDS_ITEM_POTATO_POISONOUS 2054 -#define IDS_ITEM_CARROT_GOLDEN 2055 -#define IDS_ITEM_CARROT_ON_A_STICK 2056 -#define IDS_ITEM_PUMPKIN_PIE 2057 -#define IDS_ITEM_ENCHANTED_BOOK 2058 -#define IDS_ITEM_NETHER_QUARTZ 2059 -#define IDS_TILE_EMERALDORE 2060 -#define IDS_TILE_ENDERCHEST 2061 -#define IDS_TILE_TRIPWIRE_SOURCE 2062 -#define IDS_TILE_TRIPWIRE 2063 -#define IDS_TILE_EMERALDBLOCK 2064 -#define IDS_TILE_COBBLESTONE_WALL 2065 -#define IDS_TILE_COBBLESTONE_WALL_MOSSY 2066 -#define IDS_TILE_FLOWERPOT 2067 -#define IDS_TILE_CARROTS 2068 -#define IDS_TILE_POTATOES 2069 -#define IDS_TILE_ANVIL 2070 -#define IDS_TILE_ANVIL_INTACT 2071 -#define IDS_TILE_ANVIL_SLIGHTLYDAMAGED 2072 -#define IDS_TILE_ANVIL_VERYDAMAGED 2073 -#define IDS_TILE_NETHER_QUARTZ 2074 -#define IDS_TILE_QUARTZ_BLOCK 2075 -#define IDS_TILE_QUARTZ_BLOCK_CHISELED 2076 -#define IDS_TILE_QUARTZ_BLOCK_LINES 2077 -#define IDS_TILE_STAIRS_QUARTZ 2078 -#define IDS_TILE_CARPET 2079 -#define IDS_TILE_CARPET_BLACK 2080 -#define IDS_TILE_CARPET_RED 2081 -#define IDS_TILE_CARPET_GREEN 2082 -#define IDS_TILE_CARPET_BROWN 2083 -#define IDS_TILE_CARPET_BLUE 2084 -#define IDS_TILE_CARPET_PURPLE 2085 -#define IDS_TILE_CARPET_CYAN 2086 -#define IDS_TILE_CARPET_SILVER 2087 -#define IDS_TILE_CARPET_GRAY 2088 -#define IDS_TILE_CARPET_PINK 2089 -#define IDS_TILE_CARPET_LIME 2090 -#define IDS_TILE_CARPET_YELLOW 2091 -#define IDS_TILE_CARPET_LIGHT_BLUE 2092 -#define IDS_TILE_CARPET_MAGENTA 2093 -#define IDS_TILE_CARPET_ORANGE 2094 -#define IDS_TILE_CARPET_WHITE 2095 -#define IDS_TILE_SANDSTONE_CHISELED 2096 -#define IDS_TILE_SANDSTONE_SMOOTH 2097 -#define IDS_DEATH_THORNS 2098 -#define IDS_DEATH_FALLING_ANVIL 2099 -#define IDS_DEATH_FALLING_TILE 2100 -#define IDS_COMMAND_TELEPORT_SUCCESS 2101 -#define IDS_COMMAND_TELEPORT_ME 2102 -#define IDS_COMMAND_TELEPORT_TO_ME 2103 -#define IDS_ENCHANTMENT_THORNS 2104 -#define IDS_TILE_STONESLAB_QUARTZ 2105 -#define IDS_POTION_DESC_NIGHTVISION 2106 -#define IDS_POTION_DESC_INVISIBILITY 2107 -#define IDS_REPAIR_AND_NAME 2108 -#define IDS_REPAIR_COST 2109 -#define IDS_REPAIR_EXPENSIVE 2110 -#define IDS_TITLE_RENAME 2111 -#define IDS_YOU_HAVE 2112 -#define IDS_REQUIRED_ITEMS_FOR_TRADE 2113 -#define IDS_VILLAGER_OFFERS_ITEM 2114 -#define IDS_TOOLTIPS_REPAIR 2115 -#define IDS_TOOLTIPS_TRADE 2116 -#define IDS_TOOLTIPS_DYECOLLAR 2117 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_OVERVIEW 2118 -#define IDS_TUTORIAL_PROMPT_ANVIL_MENU_OVERVIEW 2119 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_START 2120 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_REPAIR 2121 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_SACRIFICE 2122 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_ENCHANT 2123 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_COST 2124 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_RENAMING 2125 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_SMITH 2126 -#define IDS_TUTORIAL_TASK_ANVIL_OVERVIEW 2127 -#define IDS_TUTORIAL_PROMPT_ANVIL_OVERVIEW 2128 -#define IDS_TUTORIAL_TASK_ANVIL_SUMMARY 2129 -#define IDS_TUTORIAL_TASK_ANVIL_ENCHANTED_BOOKS 2130 -#define IDS_TUTORIAL_TASK_ANVIL_COST 2131 -#define IDS_TUTORIAL_TASK_ANVIL_COST2 2132 -#define IDS_TUTORIAL_TASK_ANVIL_RENAMING 2133 -#define IDS_TUTORIAL_TASK_ANVIL_USE_CHESTS 2134 -#define IDS_TUTORIAL_TASK_TRADING_MENU_OVERVIEW 2135 -#define IDS_TUTORIAL_PROMPT_TRADING_MENU_OVERVIEW 2136 -#define IDS_TUTORIAL_TASK_TRADING_MENU_START 2137 -#define IDS_TUTORIAL_TASK_TRADING_MENU_UNAVAILABLE 2138 -#define IDS_TUTORIAL_TASK_TRADING_MENU_DETAILS 2139 -#define IDS_TUTORIAL_TASK_TRADING_MENU_INVENTORY 2140 -#define IDS_TUTORIAL_TASK_TRADING_MENU_TRADE 2141 -#define IDS_TUTORIAL_TASK_TRADING_OVERVIEW 2142 -#define IDS_TUTORIAL_PROMPT_TRADING_OVERVIEW 2143 -#define IDS_TUTORIAL_TASK_TRADING_SUMMARY 2144 -#define IDS_TUTORIAL_TASK_TRADING_TRADES 2145 -#define IDS_TUTORIAL_TASK_TRADING_INCREASE_TRADES 2146 -#define IDS_TUTORIAL_TASK_TRADING_DECREASE_TRADES 2147 -#define IDS_TUTORIAL_TASK_TRADING_USE_CHESTS 2148 -#define IDS_TUTORIAL_TASK_ENDERCHEST_OVERVIEW 2149 -#define IDS_TUTORIAL_PROMPT_ENDERCHEST_OVERVIEW 2150 -#define IDS_TUTORIAL_TASK_ENDERCHEST_SUMMARY 2151 -#define IDS_TUTORIAL_TASK_ENDERCHEST_PLAYERS 2152 -#define IDS_TUTORIAL_TASK_ENDERCHEST_FUNCTION 2153 -#define IDS_DESC_ENCHANTED_GOLDENAPPLE 2154 -#define IDS_ENABLE_TELEPORT 2155 -#define IDS_TELEPORT 2156 -#define IDS_TELEPORT_TO_PLAYER 2157 -#define IDS_TELEPORT_TO_ME 2158 -#define IDS_CAN_DISABLE_EXHAUSTION 2159 -#define IDS_CAN_INVISIBLE 2160 -#define IDS_PRIV_CAN_INVISIBLE_TOGGLE_ON 2161 -#define IDS_PRIV_CAN_INVISIBLE_TOGGLE_OFF 2162 -#define IDS_PRIV_CAN_FLY_TOGGLE_ON 2163 -#define IDS_PRIV_CAN_FLY_TOGGLE_OFF 2164 -#define IDS_PRIV_CAN_EXHAUSTION_TOGGLE_ON 2165 -#define IDS_PRIV_CAN_EXHAUSTION_TOGGLE_OFF 2166 -#define IDS_PRIV_CAN_TELEPORT_TOGGLE_ON 2167 -#define IDS_PRIV_CAN_TELEPORT_TOGGLE_OFF 2168 -#define IDS_HOW_TO_PLAY_ANVIL 2169 -#define IDS_HOW_TO_PLAY_TRADING 2170 -#define IDS_HOW_TO_PLAY_ENDERCHEST 2171 -#define IDS_VILLAGER_FARMER 2172 -#define IDS_VILLAGER_LIBRARIAN 2173 -#define IDS_VILLAGER_PRIEST 2174 -#define IDS_VILLAGER_SMITH 2175 -#define IDS_VILLAGER_BUTCHER 2176 -#define IDS_DESC_VILLAGER 2177 -#define IDS_CHEST_LARGE 2178 -#define IDS_TUTORIAL_TASK_ENCHANTING_BOOKS 2179 -#define IDS_TUTORIAL_TASK_REDSTONE_TRIPWIRE 2180 -#define IDS_TUTORIAL_TASK_BREEDING_WOLF_COLLAR 2181 -#define IDS_TUTORIAL_TASK_FARMING_CARROTS_AND_POTATOES 2182 -#define IDS_TUTORIAL_TASK_BREEDING_RIDING_PIGS 2183 -#define IDS_TUTORIAL_TASK_MINECART_PUSHING 2184 -#define IDS_CONNECTION_FAILED_NO_SD_SPLITSCREEN 2185 -#define IDS_TOOLTIPS_CURE 2186 -#define IDS_WINDOWS_EXIT 2187 -#define IDS_LANG_SYSTEM 2188 -#define IDS_LANG_ENGLISH 2189 -#define IDS_LANG_GERMAN 2190 -#define IDS_LANG_SPANISH 2191 -#define IDS_LANG_SPANISH_SPAIN 2192 -#define IDS_LANG_SPANISH_LATIN_AMERICA 2193 -#define IDS_LANG_FRENCH 2194 -#define IDS_LANG_ITALIAN 2195 -#define IDS_LANG_PORTUGUESE 2196 -#define IDS_LANG_PORTUGUESE_PORTUGAL 2197 -#define IDS_LANG_PORTUGUESE_BRAZIL 2198 -#define IDS_LANG_JAPANESE 2199 -#define IDS_LANG_KOREAN 2200 -#define IDS_LANG_CHINESE_TRADITIONAL 2201 -#define IDS_LANG_CHINESE_SIMPLIFIED 2202 -#define IDS_LANG_DANISH 2203 -#define IDS_LANG_FINISH 2204 -#define IDS_LANG_DUTCH 2205 -#define IDS_LANG_POLISH 2206 -#define IDS_LANG_RUSSIAN 2207 -#define IDS_LANG_SWEDISH 2208 -#define IDS_LANG_NORWEGIAN 2209 -#define IDS_LANG_GREEK 2210 -#define IDS_LANG_TURKISH 2211 -#define IDS_LEADERBOARD_KILLS_EASY 2212 -#define IDS_LEADERBOARD_KILLS_NORMAL 2213 -#define IDS_LEADERBOARD_KILLS_HARD 2214 -#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL 2215 -#define IDS_LEADERBOARD_MINING_BLOCKS_EASY 2216 -#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL 2217 -#define IDS_LEADERBOARD_MINING_BLOCKS_HARD 2218 -#define IDS_LEADERBOARD_FARMING_PEACEFUL 2219 -#define IDS_LEADERBOARD_FARMING_EASY 2220 -#define IDS_LEADERBOARD_FARMING_NORMAL 2221 -#define IDS_LEADERBOARD_FARMING_HARD 2222 -#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL 2223 -#define IDS_LEADERBOARD_TRAVELLING_EASY 2224 -#define IDS_LEADERBOARD_TRAVELLING_NORMAL 2225 -#define IDS_LEADERBOARD_TRAVELLING_HARD 2226 -#define IDS_TIPS_GAMETIP_0 2227 -#define IDS_TIPS_GAMETIP_1 2228 -#define IDS_TIPS_GAMETIP_48 2229 -#define IDS_TIPS_GAMETIP_44 2230 -#define IDS_TIPS_GAMETIP_45 2231 -#define IDS_TIPS_TRIVIA_4 2232 -#define IDS_TIPS_TRIVIA_17 2233 -#define IDS_HOW_TO_PLAY_MULTIPLAYER 2234 -#define IDS_HOW_TO_PLAY_SOCIALMEDIA 2235 -#define IDS_HOW_TO_PLAY_CREATIVE 2236 -#define IDS_TUTORIAL_TASK_FLY 2237 -#define IDS_TOOLTIPS_SELECTDEVICE 2238 -#define IDS_TOOLTIPS_CHANGEDEVICE 2239 -#define IDS_TOOLTIPS_VIEW_GAMERCARD 2240 -#define IDS_TOOLTIPS_VIEW_GAMERPROFILE 2241 -#define IDS_TOOLTIPS_INVITE_PARTY 2242 -#define IDS_CONFIRM_START_CREATIVE 2243 -#define IDS_CONFIRM_START_SAVEDINCREATIVE 2244 -#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE 2245 -#define IDS_CONFIRM_START_HOST_PRIVILEGES 2246 -#define IDS_CONNECTION_LOST_LIVE 2247 -#define IDS_CONNECTION_LOST_LIVE_NO_EXIT 2248 -#define IDS_AWARD_AVATAR1 2249 -#define IDS_AWARD_AVATAR2 2250 -#define IDS_AWARD_AVATAR3 2251 -#define IDS_AWARD_THEME 2252 -#define IDS_UNLOCK_ACHIEVEMENT_TEXT 2253 -#define IDS_UNLOCK_AVATAR_TEXT 2254 -#define IDS_UNLOCK_GAMERPIC_TEXT 2255 -#define IDS_UNLOCK_THEME_TEXT 2256 -#define IDS_UNLOCK_ACCEPT_INVITE 2257 -#define IDS_UNLOCK_GUEST_TEXT 2258 -#define IDS_LEADERBOARD_GAMERTAG 2259 -#define IDS_GROUPNAME_POTIONS_480 2260 -#define IDS_RETURNEDTOTITLESCREEN_TEXT 2261 -#define IDS_TRIALOVER_TEXT 2262 -#define IDS_FATAL_ERROR_TEXT 2263 -#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT 2264 -#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT 2265 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL 2266 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL 2267 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE 2268 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE 2269 -#define IDS_SAVE_ICON_MESSAGE 2270 -#define IDS_GAMEOPTION_HOST_PRIVILEGES 2271 -#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS 2272 -#define IDS_ACHIEVEMENTS 2273 -#define IDS_LABEL_GAMERTAGS 2274 -#define IDS_IN_GAME_GAMERTAGS 2275 -#define IDS_SOCIAL_DEFAULT_DESCRIPTION 2276 -#define IDS_TITLE_UPDATE_NAME 2277 -#define IDS_PLATFORM_NAME 2278 -#define IDS_BACK_BUTTON 2279 -#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS 2280 -#define IDS_KICK_PLAYER_DESCRIPTION 2281 -#define IDS_USING_TRIAL_TEXUREPACK_WARNING 2282 -#define IDS_WORLD_SIZE_TITLE_SMALL 2283 -#define IDS_WORLD_SIZE_TITLE_MEDIUM 2284 -#define IDS_WORLD_SIZE_TITLE_LARGE 2285 -#define IDS_WORLD_SIZE_TITLE_CLASSIC 2286 -#define IDS_WORLD_SIZE 2287 -#define IDS_GAMEOPTION_WORLD_SIZE 2288 -#define IDS_DISABLE_SAVING 2289 -#define IDS_GAMEOPTION_DISABLE_SAVING 2290 -#define IDS_RICHPRESENCE_GAMESTATE 2291 -#define IDS_RICHPRESENCE_IDLE 2292 -#define IDS_RICHPRESENCE_MENUS 2293 -#define IDS_RICHPRESENCE_MULTIPLAYER 2294 -#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE 2295 -#define IDS_RICHPRESENCE_MULTIPLAYER_1P 2296 -#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE 2297 -#define IDS_RICHPRESENCESTATE_BLANK 2298 -#define IDS_RICHPRESENCESTATE_RIDING_PIG 2299 -#define IDS_RICHPRESENCESTATE_RIDING_MINECART 2300 -#define IDS_RICHPRESENCESTATE_BOATING 2301 -#define IDS_RICHPRESENCESTATE_FISHING 2302 -#define IDS_RICHPRESENCESTATE_CRAFTING 2303 -#define IDS_RICHPRESENCESTATE_FORGING 2304 -#define IDS_RICHPRESENCESTATE_NETHER 2305 -#define IDS_RICHPRESENCESTATE_CD 2306 -#define IDS_RICHPRESENCESTATE_MAP 2307 -#define IDS_RICHPRESENCESTATE_ENCHANTING 2308 -#define IDS_RICHPRESENCESTATE_BREWING 2309 -#define IDS_RICHPRESENCESTATE_ANVIL 2310 -#define IDS_RICHPRESENCESTATE_TRADING 2311 +#define IDS_SLIDER_GAMEMODE 1557 +#define IDS_SLIDER_MUSIC 1558 +#define IDS_SLIDER_SOUND 1559 +#define IDS_SLIDER_GAMMA 1560 +#define IDS_SLIDER_SENSITIVITY_INGAME 1561 +#define IDS_SLIDER_SENSITIVITY_INMENU 1562 +#define IDS_DIFFICULTY_TITLE_PEACEFUL 1563 +#define IDS_DIFFICULTY_TITLE_EASY 1564 +#define IDS_DIFFICULTY_TITLE_NORMAL 1565 +#define IDS_DIFFICULTY_TITLE_HARD 1566 +#define IDS_DIFFICULTY_PEACEFUL 1567 +#define IDS_DIFFICULTY_EASY 1568 +#define IDS_DIFFICULTY_NORMAL 1569 +#define IDS_DIFFICULTY_HARD 1570 +#define IDS_TRIALOVER_TITLE 1571 +#define IDS_MULTIPLAYER_FULL_TITLE 1572 +#define IDS_MULTIPLAYER_FULL_TEXT 1573 +#define IDS_SIGN_TITLE 1574 +#define IDS_SIGN_TITLE_TEXT 1575 +#define IDS_NAME_TITLE 1576 +#define IDS_NAME_TITLE_TEXT 1577 +#define IDS_NAME_CAPTION 1578 +#define IDS_NAME_CAPTION_TEXT 1579 +#define IDS_NAME_DESC 1580 +#define IDS_NAME_DESC_TEXT 1581 +#define IDS_INVENTORY 1582 +#define IDS_INGREDIENTS 1583 +#define IDS_BREWING_STAND 1584 +#define IDS_CHEST 1585 +#define IDS_ENCHANT 1586 +#define IDS_FURNACE 1587 +#define IDS_INGREDIENT 1588 +#define IDS_FUEL 1589 +#define IDS_DISPENSER 1590 +#define IDS_CONTAINER_ANIMAL 1591 +#define IDS_CONTAINER_DROPPER 1592 +#define IDS_CONTAINER_HOPPER 1593 +#define IDS_CONTAINER_BEACON 1594 +#define IDS_CONTAINER_BEACON_PRIMARY_POWER 1595 +#define IDS_CONTAINER_BEACON_SECONDARY_POWER 1596 +#define IDS_CONTAINER_MINECART 1597 +#define IDS_NO_DLCOFFERS 1598 +#define IDS_PLAYER_JOINED 1599 +#define IDS_PLAYER_LEFT 1600 +#define IDS_PLAYER_KICKED 1601 +#define IDS_TEXT_DELETE_SAVE 1602 +#define IDS_STRINGVERIFY_AWAITING_APPROVAL 1603 +#define IDS_STRINGVERIFY_CENSORED 1604 +#define IDS_NOWPLAYING 1605 +#define IDS_DEFAULTS_TITLE 1606 +#define IDS_DEFAULTS_TEXT 1607 +#define IDS_FATAL_ERROR_TITLE 1608 +#define IDS_GAME_HOST_NAME 1609 +#define IDS_GAME_HOST_NAME_UNKNOWN 1610 +#define IDS_GUEST_ORDER_CHANGED_TITLE 1611 +#define IDS_GUEST_ORDER_CHANGED_TEXT 1612 +#define IDS_MUST_SIGN_IN_TITLE 1613 +#define IDS_MUST_SIGN_IN_TEXT 1614 +#define IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE 1615 +#define IDS_FAILED_TO_CREATE_GAME_TITLE 1616 +#define IDS_DEFAULT_SKINS 1617 +#define IDS_NO_SKIN_PACK 1618 +#define IDS_FAVORITES_SKIN_PACK 1619 +#define IDS_BANNED_LEVEL_TITLE 1620 +#define IDS_PLAYER_BANNED_LEVEL 1621 +#define IDS_ACTION_BAN_LEVEL_TITLE 1622 +#define IDS_ACTION_BAN_LEVEL_DESCRIPTION 1623 +#define IDS_BUTTON_REMOVE_FROM_BAN_LIST 1624 +#define IDS_SLIDER_AUTOSAVE 1625 +#define IDS_SLIDER_AUTOSAVE_OFF 1626 +#define IDS_MINUTES 1627 +#define IDS_CANT_PLACE_NEAR_SPAWN_TITLE 1628 +#define IDS_CANT_PLACE_NEAR_SPAWN_TEXT 1629 +#define IDS_SLIDER_INTERFACEOPACITY 1630 +#define IDS_PROGRESS_AUTOSAVING_LEVEL 1631 +#define IDS_SLIDER_UISIZE 1632 +#define IDS_SLIDER_UISIZESPLITSCREEN 1633 +#define IDS_SEED 1634 +#define IDS_UNLOCK_DLC_TITLE 1635 +#define IDS_UNLOCK_DLC_SKIN 1636 +#define IDS_UNLOCK_DLC_TEXTUREPACK_TITLE 1637 +#define IDS_UNLOCK_DLC_TEXTUREPACK_TEXT 1638 +#define IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE 1639 +#define IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT 1640 +#define IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE 1641 +#define IDS_DLC_TEXTUREPACK_UNLOCK_TITLE 1642 +#define IDS_DLC_TEXTUREPACK_GET_TRIAL_TITLE 1643 +#define IDS_DLC_TEXTUREPACK_GET_FULL_TITLE 1644 +#define IDS_DLC_TEXTUREPACK_NOT_PRESENT 1645 +#define IDS_TEXTURE_PACK_TRIALVERSION 1646 +#define IDS_TEXTUREPACK_FULLVERSION 1647 +#define IDS_UNLOCK_KICK_PLAYER_TITLE 1648 +#define IDS_UNLOCK_KICK_PLAYER 1649 +#define IDS_GAMERPICS 1650 +#define IDS_THEMES 1651 +#define IDS_SKINS 1652 +#define IDS_ALLOWFRIENDSOFFRIENDS 1653 +#define IDS_NOTALLOWED_FRIENDSOFFRIENDS 1654 +#define IDS_CANTJOIN_TITLE 1655 +#define IDS_SELECTED 1656 +#define IDS_SELECTED_SKIN 1657 +#define IDS_CORRUPT_DLC_TITLE 1658 +#define IDS_CORRUPT_DLC 1659 +#define IDS_CORRUPT_DLC_MULTIPLE 1660 +#define IDS_GAME_MODE_CHANGED 1661 +#define IDS_RENAME_WORLD_TITLE 1662 +#define IDS_RENAME_WORLD_TEXT 1663 +#define IDS_GAMEMODE_SURVIVAL 1664 +#define IDS_GAMEMODE_CREATIVE 1665 +#define IDS_GAMEMODE_ADVENTURE 1666 +#define IDS_SURVIVAL 1667 +#define IDS_CREATIVE 1668 +#define IDS_ADVENTURE 1669 +#define IDS_CREATED_IN_SURVIVAL 1670 +#define IDS_CREATED_IN_CREATIVE 1671 +#define IDS_CHECKBOX_RENDER_CLOUDS 1672 +#define IDS_TEXT_SAVEOPTIONS 1673 +#define IDS_TITLE_RENAMESAVE 1674 +#define IDS_AUTOSAVE_COUNTDOWN 1675 +#define IDS_ON 1676 +#define IDS_OFF 1677 +#define IDS_LEVELTYPE_NORMAL 1678 +#define IDS_LEVELTYPE_SUPERFLAT 1679 +#define IDS_GAMEOPTION_SEED 1680 +#define IDS_GAMEOPTION_ONLINE 1681 +#define IDS_GAMEOPTION_INVITEONLY 1682 +#define IDS_GAMEOPTION_ALLOWFOF 1683 +#define IDS_GAMEOPTION_PVP 1684 +#define IDS_GAMEOPTION_TRUST 1685 +#define IDS_GAMEOPTION_FIRE_SPREADS 1686 +#define IDS_GAMEOPTION_TNT_EXPLODES 1687 +#define IDS_GAMEOPTION_RESET_NETHER 1688 +#define IDS_GAMEOPTION_STRUCTURES 1689 +#define IDS_GAMEOPTION_SUPERFLAT 1690 +#define IDS_GAMEOPTION_BONUS_CHEST 1691 +#define IDS_GAMEOPTION_MOB_GRIEFING 1692 +#define IDS_GAMEOPTION_KEEP_INVENTORY 1693 +#define IDS_GAMEOPTION_MOB_SPAWNING 1694 +#define IDS_GAMEOPTION_MOB_LOOT 1695 +#define IDS_GAMEOPTION_TILE_DROPS 1696 +#define IDS_GAMEOPTION_NATURAL_REGEN 1697 +#define IDS_GAMEOPTION_DAYLIGHT_CYCLE 1698 +#define IDS_DLC_MENU_SKINPACKS 1699 +#define IDS_DLC_MENU_THEMES 1700 +#define IDS_DLC_MENU_GAMERPICS 1701 +#define IDS_DLC_MENU_AVATARITEMS 1702 +#define IDS_DLC_MENU_TEXTUREPACKS 1703 +#define IDS_DLC_MENU_MASHUPPACKS 1704 +#define IDS_DEATH_INFIRE 1705 +#define IDS_DEATH_ONFIRE 1706 +#define IDS_DEATH_LAVA 1707 +#define IDS_DEATH_INWALL 1708 +#define IDS_DEATH_DROWN 1709 +#define IDS_DEATH_STARVE 1710 +#define IDS_DEATH_CACTUS 1711 +#define IDS_DEATH_FALL 1712 +#define IDS_DEATH_OUTOFWORLD 1713 +#define IDS_DEATH_GENERIC 1714 +#define IDS_DEATH_EXPLOSION 1715 +#define IDS_DEATH_MAGIC 1716 +#define IDS_DEATH_DRAGON_BREATH 1717 +#define IDS_DEATH_MOB 1718 +#define IDS_DEATH_PLAYER 1719 +#define IDS_DEATH_ARROW 1720 +#define IDS_DEATH_FIREBALL 1721 +#define IDS_DEATH_THROWN 1722 +#define IDS_DEATH_INDIRECT_MAGIC 1723 +#define IDS_DEATH_FELL_ACCIDENT_LADDER 1724 +#define IDS_DEATH_FELL_ACCIDENT_VINES 1725 +#define IDS_DEATH_FELL_ACCIDENT_WATER 1726 +#define IDS_DEATH_FELL_ACCIDENT_GENERIC 1727 +#define IDS_DEATH_FELL_KILLER 1728 +#define IDS_DEATH_FELL_ASSIST 1729 +#define IDS_DEATH_FELL_ASSIST_ITEM 1730 +#define IDS_DEATH_FELL_FINISH 1731 +#define IDS_DEATH_FELL_FINISH_ITEM 1732 +#define IDS_DEATH_INFIRE_PLAYER 1733 +#define IDS_DEATH_ONFIRE_PLAYER 1734 +#define IDS_DEATH_LAVA_PLAYER 1735 +#define IDS_DEATH_DROWN_PLAYER 1736 +#define IDS_DEATH_CACTUS_PLAYER 1737 +#define IDS_DEATH_EXPLOSION_PLAYER 1738 +#define IDS_DEATH_WITHER 1739 +#define IDS_DEATH_PLAYER_ITEM 1740 +#define IDS_DEATH_ARROW_ITEM 1741 +#define IDS_DEATH_FIREBALL_ITEM 1742 +#define IDS_DEATH_THROWN_ITEM 1743 +#define IDS_DEATH_INDIRECT_MAGIC_ITEM 1744 +#define IDS_CHECKBOX_RENDER_BEDROCKFOG 1745 +#define IDS_CHECKBOX_DISPLAY_HUD 1746 +#define IDS_CHECKBOX_DISPLAY_HAND 1747 +#define IDS_CHECKBOX_DEATH_MESSAGES 1748 +#define IDS_CHECKBOX_ANIMATED_CHARACTER 1749 +#define IDS_CHECKBOX_CUSTOM_SKIN_ANIM 1750 +#define IDS_PRIV_MINE_TOGGLE_ON 1751 +#define IDS_PRIV_MINE_TOGGLE_OFF 1752 +#define IDS_PRIV_BUILD_TOGGLE_ON 1753 +#define IDS_PRIV_BUILD_TOGGLE_OFF 1754 +#define IDS_PRIV_USE_DOORS_TOGGLE_ON 1755 +#define IDS_PRIV_USE_DOORS_TOGGLE_OFF 1756 +#define IDS_PRIV_USE_CONTAINERS_TOGGLE_ON 1757 +#define IDS_PRIV_USE_CONTAINERS_TOGGLE_OFF 1758 +#define IDS_PRIV_ATTACK_MOB_TOGGLE_ON 1759 +#define IDS_PRIV_ATTACK_MOB_TOGGLE_OFF 1760 +#define IDS_PRIV_ATTACK_PLAYER_TOGGLE_ON 1761 +#define IDS_PRIV_ATTACK_PLAYER_TOGGLE_OFF 1762 +#define IDS_PRIV_ATTACK_ANIMAL_TOGGLE_ON 1763 +#define IDS_PRIV_ATTACK_ANIMAL_TOGGLE_OFF 1764 +#define IDS_PRIV_MODERATOR_TOGGLE_ON 1765 +#define IDS_PRIV_MODERATOR_TOGGLE_OFF 1766 +#define IDS_PRIV_FLY_TOGGLE_ON 1767 +#define IDS_PRIV_FLY_TOGGLE_OFF 1768 +#define IDS_PRIV_EXHAUSTION_TOGGLE_ON 1769 +#define IDS_PRIV_EXHAUSTION_TOGGLE_OFF 1770 +#define IDS_PRIV_INVISIBLE_TOGGLE_ON 1771 +#define IDS_PRIV_INVISIBLE_TOGGLE_OFF 1772 +#define IDS_PRIV_INVULNERABLE_TOGGLE_ON 1773 +#define IDS_PRIV_INVULNERABLE_TOGGLE_OFF 1774 +#define IDS_DLC_COST 1775 +#define IDS_BOSS_ENDERDRAGON_HEALTH 1776 +#define IDS_PLAYER_ENTERED_END 1777 +#define IDS_PLAYER_LEFT_END 1778 +#define IDS_WIN_TEXT 1779 +#define IDS_WIN_TEXT_PART_2 1780 +#define IDS_WIN_TEXT_PART_3 1781 +#define IDS_RESETNETHER_TITLE 1782 +#define IDS_RESETNETHER_TEXT 1783 +#define IDS_RESET_NETHER 1784 +#define IDS_DONT_RESET_NETHER 1785 +#define IDS_CANT_SHEAR_MOOSHROOM 1786 +#define IDS_MAX_PIGS_SHEEP_COWS_CATS_SPAWNED 1787 +#define IDS_MAX_MOOSHROOMS_SPAWNED 1788 +#define IDS_MAX_WOLVES_SPAWNED 1789 +#define IDS_MAX_CHICKENS_SPAWNED 1790 +#define IDS_MAX_SQUID_SPAWNED 1791 +#define IDS_MAX_BATS_SPAWNED 1792 +#define IDS_MAX_ENEMIES_SPAWNED 1793 +#define IDS_MAX_VILLAGERS_SPAWNED 1794 +#define IDS_MAX_HANGINGENTITIES 1795 +#define IDS_CANT_SPAWN_IN_PEACEFUL 1796 +#define IDS_MAX_PIGS_SHEEP_COWS_CATS_BRED 1797 +#define IDS_MAX_WOLVES_BRED 1798 +#define IDS_MAX_CHICKENS_BRED 1799 +#define IDS_MAX_HORSES_BRED 1800 +#define IDS_MAX_MUSHROOMCOWS_BRED 1801 +#define IDS_MAX_BOATS 1802 +#define IDS_MAX_SKULL_TILES 1803 +#define IDS_INVERT_LOOK 1804 +#define IDS_SOUTHPAW 1805 +#define IDS_YOU_DIED 1806 +#define IDS_RESPAWN 1807 +#define IDS_DOWNLOADABLE_CONTENT_OFFERS 1808 +#define IDS_CHANGE_SKIN 1809 +#define IDS_HOW_TO_PLAY 1810 +#define IDS_CONTROLS 1811 +#define IDS_SETTINGS 1812 +#define IDS_LANGUAGE_SELECTOR 1813 +#define IDS_CREDITS 1814 +#define IDS_REINSTALL_CONTENT 1815 +#define IDS_DEBUG_SETTINGS 1816 +#define IDS_FIRE_SPREADS 1817 +#define IDS_TNT_EXPLODES 1818 +#define IDS_PLAYER_VS_PLAYER 1819 +#define IDS_TRUST_PLAYERS 1820 +#define IDS_HOST_PRIVILEGES 1821 +#define IDS_GENERATE_STRUCTURES 1822 +#define IDS_SUPERFLAT_WORLD 1823 +#define IDS_BONUS_CHEST 1824 +#define IDS_WORLD_OPTIONS 1825 +#define IDS_GAME_OPTIONS 1826 +#define IDS_MOB_GRIEFING 1827 +#define IDS_KEEP_INVENTORY 1828 +#define IDS_MOB_SPAWNING 1829 +#define IDS_MOB_LOOT 1830 +#define IDS_TILE_DROPS 1831 +#define IDS_NATURAL_REGEN 1832 +#define IDS_DAYLIGHT_CYCLE 1833 +#define IDS_CAN_BUILD_AND_MINE 1834 +#define IDS_CAN_USE_DOORS_AND_SWITCHES 1835 +#define IDS_CAN_OPEN_CONTAINERS 1836 +#define IDS_CAN_ATTACK_PLAYERS 1837 +#define IDS_CAN_ATTACK_ANIMALS 1838 +#define IDS_MODERATOR 1839 +#define IDS_KICK_PLAYER 1840 +#define IDS_CAN_FLY 1841 +#define IDS_DISABLE_EXHAUSTION 1842 +#define IDS_INVISIBLE 1843 +#define IDS_HOST_OPTIONS 1844 +#define IDS_PLAYERS_INVITE 1845 +#define IDS_ONLINE_GAME 1846 +#define IDS_INVITE_ONLY 1847 +#define IDS_MORE_OPTIONS 1848 +#define IDS_LOAD 1849 +#define IDS_DEFAULT_WORLD_NAME 1850 +#define IDS_WORLD_NAME 1851 +#define IDS_CREATE_NEW_WORLD_SEED 1852 +#define IDS_CREATE_NEW_WORLD_RANDOM_SEED 1853 +#define IDS_PLAYERS 1854 +#define IDS_JOIN_GAME 1855 +#define IDS_START_GAME 1856 +#define IDS_NO_GAMES_FOUND 1857 +#define IDS_PLAY_GAME 1858 +#define IDS_LEADERBOARDS 1859 +#define IDS_HELP_AND_OPTIONS 1860 +#define IDS_UNLOCK_FULL_GAME 1861 +#define IDS_RESUME_GAME 1862 +#define IDS_SAVE_GAME 1863 +#define IDS_LABEL_DIFFICULTY 1864 +#define IDS_LABEL_GAME_TYPE 1865 +#define IDS_LABEL_STRUCTURES 1866 +#define IDS_LABEL_LEVEL_TYPE 1867 +#define IDS_LABEL_PvP 1868 +#define IDS_LABEL_TRUST 1869 +#define IDS_LABEL_TNT 1870 +#define IDS_LABEL_FIRE_SPREADS 1871 +#define IDS_REINSTALL_THEME 1872 +#define IDS_REINSTALL_GAMERPIC_1 1873 +#define IDS_REINSTALL_GAMERPIC_2 1874 +#define IDS_REINSTALL_AVATAR_ITEM_1 1875 +#define IDS_REINSTALL_AVATAR_ITEM_2 1876 +#define IDS_REINSTALL_AVATAR_ITEM_3 1877 +#define IDS_OPTIONS 1878 +#define IDS_AUDIO 1879 +#define IDS_CONTROL 1880 +#define IDS_GRAPHICS 1881 +#define IDS_USER_INTERFACE 1882 +#define IDS_RESET_TO_DEFAULTS 1883 +#define IDS_VIEW_BOBBING 1884 +#define IDS_HINTS 1885 +#define IDS_IN_GAME_TOOLTIPS 1886 +#define IDS_CHECKBOX_VERTICAL_SPLIT_SCREEN 1887 +#define IDS_DONE 1888 +#define IDS_EDIT_SIGN_MESSAGE 1889 +#define IDS_SOCIAL_TEXT 1890 +#define IDS_SOCIAL_LABEL_CAPTION 1891 +#define IDS_SOCIAL_DEFAULT_CAPTION 1892 +#define IDS_SOCIAL_LABEL_DESCRIPTION 1893 +#define IDS_DEFAULT_TEXTUREPACK 1894 +#define IDS_POTION_EMPTY 1895 +#define IDS_POTION_MOVESPEED 1896 +#define IDS_POTION_MOVESLOWDOWN 1897 +#define IDS_POTION_DIGSPEED 1898 +#define IDS_POTION_DIGSLOWDOWN 1899 +#define IDS_POTION_DAMAGEBOOST 1900 +#define IDS_POTION_WEAKNESS 1901 +#define IDS_POTION_HEAL 1902 +#define IDS_POTION_HARM 1903 +#define IDS_POTION_JUMP 1904 +#define IDS_POTION_CONFUSION 1905 +#define IDS_POTION_REGENERATION 1906 +#define IDS_POTION_RESISTANCE 1907 +#define IDS_POTION_FIRERESISTANCE 1908 +#define IDS_POTION_WATERBREATHING 1909 +#define IDS_POTION_INVISIBILITY 1910 +#define IDS_POTION_BLINDNESS 1911 +#define IDS_POTION_NIGHTVISION 1912 +#define IDS_POTION_HUNGER 1913 +#define IDS_POTION_POISON 1914 +#define IDS_POTION_WITHER 1915 +#define IDS_POTION_HEALTHBOOST 1916 +#define IDS_POTION_ABSORPTION 1917 +#define IDS_POTION_SATURATION 1918 +#define IDS_POTION_MOVESPEED_POSTFIX 1919 +#define IDS_POTION_MOVESLOWDOWN_POSTFIX 1920 +#define IDS_POTION_DIGSPEED_POSTFIX 1921 +#define IDS_POTION_DIGSLOWDOWN_POSTFIX 1922 +#define IDS_POTION_DAMAGEBOOST_POSTFIX 1923 +#define IDS_POTION_WEAKNESS_POSTFIX 1924 +#define IDS_POTION_HEAL_POSTFIX 1925 +#define IDS_POTION_HARM_POSTFIX 1926 +#define IDS_POTION_JUMP_POSTFIX 1927 +#define IDS_POTION_CONFUSION_POSTFIX 1928 +#define IDS_POTION_REGENERATION_POSTFIX 1929 +#define IDS_POTION_RESISTANCE_POSTFIX 1930 +#define IDS_POTION_FIRERESISTANCE_POSTFIX 1931 +#define IDS_POTION_WATERBREATHING_POSTFIX 1932 +#define IDS_POTION_INVISIBILITY_POSTFIX 1933 +#define IDS_POTION_BLINDNESS_POSTFIX 1934 +#define IDS_POTION_NIGHTVISION_POSTFIX 1935 +#define IDS_POTION_HUNGER_POSTFIX 1936 +#define IDS_POTION_POISON_POSTFIX 1937 +#define IDS_POTION_WITHER_POSTFIX 1938 +#define IDS_POTION_HEALTHBOOST_POSTFIX 1939 +#define IDS_POTION_ABSORPTION_POSTFIX 1940 +#define IDS_POTION_SATURATION_POSTFIX 1941 +#define IDS_POTION_POTENCY_0 1942 +#define IDS_POTION_POTENCY_1 1943 +#define IDS_POTION_POTENCY_2 1944 +#define IDS_POTION_POTENCY_3 1945 +#define IDS_POTION_PREFIX_GRENADE 1946 +#define IDS_POTION_PREFIX_MUNDANE 1947 +#define IDS_POTION_PREFIX_UNINTERESTING 1948 +#define IDS_POTION_PREFIX_BLAND 1949 +#define IDS_POTION_PREFIX_CLEAR 1950 +#define IDS_POTION_PREFIX_MILKY 1951 +#define IDS_POTION_PREFIX_DIFFUSE 1952 +#define IDS_POTION_PREFIX_ARTLESS 1953 +#define IDS_POTION_PREFIX_THIN 1954 +#define IDS_POTION_PREFIX_AWKWARD 1955 +#define IDS_POTION_PREFIX_FLAT 1956 +#define IDS_POTION_PREFIX_BULKY 1957 +#define IDS_POTION_PREFIX_BUNGLING 1958 +#define IDS_POTION_PREFIX_BUTTERED 1959 +#define IDS_POTION_PREFIX_SMOOTH 1960 +#define IDS_POTION_PREFIX_SUAVE 1961 +#define IDS_POTION_PREFIX_DEBONAIR 1962 +#define IDS_POTION_PREFIX_THICK 1963 +#define IDS_POTION_PREFIX_ELEGANT 1964 +#define IDS_POTION_PREFIX_FANCY 1965 +#define IDS_POTION_PREFIX_CHARMING 1966 +#define IDS_POTION_PREFIX_DASHING 1967 +#define IDS_POTION_PREFIX_REFINED 1968 +#define IDS_POTION_PREFIX_CORDIAL 1969 +#define IDS_POTION_PREFIX_SPARKLING 1970 +#define IDS_POTION_PREFIX_POTENT 1971 +#define IDS_POTION_PREFIX_FOUL 1972 +#define IDS_POTION_PREFIX_ODORLESS 1973 +#define IDS_POTION_PREFIX_RANK 1974 +#define IDS_POTION_PREFIX_HARSH 1975 +#define IDS_POTION_PREFIX_ACRID 1976 +#define IDS_POTION_PREFIX_GROSS 1977 +#define IDS_POTION_PREFIX_STINKY 1978 +#define IDS_POTION_DESC_WATER_BOTTLE 1979 +#define IDS_POTION_DESC_EMPTY 1980 +#define IDS_POTION_DESC_MOVESPEED 1981 +#define IDS_POTION_DESC_MOVESLOWDOWN 1982 +#define IDS_POTION_DESC_DAMAGEBOOST 1983 +#define IDS_POTION_DESC_WEAKNESS 1984 +#define IDS_POTION_DESC_HEAL 1985 +#define IDS_POTION_DESC_HARM 1986 +#define IDS_POTION_DESC_REGENERATION 1987 +#define IDS_POTION_DESC_FIRERESISTANCE 1988 +#define IDS_POTION_DESC_POISON 1989 +#define IDS_POTION_EFFECTS_WHENDRANK 1990 +#define IDS_ATTRIBUTE_NAME_HORSE_JUMPSTRENGTH 1991 +#define IDS_ATTRIBUTE_NAME_ZOMBIE_SPAWNREINFORCEMENTS 1992 +#define IDS_ATTRIBUTE_NAME_GENERIC_MAXHEALTH 1993 +#define IDS_ATTRIBUTE_NAME_GENERIC_FOLLOWRANGE 1994 +#define IDS_ATTRIBUTE_NAME_GENERIC_KNOCKBACKRESISTANCE 1995 +#define IDS_ATTRIBUTE_NAME_GENERIC_MOVEMENTSPEED 1996 +#define IDS_ATTRIBUTE_NAME_GENERIC_ATTACKDAMAGE 1997 +#define IDS_ENCHANTMENT_DAMAGE_ALL 1998 +#define IDS_ENCHANTMENT_DAMAGE_UNDEAD 1999 +#define IDS_ENCHANTMENT_DAMAGE_ARTHROPODS 2000 +#define IDS_ENCHANTMENT_KNOCKBACK 2001 +#define IDS_ENCHANTMENT_FIRE 2002 +#define IDS_ENCHANTMENT_PROTECT_ALL 2003 +#define IDS_ENCHANTMENT_PROTECT_FIRE 2004 +#define IDS_ENCHANTMENT_PROTECT_FALL 2005 +#define IDS_ENCHANTMENT_PROTECT_EXPLOSION 2006 +#define IDS_ENCHANTMENT_PROTECT_PROJECTILE 2007 +#define IDS_ENCHANTMENT_OXYGEN 2008 +#define IDS_ENCHANTMENT_WATER_WORKER 2009 +#define IDS_ENCHANTMENT_DIGGING 2010 +#define IDS_ENCHANTMENT_UNTOUCHING 2011 +#define IDS_ENCHANTMENT_DURABILITY 2012 +#define IDS_ENCHANTMENT_LOOT_BONUS 2013 +#define IDS_ENCHANTMENT_LOOT_BONUS_DIGGER 2014 +#define IDS_ENCHANTMENT_ARROW_DAMAGE 2015 +#define IDS_ENCHANTMENT_ARROW_FIRE 2016 +#define IDS_ENCHANTMENT_ARROW_KNOCKBACK 2017 +#define IDS_ENCHANTMENT_ARROW_INFINITE 2018 +#define IDS_ENCHANTMENT_LEVEL_1 2019 +#define IDS_ENCHANTMENT_LEVEL_2 2020 +#define IDS_ENCHANTMENT_LEVEL_3 2021 +#define IDS_ENCHANTMENT_LEVEL_4 2022 +#define IDS_ENCHANTMENT_LEVEL_5 2023 +#define IDS_ENCHANTMENT_LEVEL_6 2024 +#define IDS_ENCHANTMENT_LEVEL_7 2025 +#define IDS_ENCHANTMENT_LEVEL_8 2026 +#define IDS_ENCHANTMENT_LEVEL_9 2027 +#define IDS_ENCHANTMENT_LEVEL_10 2028 +#define IDS_DESC_EMERALDORE 2029 +#define IDS_DESC_ENDERCHEST 2030 +#define IDS_DESC_TRIPWIRE_SOURCE 2031 +#define IDS_DESC_TRIPWIRE 2032 +#define IDS_DESC_EMERALDBLOCK 2033 +#define IDS_DESC_COBBLESTONE_WALL 2034 +#define IDS_DESC_ANVIL 2035 +#define IDS_DESC_NETHER_QUARTZ_ORE 2036 +#define IDS_DESC_QUARTZ_BLOCK 2037 +#define IDS_DESC_EMERALD 2038 +#define IDS_DESC_FLOWERPOT 2039 +#define IDS_DESC_CARROTS 2040 +#define IDS_DESC_POTATO 2041 +#define IDS_DESC_POTATO_BAKED 2042 +#define IDS_DESC_POTATO_POISONOUS 2043 +#define IDS_DESC_CARROT_GOLDEN 2044 +#define IDS_DESC_CARROT_ON_A_STICK 2045 +#define IDS_DESC_PUMPKIN_PIE 2046 +#define IDS_DESC_ENCHANTED_BOOK 2047 +#define IDS_DESC_NETHER_QUARTZ 2048 +#define IDS_DESC_CARPET 2049 +#define IDS_ITEM_EMERALD 2050 +#define IDS_FLOWERPOT 2051 +#define IDS_CARROTS 2052 +#define IDS_POTATO 2053 +#define IDS_ITEM_POTATO_BAKED 2054 +#define IDS_ITEM_POTATO_POISONOUS 2055 +#define IDS_ITEM_CARROT_GOLDEN 2056 +#define IDS_ITEM_CARROT_ON_A_STICK 2057 +#define IDS_ITEM_PUMPKIN_PIE 2058 +#define IDS_ITEM_ENCHANTED_BOOK 2059 +#define IDS_ITEM_NETHER_QUARTZ 2060 +#define IDS_TILE_EMERALDORE 2061 +#define IDS_TILE_ENDERCHEST 2062 +#define IDS_TILE_TRIPWIRE_SOURCE 2063 +#define IDS_TILE_TRIPWIRE 2064 +#define IDS_TILE_EMERALDBLOCK 2065 +#define IDS_TILE_COBBLESTONE_WALL 2066 +#define IDS_TILE_COBBLESTONE_WALL_MOSSY 2067 +#define IDS_TILE_FLOWERPOT 2068 +#define IDS_TILE_CARROTS 2069 +#define IDS_TILE_POTATOES 2070 +#define IDS_TILE_ANVIL 2071 +#define IDS_TILE_ANVIL_INTACT 2072 +#define IDS_TILE_ANVIL_SLIGHTLYDAMAGED 2073 +#define IDS_TILE_ANVIL_VERYDAMAGED 2074 +#define IDS_TILE_NETHER_QUARTZ 2075 +#define IDS_TILE_QUARTZ_BLOCK 2076 +#define IDS_TILE_QUARTZ_BLOCK_CHISELED 2077 +#define IDS_TILE_QUARTZ_BLOCK_LINES 2078 +#define IDS_TILE_STAIRS_QUARTZ 2079 +#define IDS_TILE_CARPET 2080 +#define IDS_TILE_CARPET_BLACK 2081 +#define IDS_TILE_CARPET_RED 2082 +#define IDS_TILE_CARPET_GREEN 2083 +#define IDS_TILE_CARPET_BROWN 2084 +#define IDS_TILE_CARPET_BLUE 2085 +#define IDS_TILE_CARPET_PURPLE 2086 +#define IDS_TILE_CARPET_CYAN 2087 +#define IDS_TILE_CARPET_SILVER 2088 +#define IDS_TILE_CARPET_GRAY 2089 +#define IDS_TILE_CARPET_PINK 2090 +#define IDS_TILE_CARPET_LIME 2091 +#define IDS_TILE_CARPET_YELLOW 2092 +#define IDS_TILE_CARPET_LIGHT_BLUE 2093 +#define IDS_TILE_CARPET_MAGENTA 2094 +#define IDS_TILE_CARPET_ORANGE 2095 +#define IDS_TILE_CARPET_WHITE 2096 +#define IDS_TILE_SANDSTONE_CHISELED 2097 +#define IDS_TILE_SANDSTONE_SMOOTH 2098 +#define IDS_DEATH_THORNS 2099 +#define IDS_DEATH_FALLING_ANVIL 2100 +#define IDS_DEATH_FALLING_TILE 2101 +#define IDS_COMMAND_TELEPORT_SUCCESS 2102 +#define IDS_COMMAND_TELEPORT_ME 2103 +#define IDS_COMMAND_TELEPORT_TO_ME 2104 +#define IDS_ENCHANTMENT_THORNS 2105 +#define IDS_TILE_STONESLAB_QUARTZ 2106 +#define IDS_POTION_DESC_NIGHTVISION 2107 +#define IDS_POTION_DESC_INVISIBILITY 2108 +#define IDS_REPAIR_AND_NAME 2109 +#define IDS_REPAIR_COST 2110 +#define IDS_REPAIR_EXPENSIVE 2111 +#define IDS_TITLE_RENAME 2112 +#define IDS_YOU_HAVE 2113 +#define IDS_REQUIRED_ITEMS_FOR_TRADE 2114 +#define IDS_VILLAGER_OFFERS_ITEM 2115 +#define IDS_TOOLTIPS_REPAIR 2116 +#define IDS_TOOLTIPS_TRADE 2117 +#define IDS_TOOLTIPS_DYECOLLAR 2118 +#define IDS_TUTORIAL_TASK_ANVIL_MENU_OVERVIEW 2119 +#define IDS_TUTORIAL_PROMPT_ANVIL_MENU_OVERVIEW 2120 +#define IDS_TUTORIAL_TASK_ANVIL_MENU_START 2121 +#define IDS_TUTORIAL_TASK_ANVIL_MENU_REPAIR 2122 +#define IDS_TUTORIAL_TASK_ANVIL_MENU_SACRIFICE 2123 +#define IDS_TUTORIAL_TASK_ANVIL_MENU_ENCHANT 2124 +#define IDS_TUTORIAL_TASK_ANVIL_MENU_COST 2125 +#define IDS_TUTORIAL_TASK_ANVIL_MENU_RENAMING 2126 +#define IDS_TUTORIAL_TASK_ANVIL_MENU_SMITH 2127 +#define IDS_TUTORIAL_TASK_ANVIL_OVERVIEW 2128 +#define IDS_TUTORIAL_PROMPT_ANVIL_OVERVIEW 2129 +#define IDS_TUTORIAL_TASK_ANVIL_SUMMARY 2130 +#define IDS_TUTORIAL_TASK_ANVIL_ENCHANTED_BOOKS 2131 +#define IDS_TUTORIAL_TASK_ANVIL_COST 2132 +#define IDS_TUTORIAL_TASK_ANVIL_COST2 2133 +#define IDS_TUTORIAL_TASK_ANVIL_RENAMING 2134 +#define IDS_TUTORIAL_TASK_ANVIL_USE_CHESTS 2135 +#define IDS_TUTORIAL_TASK_TRADING_MENU_OVERVIEW 2136 +#define IDS_TUTORIAL_PROMPT_TRADING_MENU_OVERVIEW 2137 +#define IDS_TUTORIAL_TASK_TRADING_MENU_START 2138 +#define IDS_TUTORIAL_TASK_TRADING_MENU_UNAVAILABLE 2139 +#define IDS_TUTORIAL_TASK_TRADING_MENU_DETAILS 2140 +#define IDS_TUTORIAL_TASK_TRADING_MENU_INVENTORY 2141 +#define IDS_TUTORIAL_TASK_TRADING_MENU_TRADE 2142 +#define IDS_TUTORIAL_TASK_TRADING_OVERVIEW 2143 +#define IDS_TUTORIAL_PROMPT_TRADING_OVERVIEW 2144 +#define IDS_TUTORIAL_TASK_TRADING_SUMMARY 2145 +#define IDS_TUTORIAL_TASK_TRADING_TRADES 2146 +#define IDS_TUTORIAL_TASK_TRADING_INCREASE_TRADES 2147 +#define IDS_TUTORIAL_TASK_TRADING_DECREASE_TRADES 2148 +#define IDS_TUTORIAL_TASK_TRADING_USE_CHESTS 2149 +#define IDS_TUTORIAL_TASK_ENDERCHEST_OVERVIEW 2150 +#define IDS_TUTORIAL_PROMPT_ENDERCHEST_OVERVIEW 2151 +#define IDS_TUTORIAL_TASK_ENDERCHEST_SUMMARY 2152 +#define IDS_TUTORIAL_TASK_ENDERCHEST_PLAYERS 2153 +#define IDS_TUTORIAL_TASK_ENDERCHEST_FUNCTION 2154 +#define IDS_DESC_ENCHANTED_GOLDENAPPLE 2155 +#define IDS_ENABLE_TELEPORT 2156 +#define IDS_TELEPORT 2157 +#define IDS_TELEPORT_TO_PLAYER 2158 +#define IDS_TELEPORT_TO_ME 2159 +#define IDS_CAN_DISABLE_EXHAUSTION 2160 +#define IDS_CAN_INVISIBLE 2161 +#define IDS_PRIV_CAN_INVISIBLE_TOGGLE_ON 2162 +#define IDS_PRIV_CAN_INVISIBLE_TOGGLE_OFF 2163 +#define IDS_PRIV_CAN_FLY_TOGGLE_ON 2164 +#define IDS_PRIV_CAN_FLY_TOGGLE_OFF 2165 +#define IDS_PRIV_CAN_EXHAUSTION_TOGGLE_ON 2166 +#define IDS_PRIV_CAN_EXHAUSTION_TOGGLE_OFF 2167 +#define IDS_PRIV_CAN_TELEPORT_TOGGLE_ON 2168 +#define IDS_PRIV_CAN_TELEPORT_TOGGLE_OFF 2169 +#define IDS_HOW_TO_PLAY_ANVIL 2170 +#define IDS_HOW_TO_PLAY_TRADING 2171 +#define IDS_HOW_TO_PLAY_ENDERCHEST 2172 +#define IDS_VILLAGER_FARMER 2173 +#define IDS_VILLAGER_LIBRARIAN 2174 +#define IDS_VILLAGER_PRIEST 2175 +#define IDS_VILLAGER_SMITH 2176 +#define IDS_VILLAGER_BUTCHER 2177 +#define IDS_DESC_VILLAGER 2178 +#define IDS_CHEST_LARGE 2179 +#define IDS_TUTORIAL_TASK_ENCHANTING_BOOKS 2180 +#define IDS_TUTORIAL_TASK_REDSTONE_TRIPWIRE 2181 +#define IDS_TUTORIAL_TASK_BREEDING_WOLF_COLLAR 2182 +#define IDS_TUTORIAL_TASK_FARMING_CARROTS_AND_POTATOES 2183 +#define IDS_TUTORIAL_TASK_BREEDING_RIDING_PIGS 2184 +#define IDS_TUTORIAL_TASK_MINECART_PUSHING 2185 +#define IDS_CONNECTION_FAILED_NO_SD_SPLITSCREEN 2186 +#define IDS_TOOLTIPS_CURE 2187 +#define IDS_WINDOWS_EXIT 2188 +#define IDS_LANG_SYSTEM 2189 +#define IDS_LANG_ENGLISH 2190 +#define IDS_LANG_GERMAN 2191 +#define IDS_LANG_SPANISH 2192 +#define IDS_LANG_SPANISH_SPAIN 2193 +#define IDS_LANG_SPANISH_LATIN_AMERICA 2194 +#define IDS_LANG_FRENCH 2195 +#define IDS_LANG_ITALIAN 2196 +#define IDS_LANG_PORTUGUESE 2197 +#define IDS_LANG_PORTUGUESE_PORTUGAL 2198 +#define IDS_LANG_PORTUGUESE_BRAZIL 2199 +#define IDS_LANG_JAPANESE 2200 +#define IDS_LANG_KOREAN 2201 +#define IDS_LANG_CHINESE_TRADITIONAL 2202 +#define IDS_LANG_CHINESE_SIMPLIFIED 2203 +#define IDS_LANG_DANISH 2204 +#define IDS_LANG_FINISH 2205 +#define IDS_LANG_DUTCH 2206 +#define IDS_LANG_POLISH 2207 +#define IDS_LANG_RUSSIAN 2208 +#define IDS_LANG_SWEDISH 2209 +#define IDS_LANG_NORWEGIAN 2210 +#define IDS_LANG_GREEK 2211 +#define IDS_LANG_TURKISH 2212 +#define IDS_LEADERBOARD_KILLS_EASY 2213 +#define IDS_LEADERBOARD_KILLS_NORMAL 2214 +#define IDS_LEADERBOARD_KILLS_HARD 2215 +#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL 2216 +#define IDS_LEADERBOARD_MINING_BLOCKS_EASY 2217 +#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL 2218 +#define IDS_LEADERBOARD_MINING_BLOCKS_HARD 2219 +#define IDS_LEADERBOARD_FARMING_PEACEFUL 2220 +#define IDS_LEADERBOARD_FARMING_EASY 2221 +#define IDS_LEADERBOARD_FARMING_NORMAL 2222 +#define IDS_LEADERBOARD_FARMING_HARD 2223 +#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL 2224 +#define IDS_LEADERBOARD_TRAVELLING_EASY 2225 +#define IDS_LEADERBOARD_TRAVELLING_NORMAL 2226 +#define IDS_LEADERBOARD_TRAVELLING_HARD 2227 +#define IDS_TIPS_GAMETIP_0 2228 +#define IDS_TIPS_GAMETIP_1 2229 +#define IDS_TIPS_GAMETIP_48 2230 +#define IDS_TIPS_GAMETIP_44 2231 +#define IDS_TIPS_GAMETIP_45 2232 +#define IDS_TIPS_TRIVIA_4 2233 +#define IDS_TIPS_TRIVIA_17 2234 +#define IDS_HOW_TO_PLAY_MULTIPLAYER 2235 +#define IDS_HOW_TO_PLAY_SOCIALMEDIA 2236 +#define IDS_HOW_TO_PLAY_CREATIVE 2237 +#define IDS_TUTORIAL_TASK_FLY 2238 +#define IDS_TOOLTIPS_SELECTDEVICE 2239 +#define IDS_TOOLTIPS_CHANGEDEVICE 2240 +#define IDS_TOOLTIPS_VIEW_GAMERCARD 2241 +#define IDS_TOOLTIPS_VIEW_GAMERPROFILE 2242 +#define IDS_TOOLTIPS_INVITE_PARTY 2243 +#define IDS_CONFIRM_START_CREATIVE 2244 +#define IDS_CONFIRM_START_SAVEDINCREATIVE 2245 +#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE 2246 +#define IDS_CONFIRM_START_HOST_PRIVILEGES 2247 +#define IDS_CONNECTION_LOST_LIVE 2248 +#define IDS_CONNECTION_LOST_LIVE_NO_EXIT 2249 +#define IDS_AWARD_AVATAR1 2250 +#define IDS_AWARD_AVATAR2 2251 +#define IDS_AWARD_AVATAR3 2252 +#define IDS_AWARD_THEME 2253 +#define IDS_UNLOCK_ACHIEVEMENT_TEXT 2254 +#define IDS_UNLOCK_AVATAR_TEXT 2255 +#define IDS_UNLOCK_GAMERPIC_TEXT 2256 +#define IDS_UNLOCK_THEME_TEXT 2257 +#define IDS_UNLOCK_ACCEPT_INVITE 2258 +#define IDS_UNLOCK_GUEST_TEXT 2259 +#define IDS_LEADERBOARD_GAMERTAG 2260 +#define IDS_GROUPNAME_POTIONS_480 2261 +#define IDS_RETURNEDTOTITLESCREEN_TEXT 2262 +#define IDS_TRIALOVER_TEXT 2263 +#define IDS_FATAL_ERROR_TEXT 2264 +#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT 2265 +#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT 2266 +#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL 2267 +#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL 2268 +#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE 2269 +#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE 2270 +#define IDS_SAVE_ICON_MESSAGE 2271 +#define IDS_GAMEOPTION_HOST_PRIVILEGES 2272 +#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS 2273 +#define IDS_ACHIEVEMENTS 2274 +#define IDS_LABEL_GAMERTAGS 2275 +#define IDS_IN_GAME_GAMERTAGS 2276 +#define IDS_SOCIAL_DEFAULT_DESCRIPTION 2277 +#define IDS_TITLE_UPDATE_NAME 2278 +#define IDS_PLATFORM_NAME 2279 +#define IDS_BACK_BUTTON 2280 +#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS 2281 +#define IDS_KICK_PLAYER_DESCRIPTION 2282 +#define IDS_USING_TRIAL_TEXUREPACK_WARNING 2283 +#define IDS_WORLD_SIZE_TITLE_SMALL 2284 +#define IDS_WORLD_SIZE_TITLE_MEDIUM 2285 +#define IDS_WORLD_SIZE_TITLE_LARGE 2286 +#define IDS_WORLD_SIZE_TITLE_CLASSIC 2287 +#define IDS_WORLD_SIZE 2288 +#define IDS_GAMEOPTION_WORLD_SIZE 2289 +#define IDS_DISABLE_SAVING 2290 +#define IDS_GAMEOPTION_DISABLE_SAVING 2291 +#define IDS_RICHPRESENCE_GAMESTATE 2292 +#define IDS_RICHPRESENCE_IDLE 2293 +#define IDS_RICHPRESENCE_MENUS 2294 +#define IDS_RICHPRESENCE_MULTIPLAYER 2295 +#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE 2296 +#define IDS_RICHPRESENCE_MULTIPLAYER_1P 2297 +#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE 2298 +#define IDS_RICHPRESENCESTATE_BLANK 2299 +#define IDS_RICHPRESENCESTATE_RIDING_PIG 2300 +#define IDS_RICHPRESENCESTATE_RIDING_MINECART 2301 +#define IDS_RICHPRESENCESTATE_BOATING 2302 +#define IDS_RICHPRESENCESTATE_FISHING 2303 +#define IDS_RICHPRESENCESTATE_CRAFTING 2304 +#define IDS_RICHPRESENCESTATE_FORGING 2305 +#define IDS_RICHPRESENCESTATE_NETHER 2306 +#define IDS_RICHPRESENCESTATE_CD 2307 +#define IDS_RICHPRESENCESTATE_MAP 2308 +#define IDS_RICHPRESENCESTATE_ENCHANTING 2309 +#define IDS_RICHPRESENCESTATE_BREWING 2310 +#define IDS_RICHPRESENCESTATE_ANVIL 2311 +#define IDS_RICHPRESENCESTATE_TRADING 2312 diff --git a/Minecraft.Client/Xbox/Xbox_App.cpp b/Minecraft.Client/Xbox/Xbox_App.cpp index a717540b..eea494c3 100644 --- a/Minecraft.Client/Xbox/Xbox_App.cpp +++ b/Minecraft.Client/Xbox/Xbox_App.cpp @@ -1658,7 +1658,7 @@ HRESULT CConsoleMinecraftApp::NavigateToScene(int iPad,EUIScene eScene, void *in // If you're navigating to the multigamejoinload, and the player hasn't seen the updates message yet, display it now // display this message the first 3 times // todo: re-enable if we fix this menu, for now its just blank! - if(false && (eScene==eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0)) + if(false && (eScene==eUIScene_LoadCreateJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0)) { eScene=eUIScene_NewUpdateMessage; bSeenUpdateTextThisSession=true; @@ -1737,7 +1737,7 @@ HRESULT CConsoleMinecraftApp::NavigateToScene(int iPad,EUIScene eScene, void *in case eUIScene_LeaderboardsMenu: case eUIScene_Credits: case eUIScene_CreateWorldMenu: - case eUIScene_LoadOrJoinMenu: + case eUIScene_LoadCreateJoinMenu: case eUIScene_JoinMenu: case eUIScene_DLCOffersMenu: case eUIScene_DLCMainMenu: diff --git a/Minecraft.Client/cmake/sources/Windows.cmake b/Minecraft.Client/cmake/sources/Windows.cmake index e07f46e3..16f68f00 100644 --- a/Minecraft.Client/cmake/sources/Windows.cmake +++ b/Minecraft.Client/cmake/sources/Windows.cmake @@ -156,8 +156,8 @@ set(_MINECRAFT_CLIENT_WINDOWS_COMMON_UI_SCENES_FRONTEND_MENU_SCREENS "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_LeaderboardsMenu.h" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_LoadMenu.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_LoadMenu.h" - "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_LoadOrJoinMenu.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_LoadOrJoinMenu.h" + "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_LoadCreateJoinMenu.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_LoadCreateJoinMenu.h" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_MainMenu.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_MainMenu.h" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIScene_NewUpdateMessage.cpp" diff --git a/Minecraft.Server/cmake/sources/Common.cmake b/Minecraft.Server/cmake/sources/Common.cmake index 06aa0bfe..2e02e2f9 100644 --- a/Minecraft.Server/cmake/sources/Common.cmake +++ b/Minecraft.Server/cmake/sources/Common.cmake @@ -212,7 +212,7 @@ set(_MINECRAFT_SERVER_COMMON_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIScene_MainMenu.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIScene_MessageBox.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp"