New File System and Cleanup some code Part 2

Minecraft.Client/Common/Consoles_App.cpp

@@ -1,81 +1,61 @@
-#include "stdafx.h"
-#include "..\..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\Options.h"
-#include "..\MinecraftServer.h"
-#include "..\MultiPlayerLevel.h"
-#include "..\GameRenderer.h"
-#include "..\ProgressRenderer.h"
-#include "..\LevelRenderer.h"
-#include "..\MobSkinMemTextureProcessor.h"
-#include "..\Minecraft.h"
-#include "..\ClientConnection.h"
-#include "..\MultiPlayerLocalPlayer.h"
-#include "..\LocalPlayer.h"
-#include "..\..\Minecraft.World\Player.h"
-#include "..\..\Minecraft.World\Inventory.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\FurnaceTileEntity.h"
-#include "..\..\Minecraft.World\Container.h"
-#include "..\..\Minecraft.World\DispenserTileEntity.h"
-#include "..\..\Minecraft.World\SignTileEntity.h"
-#include "..\StatsCounter.h"
-#include "..\GameMode.h"
-#include "..\Xbox\Social\SocialManager.h"
-#include "Tutorial\TutorialMode.h"
-#if defined _XBOX || defined _WINDOWS64
-#include "..\Xbox\XML\ATGXmlParser.h"
-#include "..\Xbox\XML\xmlFilesCallback.h"
-#endif
+#include "../../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.World/net.minecraft.world.phys.h"
+#include "../../Minecraft.World/InputOutputStream.h"
+#include "../../Minecraft.World/compression.h"
+#include "../Options.h"
+#include "../MinecraftServer.h"
+#include "../MultiPlayerLevel.h"
+#include "../GameRenderer.h"
+#include "../ProgressRenderer.h"
+#include "../LevelRenderer.h"
+#include "../MobSkinMemTextureProcessor.h"
+#include "../Minecraft.h"
+#include "../ClientConnection.h"
+#include "../MultiPlayerLocalPlayer.h"
+#include "../LocalPlayer.h"
+#include "../Gui.h"
+#include "../../Minecraft.World/Player.h"
+#include "../../Minecraft.World/Inventory.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/FurnaceTileEntity.h"
+#include "../../Minecraft.World/Container.h"
+#include "../../Minecraft.World/DispenserTileEntity.h"
+#include "../../Minecraft.World/SignTileEntity.h"
+#include "../StatsCounter.h"
+#include "../GameMode.h"
+#include "Tutorial/TutorialMode.h"
+#include "../Windows64/XML/ATGXmlParser.h"
+#include "../Windows64/GameConfig/Minecraft.spa.h"
 #include "Minecraft_Macros.h"
-#include "..\PlayerList.h"
-#include "..\ServerPlayer.h"
-#include "GameRules\ConsoleGameRules.h"
-#include "GameRules\ConsoleSchematicFile.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\LevelData.h"
-#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
-#include "..\..\Minecraft.Server\ServerLogManager.h"
-#endif
-#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\EntityRenderDispatcher.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\TexturePackRepository.h"
-#include "..\DLCTexturePack.h"
-#include "DLC\DLCPack.h"
-#include "..\StringTable.h"
-#ifndef _XBOX
-#include "..\ArchiveFile.h"
-#endif
-#include "..\Minecraft.h"
-#ifdef _XBOX
-#include "..\Xbox\GameConfig\Minecraft.spa.h"
-#include "..\Xbox\Network\NetworkPlayerXbox.h"
-#include "XUI\XUI_TextEntry.h"
-#include "XUI\XUI_XZP_Icons.h"
-#include "XUI\XUI_PauseMenu.h"
-#else
-#include "UI\UI.h"
-#include "UI\UIScene_PauseMenu.h"
-#endif
-#ifdef __PS3__
-#include <sys/tty.h>
-#endif
-#ifdef __ORBIS__
-#include <save_data_dialog.h>
+#include "../PlayerList.h"
+#include "../ServerPlayer.h"
+#include "GameRules/ConsoleGameRules.h"
+#include "GameRules/ConsoleSchematicFile.h"
+#include "../User.h"
+#include "../../Minecraft.World/LevelData.h"
+#ifdef MINECRAFT_SERVER_BUILD
+#include "../../Minecraft.Server/ServerLogManager.h"
 #endif
+#include "../../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../EntityRenderDispatcher.h"
+#include "../../Minecraft.World/compression.h"
+#include "../TexturePackRepository.h"
+#include "../DLCTexturePack.h"
+#include "../StringTable.h"
+#include "../ArchiveFile.h"
+#include "../Minecraft.h"
+#include "UI/UI.h"
+#include "UI/UIScene_PauseMenu.h"
 
-#include "..\Common\Leaderboards\LeaderboardManager.h"
+#include "../Common/Leaderboards/LeaderboardManager.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../Windows64/Windows64_DiscordPresence.h"
 
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-
-#ifdef _WINDOWS64
-#include "..\Windows64\Windows64_DiscordPresence.h"
-#endif
+#include "DLC/DLCSkinFile.h"
+#include "DLC/DLCPack.h"
+#include "Colours/ColourTable.h"
 
 //CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;
@@ -770,15 +750,21 @@ bool CMinecraftApp::LoadBeaconMenu(int iPad ,shared_ptr<Inventory> inventory, sh
 static void Win64_GetSettingsPath(char *outPath, DWORD size)
 {
     GetModuleFileNameA(nullptr, outPath, size);
+
     char *lastSlash = strrchr(outPath, '\\');
-    if (lastSlash) *(lastSlash + 1) = '\0';
-    strncat_s(outPath, size, "settings.dat", _TRUNCATE);
+    if (lastSlash)
+    	*(lastSlash + 1) = '\0';
+
+    strncat_s(outPath, size, "Data\\settings.dat", _TRUNCATE);
 }
 static void Win64_SaveSettings(GAME_SETTINGS *gs)
 {
-    if (!gs) return;
+    if (!gs)
+    	return;
+
     char filePath[MAX_PATH] = {};
     Win64_GetSettingsPath(filePath, MAX_PATH);
+
     FILE *f = nullptr;
     if (fopen_s(&f, filePath, "wb") == 0 && f)
     {
@@ -788,9 +774,12 @@ static void Win64_SaveSettings(GAME_SETTINGS *gs)
 }
 static void Win64_LoadSettings(GAME_SETTINGS *gs)
 {
-    if (!gs) return;
+    if (!gs)
+    	return;
+
     char filePath[MAX_PATH] = {};
     Win64_GetSettingsPath(filePath, MAX_PATH);
+
     FILE *f = nullptr;
     if (fopen_s(&f, filePath, "rb") == 0 && f)
     {
@@ -2567,7 +2556,7 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
 		break;
 	case eGameSetting_RenderDistance:
 		{
-			unsigned char ucVal=(GameSettingsA[iPad]->uiBitmaskValues >> 25) & 0x3F;
+			unsigned char ucVal=(GameSettingsA[iPad]->uiBitmaskValues >> 23) & 0x3F;
 			return ucVal;
 		}
 		break;
@@ -2940,15 +2929,6 @@ void CMinecraftApp::HandleXuiActions(void)
 						// flag the render to capture the screenshot for the save
 						SetAction(i,eAppAction_SaveGameCapturedThumbnail);
 					}
-					else
-					{
-						// ask the player if they would like to upgrade, or they'll lose the level
-
-						UINT uiIDA[2];
-						uiIDA[0]=IDS_CONFIRM_OK;
-						uiIDA[1]=IDS_CONFIRM_CANCEL;
-						ui.RequestErrorMessage(IDS_UNLOCK_TITLE, IDS_UNLOCK_TOSAVE_TEXT, uiIDA, 2,i,&CMinecraftApp::UnlockFullSaveReturned,this);
-					}
 				}
 
 				break;
@@ -3382,14 +3362,6 @@ void CMinecraftApp::HandleXuiActions(void)
 					// flag to capture the save thumbnail
 					SetAction(i,eAppAction_ExitWorldCapturedThumbnail, param);
 				}
-				else
-				{
-					// ask the player if they would like to upgrade, or they'll lose the level
-					UINT uiIDA[2];
-					uiIDA[0]=IDS_CONFIRM_OK;
-					uiIDA[1]=IDS_CONFIRM_CANCEL;
-					ui.RequestErrorMessage(IDS_UNLOCK_TITLE, IDS_UNLOCK_TOSAVE_TEXT, uiIDA, 2, i,&CMinecraftApp::UnlockFullExitReturned,this);
-				}
 
 				// Change the presence info
 				// Are we offline or online, and how many players are there
@@ -3486,52 +3458,6 @@ void CMinecraftApp::HandleXuiActions(void)
 					ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams);
 				}
 				break;
-			case eAppAction_ExitWorldTrial:
-				{
-					SetAction(i,eAppAction_Idle);
-
-					pMinecraft->gui->clearMessages();
-
-					// turn off the gamertags in splitscreen for the primary player, since they are about to be made fullscreen
-					ui.HideAllGameUIElements();
-
-					// Stop app running
-					SetGameStarted(false);
-
-					ui.CloseAllPlayersScenes();
-
-					// 4J Stu - Fix for #12368 - Crash: Game crashes when saving then exiting and selecting to save
-					for(unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
-					{
-#ifdef _XBOX
-						app.TutorialSceneNavigateBack(idx,true);
-#endif
-
-						// 4J Stu - Fix for #13257 - CRASH: Gameplay: Title crashed after exiting the tutorial
-						// It doesn't matter if they were in the tutorial already
-						pMinecraft->playerLeftTutorial( idx );
-					}
-
-					LoadingInputParams *loadingParams = new LoadingInputParams();
-					loadingParams->func = &UIScene_PauseMenu::ExitWorldThreadProc;
-					loadingParams->lpParam = param;
-
-					UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
-					completionData->bShowBackground=TRUE;
-					completionData->bShowLogo=TRUE;
-					completionData->type = e_ProgressCompletion_NavigateToHomeMenu;
-					completionData->iPad = DEFAULT_XUI_MENU_USER;
-					loadingParams->completionData = completionData;
-
-					ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams);
-				}
-
-				break;
-			case eAppAction_ExitTrial:
-				//XLaunchNewImage(XLAUNCH_KEYWORD_DASH_ARCADE, 0);
-				ExitGame();
-				break;
-
 			case eAppAction_Respawn:
 				{
 					ConnectionProgressParams *param = new ConnectionProgressParams();
@@ -3824,30 +3750,7 @@ void CMinecraftApp::HandleXuiActions(void)
 
 				break;
 
-			case eAppAction_TrialOver:
-				{
-					SetAction(i,eAppAction_Idle);
-					UINT uiIDA[2];
-					uiIDA[0]=IDS_UNLOCK_TITLE;
-					uiIDA[1]=IDS_EXIT_GAME;
-
-					ui.RequestErrorMessage(IDS_TRIALOVER_TITLE, IDS_TRIALOVER_TEXT, uiIDA, 2, i,&CMinecraftApp::TrialOverReturned,this);
-				}
-				break;
-
 				// INVITES
-			case eAppAction_DashboardTrialJoinFromInvite:
-				{
-					TelemetryManager->RecordUpsellPresented(i, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID);
-
-					SetAction(i,eAppAction_Idle);
-					UINT uiIDA[2];
-					uiIDA[0]=IDS_CONFIRM_OK;
-					uiIDA[1]=IDS_CONFIRM_CANCEL;
-
-					ui.RequestErrorMessage(IDS_UNLOCK_TITLE, IDS_UNLOCK_ACCEPT_INVITE, uiIDA, 2, i,&CMinecraftApp::UnlockFullInviteReturned,this);
-				}
-				break;
 			case eAppAction_ExitAndJoinFromInvite:
 				{
 					UINT uiIDA[3];
@@ -3878,16 +3781,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					else
 #endif
 					{
-						if(!ProfileManager.IsFullVersion())
-						{
-							TelemetryManager->RecordUpsellPresented(i, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID);
-
-							// upsell
-							uiIDA[0]=IDS_CONFIRM_OK;
-							uiIDA[1]=IDS_CONFIRM_CANCEL;
-							ui.RequestErrorMessage(IDS_UNLOCK_TITLE, IDS_UNLOCK_ACCEPT_INVITE, uiIDA, 2, i,&CMinecraftApp::UnlockFullInviteReturned,this);
-						}
-						else
+						if(ProfileManager.IsFullVersion())
 						{
 							uiIDA[0]=IDS_CONFIRM_CANCEL;
 							uiIDA[1]=IDS_CONFIRM_OK;
@@ -4335,35 +4229,6 @@ void CMinecraftApp::HandleXuiActions(void)
 #endif
 				}
 				break;
-
-			case eAppAction_TexturePackRequired:
-				{
-#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
-					UINT uiIDA[2];
-					uiIDA[0]=IDS_TEXTUREPACK_FULLVERSION;
-					uiIDA[1]=IDS_CONFIRM_CANCEL;			// let them continue without the texture pack here (as this is only really for r
-					// Give the player a warning about the texture pack missing
-					ui.RequestErrorMessage(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&CMinecraftApp::TexturePackDialogReturned,this);
-					SetAction(i,eAppAction_Idle);
-#else
-#ifdef _XBOX
-					ULONGLONG ullOfferID_Full;
-					app.GetDLCFullOfferIDForPackID(app.GetRequiredTexturePackID(),&ullOfferID_Full);
-
-					TelemetryManager->RecordUpsellPresented(ProfileManager.GetPrimaryPad(), eSet_UpsellID_Texture_DLC, ullOfferID_Full & 0xFFFFFFFF);
-#endif
-					UINT uiIDA[2];
-
-					uiIDA[0]=IDS_TEXTUREPACK_FULLVERSION;
-					uiIDA[1]=IDS_TEXTURE_PACK_TRIALVERSION;
-
-					// Give the player a warning about the texture pack missing
-					ui.RequestErrorMessage(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&CMinecraftApp::TexturePackDialogReturned,this);
-					SetAction(i,eAppAction_Idle);
-#endif
-				}
-
-				break;
 			}
 		}
 
@@ -4590,69 +4455,14 @@ int CMinecraftApp::BannedLevelDialogReturned(void *pParam,int iPad,const C4JStor
 
 void CMinecraftApp::loadMediaArchive()
 {
-	wstring mediapath = L"";
+	wstring mediaPath = L"Assets/MediaWindows64.arc";
 
-#ifdef __PS3__
-	mediapath = L"Common\\Media\\MediaPS3.arc";
-#elif _WINDOWS64
-	mediapath = L"Common\\Media\\MediaWindows64.arc";
-#elif __ORBIS__
-	mediapath = L"Common\\Media\\MediaOrbis.arc";
-#elif _DURANGO
-	mediapath = L"Common\\Media\\MediaDurango.arc";
-#elif __PSVITA__
-	mediapath = L"Common\\Media\\MediaPSVita.arc";
-#endif
-
-	if (!mediapath.empty())
-	{
-		m_mediaArchive = new ArchiveFile( File(mediapath) );
-	}
-#if 0
-	string path = "Common\\media.arc";
-	HANDLE hFile = CreateFile(	path.c_str(),
-		GENERIC_READ,
-		FILE_SHARE_READ,
-		nullptr,
-		OPEN_EXISTING,
-		FILE_FLAG_SEQUENTIAL_SCAN,
-		nullptr );
-
-	if( hFile != INVALID_HANDLE_VALUE )
-	{
-		File fileHelper(convStringToWstring(path));
-		DWORD dwFileSize = fileHelper.length();
-
-		// Initialize memory.
-		PBYTE m_fBody = new BYTE[ dwFileSize ];
-		ZeroMemory(m_fBody, dwFileSize);
-
-		DWORD m_fSize = 0;
-		BOOL hr = ReadFile(	hFile,
-			m_fBody,
-			dwFileSize,
-			&m_fSize,
-			nullptr	);
-
-		assert( m_fSize == dwFileSize );
-
-		CloseHandle( hFile );
-
-		m_mediaArchive = new ArchiveFile(m_fBody, m_fSize);
-	}
-	else
-	{
-		assert( false );
-		// AHHHHHHHHHHHH
-		m_mediaArchive = nullptr;
-	}
-#endif
+	if (!mediaPath.empty())
+		m_mediaArchive = new ArchiveFile( File(mediaPath) );
 }
 
 void CMinecraftApp::loadStringTable()
 {
-#ifndef _XBOX
-
 	if(m_stringTable!=nullptr)
 	{
 		// we need to unload the current string table, this is a reload
@@ -4671,7 +4481,6 @@ void CMinecraftApp::loadStringTable()
 		assert(false);
 		// AHHHHHHHHH.
 	}
-#endif
 }
 
 int CMinecraftApp::PrimaryPlayerSignedOutReturned(void *pParam,int iPad,const C4JStorage::EMessageResult)
@@ -4862,32 +4671,8 @@ int CMinecraftApp::UnlockFullInviteReturned(void *pParam,int iPad,C4JStorage::EM
 		if(ProfileManager.IsSignedInLive(iPad))
 		{
 			// 4J-PB - need to check this user can access the store
-#if defined(__PS3__) || defined(__PSVITA__)
-			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
-			if(bContentRestricted)
-			{
-				UINT uiIDA[1];
-				uiIDA[0]=IDS_CONFIRM_OK;
-				ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad());
-			}
-			else
-#endif
-			{
-				ProfileManager.DisplayFullVersionPurchase(false,iPad,eSen_UpsellID_Full_Version_Of_Game);
-			}
+			ProfileManager.DisplayFullVersionPurchase(false,iPad,eSen_UpsellID_Full_Version_Of_Game);
 		}
-#if defined(__PS3__)
-		else
-		{
-			// you're not signed in to PSN!
-			UINT uiIDA[2];
-			uiIDA[0]=IDS_PRO_NOTONLINE_ACCEPT;
-			uiIDA[1]=IDS_PRO_NOTONLINE_DECLINE;
-			ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&CMinecraftApp::MustSignInFullVersionPurchaseReturned,&app);
-
-		}
-#endif
 	}
 	else
 	{
@@ -4907,52 +4692,8 @@ int CMinecraftApp::UnlockFullSaveReturned(void *pParam,int iPad,C4JStorage::EMes
 		if(ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad()))
 		{
 			// 4J-PB - need to check this user can access the store
-#if defined(__PS3__) || defined(__PSVITA__)
-			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
-			if(bContentRestricted)
-			{
-				UINT uiIDA[1];
-				uiIDA[0]=IDS_CONFIRM_OK;
-				ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad());
-			}
-			else
-#endif
-			{
 				ProfileManager.DisplayFullVersionPurchase(false,pMinecraft->player->GetXboxPad(),eSen_UpsellID_Full_Version_Of_Game);
-			}
 		}
-#if defined(__PS3__)
-		else
-		{
-			// you're not signed in to PSN!
-			UINT uiIDA[2];
-			uiIDA[0]=IDS_PRO_NOTONLINE_ACCEPT;
-			uiIDA[1]=IDS_PRO_NOTONLINE_DECLINE;
-			ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&CMinecraftApp::MustSignInFullVersionPurchaseReturned,&app);
-		}
-#elif defined(__ORBIS__)
-		else
-		{
-			// Determine why they're not "signed in live"
-			if (ProfileManager.isSignedInPSN(iPad))
-			{
-				// Signed in to PSN but not connected (no internet access)
-				assert(!ProfileManager.isConnectedToPSN(iPad));
-
-				UINT uiIDA[1];
-				uiIDA[0] = IDS_OK;
-				ui.RequestErrorMessage( IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, iPad);
-			}
-			else
-			{
-				// Not signed in to PSN
-				UINT uiIDA[1];
-				uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT;
-				ui.RequestAlertMessage( IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad, &CMinecraftApp::MustSignInFullVersionPurchaseReturned,&app);
-			}
-		}
-#endif
 	}
 	else
 	{
@@ -4985,45 +4726,8 @@ int CMinecraftApp::UnlockFullExitReturned(void *pParam,int iPad,C4JStorage::EMes
 #endif
 			{
 				ProfileManager.DisplayFullVersionPurchase(false,pMinecraft->player->GetXboxPad(),eSen_UpsellID_Full_Version_Of_Game);
-#if defined __ORBIS__ || defined __PS3__ || defined __PSVITA__
-				// still need to exit the trial or we'll be in the Pause menu with input ignored
-				pApp->SetAction(pMinecraft->player->GetXboxPad(),eAppAction_ExitWorldTrial);
-#endif
 			}
 		}
-#if defined(__PS3__) || defined __PSVITA__
-		else
-		{
-			// you're not signed in to PSN!
-			UINT uiIDA[2];
-			uiIDA[0]=IDS_PRO_NOTONLINE_ACCEPT;
-			uiIDA[1]=IDS_PRO_NOTONLINE_DECLINE;
-			ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial,&app);
-		}
-#elif defined(__ORBIS__)
-		else
-		{
-			// Determine why they're not "signed in live"
-			if (ProfileManager.isSignedInPSN(iPad))
-			{
-				// Signed in to PSN but not connected (no internet access)
-				assert(!ProfileManager.isConnectedToPSN(iPad));
-
-				UINT uiIDA[1];
-				uiIDA[0] = IDS_OK;
-				ui.RequestErrorMessage( IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, iPad);
-				// still need to exit the trial or we'll be in the Pause menu with input ignored
-				pApp->SetAction(pMinecraft->player->GetXboxPad(),eAppAction_ExitWorldTrial);
-			}
-			else
-			{
-				// Not signed in to PSN
-				UINT uiIDA[1];
-				uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT;
-				ui.RequestAlertMessage( IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, iPad, &CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial,&app);
-			}
-		}
-#endif
 	}
 	else
 	{
@@ -5045,48 +4749,18 @@ int CMinecraftApp::TrialOverReturned(void *pParam,int iPad,C4JStorage::EMessageR
 		if(ProfileManager.IsSignedInLive(pMinecraft->player->GetXboxPad()))
 		{
 			// 4J-PB - need to check this user can access the store
-#if defined(__PS3__) || defined(__PSVITA__)
-			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
-			if(bContentRestricted)
-			{
-				UINT uiIDA[1];
-				uiIDA[0]=IDS_CONFIRM_OK;
-				ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad());
-			}
-			else
-#endif
-			{
-				ProfileManager.DisplayFullVersionPurchase(false,pMinecraft->player->GetXboxPad(),eSen_UpsellID_Full_Version_Of_Game);
-			}
+			ProfileManager.DisplayFullVersionPurchase(false,pMinecraft->player->GetXboxPad(),eSen_UpsellID_Full_Version_Of_Game);
 		}
 		else
 		{
-#if defined(__PS3__)
-
-			// you're not signed in to PSN!
-			UINT uiIDA[2];
-			uiIDA[0]=IDS_PRO_NOTONLINE_ACCEPT;
-			uiIDA[1]=IDS_PRO_NOTONLINE_DECLINE;
-			ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&CMinecraftApp::MustSignInFullVersionPurchaseReturned,&app);
-
-			// 4J Stu - We can't actually exit the game, so just exit back to the main menu
-			//pApp->SetAction(pMinecraft->player->GetXboxPad(),eAppAction_ExitWorldTrial);
-#else
 			pApp->SetAction(pMinecraft->player->GetXboxPad(),eAppAction_ExitTrial);
-#endif
 		}
 	}
 	else
 	{
 		TelemetryManager->RecordUpsellResponded(iPad, eSen_UpsellID_Full_Version_Of_Game, app.m_dwOfferID, eSen_UpsellOutcome_Declined);
 
-#if defined(__PS3__) || defined(__ORBIS__)
-		// 4J Stu - We can't actually exit the game, so just exit back to the main menu
-		pApp->SetAction(pMinecraft->player->GetXboxPad(),eAppAction_ExitWorldTrial);
-#else
 		pApp->SetAction(pMinecraft->player->GetXboxPad(),eAppAction_ExitTrial);
-#endif
 	}
 
 	return 0;
@@ -5380,50 +5054,6 @@ void CMinecraftApp::NotificationsCallback(LPVOID pParam,DWORD dwNotification, un
 	pClass->m_vNotifications.push_back(pNotification);
 }
 
-#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
-int CMinecraftApp::MustSignInFullVersionPurchaseReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
-{
-	if(result==C4JStorage::EMessage_ResultAccept)
-	{
-#ifdef __PS3__
-		SQRNetworkManager_PS3::AttemptPSNSignIn(&CMinecraftApp::NowDisplayFullVersionPurchase, &app,true);
-#elif defined __PSVITA__
-		SQRNetworkManager_Vita::AttemptPSNSignIn(&CMinecraftApp::NowDisplayFullVersionPurchase, &app,true);
-#else // __PS4__
-		SQRNetworkManager_Orbis::AttemptPSNSignIn(&CMinecraftApp::NowDisplayFullVersionPurchase, &app,true);
-#endif
-	}
-
-	return 0;
-}
-
-#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
-int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial(void *pParam,int iPad,C4JStorage::EMessageResult result)
-{
-	if(result==C4JStorage::EMessage_ResultAccept)
-	{
-#ifdef __PS3__
-		SQRNetworkManager_PS3::AttemptPSNSignIn(&CMinecraftApp::NowDisplayFullVersionPurchase, &app,true);
-#elif defined __PSVITA__
-		SQRNetworkManager_Vita::AttemptPSNSignIn(&CMinecraftApp::NowDisplayFullVersionPurchase, &app,true);
-#else // __PS4__
-		SQRNetworkManager_Orbis::AttemptPSNSignIn(&CMinecraftApp::NowDisplayFullVersionPurchase, &app,true);
-#endif
-	}
-
-	//4J-PB - we need to exit the trial, or we'll be in the pause menu with ignore input true
-	app.SetAction(iPad,eAppAction_ExitWorldTrial);
-
-	return 0;
-}
-#endif
-
-int CMinecraftApp::NowDisplayFullVersionPurchase(void *pParam, bool bContinue, int iPad)
-{
-	app.m_bDisplayFullVersionPurchase=true;
-	return 0;
-}
-#endif
 void CMinecraftApp::UpsellReturnedCallback(LPVOID pParam, eUpsellType type, eUpsellResponse result, int iUserData)
 {
 	ESen_UpsellID senType;
@@ -5441,21 +5071,6 @@ void CMinecraftApp::UpsellReturnedCallback(LPVOID pParam, eUpsellType type, eUps
 	case eUpsellResponse_Accepted_Purchase:
 		senResponse = eSen_UpsellOutcome_Accepted;
 		break;
-#ifdef __PS3__
-		// special case for people who are not signed in to the PSN while playing the trial game
-	case eUpsellResponse_UserNotSignedInPSN:
-
-		uiIDA[0]=IDS_PRO_NOTONLINE_ACCEPT;
-		uiIDA[1]=IDS_PRO_NOTONLINE_DECLINE;
-		ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&CMinecraftApp::MustSignInFullVersionPurchaseReturned,&app);
-
-		return;
-
-	case eUpsellResponse_NotAllowedOnline: // On earning a trophy in the trial version, where the user is underage and can't go online to buy the game, but they selected to buy the game on the trophy upsell
-		uiIDA[0]=IDS_CONFIRM_OK;
-		ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad());
-		break;
-#endif
 	case eUpsellResponse_Declined:
 	default:
 		senResponse = eSen_UpsellOutcome_Declined;
@@ -6171,37 +5786,6 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned(void *pParam,int iPad
 	{
 		if( result==C4JStorage::EMessage_ResultDecline ) // Save
 		{
-			// Check they have the full texture pack if they are using one
-			// 4J-PB - Is the player trying to save but they are using a trial texturepack ?
-			if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
-			{
-				TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-
-				DLCPack * pDLCPack=tPack->getDLCPack();
-				if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" ))
-				{
-					// upsell
-					// get the dlc texture pack
-
-#ifdef _XBOX
-					DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
-					ULONGLONG ullOfferID_Full;
-					app.GetDLCFullOfferIDForPackID(pDLCTexPack->getDLCParentPackId(),&ullOfferID_Full);
-
-					// tell sentient about the upsell of the full version of the skin pack
-					TelemetryManager->RecordUpsellPresented(iPad, eSet_UpsellID_Texture_DLC, ullOfferID_Full & 0xFFFFFFFF);
-#endif
-
-					UINT uiIDA[2];
-					uiIDA[0]=IDS_CONFIRM_OK;
-					uiIDA[1]=IDS_CONFIRM_CANCEL;
-
-					// Give the player a warning about the trial version of the texture pack
-					ui.RequestErrorMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT, uiIDA, 2, iPad,&CMinecraftApp::WarningTrialTexturePackReturned,pClass);
-
-					return S_OK;
-				}
-			}
 #ifndef _XBOX_ONE
 			// does the save exist?
 			bool bSaveExists;
@@ -6242,129 +5826,6 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned(void *pParam,int iPad
 
 int CMinecraftApp::WarningTrialTexturePackReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	// 4J Stu - I added this in when fixing an X1 bug. We should probably add this as well but I don't have time to test all platforms atm
-#if 0 //defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-	if(result==C4JStorage::EMessage_ResultAccept)
-	{
-		if(!ProfileManager.IsSignedInLive(iPad))
-		{
-			// you're not signed in to PSN!
-
-		}
-		else
-		{
-			// 4J-PB - need to check this user can access the store
-			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
-			if(bContentRestricted)
-			{
-				UINT uiIDA[1];
-				uiIDA[0]=IDS_CONFIRM_OK;
-				ui.RequestAlertMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, iPad);
-			}
-			else
-			{
-				// need to get info on the pack to see if the user has already downloaded it
-				TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
-
-				// retrieve the store name for the skin pack
-				DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack();
-				const char *pchPackName=wstringtofilename(pDLCPack->getName());
-				app.DebugPrintf("Texture Pack - %s\n",pchPackName);
-				SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);
-
-				if(pSONYDLCInfo!=nullptr)
-				{
-					char chName[42];
-					char chSkuID[SCE_NP_COMMERCE2_SKU_ID_LEN];
-
-					memset(chSkuID,0,SCE_NP_COMMERCE2_SKU_ID_LEN);
-					// find the info on the skin pack
-					// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
-					// So we assume the first sku for the product is the one we want
-#ifdef __ORBIS__
-					sprintf(chName,"%s",pSONYDLCInfo->chDLCKeyname);
-#else
-					sprintf(chName,"%s-%s",app.GetCommerceCategory(),pSONYDLCInfo->chDLCKeyname);
-#endif
-					app.GetDLCSkuIDFromProductList(chName,chSkuID);
-					// 4J-PB - need to check for an empty store
-#if defined __ORBIS__ || defined __PSVITA__ || defined __PS3__
-					if(app.CheckForEmptyStore(iPad)==false)
-#endif
-					{
-						if(app.DLCAlreadyPurchased(chSkuID))
-						{
-							app.DownloadAlreadyPurchased(chSkuID);
-						}
-						else
-						{
-							app.Checkout(chSkuID);
-						}
-					}
-				}
-			}
-		}
-	}
-#endif		//
-
-#ifdef _XBOX_ONE
-	if(result==C4JStorage::EMessage_ResultAccept)
-	{
-		if(ProfileManager.IsSignedIn(iPad))
-		{
-			if (ProfileManager.IsSignedInLive(iPad))
-			{
-				TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-				// get the dlc texture pack
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
-
-				DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();
-
-				DLC_INFO *pDLCInfo=app.GetDLCInfoForProductName((WCHAR *)pDLCPack->getName().c_str());
-
-				StorageManager.InstallOffer(1,(WCHAR *)pDLCInfo->wsProductId.c_str(),nullptr,nullptr);
-
-				// the license change coming in when the offer has been installed will cause this scene to refresh
-			}
-			else
-			{
-				// 4J-JEV: Fix for XB1: #165863 - XR-074: Compliance: With no active network connection user is unable to convert from Trial to Full texture pack and is not messaged why.
-				UINT uiIDA[1] = { IDS_CONFIRM_OK };
-				ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad);
-			}
-		}
-	}
-
-#endif
-#ifdef _XBOX
-
-	CMinecraftApp* pClass = (CMinecraftApp*)pParam;
-
-	TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-	// get the dlc texture pack
-	DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
-	ULONGLONG ullIndexA[1];
-
-	// Need to get the parent packs id, since this may be one of many child packs with their own ids
-	app.GetDLCFullOfferIDForPackID(pDLCTexPack->getDLCParentPackId(),&ullIndexA[0]);
-
-	if(result==C4JStorage::EMessage_ResultAccept)
-	{
-		if(ProfileManager.IsSignedIn(iPad))
-		{
-			// need to allow downloads here, or the player would need to quit the game to let the download of a texture pack happen. This might affect the network traffic, since the download could take all the bandwidth...
-			XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
-
-			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
-		}
-	}
-	else
-	{
-		TelemetryManager->RecordUpsellResponded(iPad, eSet_UpsellID_Texture_DLC, ( ullIndexA[0] & 0xFFFFFFFF ), eSen_UpsellOutcome_Declined);
-	}
-#endif
 	return 0;
 }
 
@@ -6377,37 +5838,6 @@ int CMinecraftApp::ExitAndJoinFromInviteAndSaveReturned(void *pParam,int iPad,C4
 	{
 		INT saveOrCheckpointId = 0;
 
-		// Check they have the full texture pack if they are using one
-		// 4J-PB - Is the player trying to save but they are using a trial texturepack ?
-		if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
-		{
-			TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-
-			DLCPack * pDLCPack=tPack->getDLCPack();
-			if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" ))
-			{
-				// upsell
-				// get the dlc texture pack
-
-#ifdef _XBOX
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
-				ULONGLONG ullOfferID_Full;
-				app.GetDLCFullOfferIDForPackID(pDLCTexPack->getDLCParentPackId(),&ullOfferID_Full);
-
-				// tell sentient about the upsell of the full version of the skin pack
-				TelemetryManager->RecordUpsellPresented(iPad, eSet_UpsellID_Texture_DLC, ullOfferID_Full & 0xFFFFFFFF);
-#endif
-
-				UINT uiIDA[2];
-				uiIDA[0]=IDS_CONFIRM_OK;
-				uiIDA[1]=IDS_CONFIRM_CANCEL;
-
-				// Give the player a warning about the trial version of the texture pack
-				ui.RequestErrorMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT, uiIDA, 2, iPad,&CMinecraftApp::WarningTrialTexturePackReturned,nullptr);
-
-				return S_OK;
-			}
-		}
 		//bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
 		//SentientManager.RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), saveOrCheckpointId);
 		MinecraftServer::getInstance()->setSaveOnExit( true );
@@ -10323,7 +9753,7 @@ enum ETitleUpdateTexturePacks
 };
 
 #ifdef _WINDOWS64
-wstring titleUpdateTexturePackRoot = L"Data/DLC/";
+wstring titleUpdateTexturePackRoot = L"Assets/DLC/";
 #elif defined(__ORBIS__)
 wstring titleUpdateTexturePackRoot = L"/app0/orbis/CU/DLC/";
 #elif defined(__PSVITA__)