Merge remote-tracking branch 'origin/main' into 8thgenautosave

Fixes black text and newer DLCs crashingReviewed-on: cafeberry/cafeberry#31

Co-authored-by: qloak <realminecart@gmail.com>

.gitea/workflows/release-windows64.yaml

@@ -0,0 +1,114 @@
+name: Build & Release Windows64
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version tag for release (e.g. v1.0.0).'
+        required: true
+        default: ''
+      notes:
+        description: 'URL to notes for release.'
+        required: false
+        default: ''
+
+jobs:
+  validate:
+    runs-on: windows-2022
+    steps:
+      - name: Validate version format
+        run: |
+          if (-not ("${{ inputs.version }}" -match '^v\d+\.\d+\.\d+[a-zA-Z0-9.-]*$')) {
+            Write-Error "Version '${{ inputs.version }}' doesn't match expected format (e.g. v1.0.0)"
+            exit 1
+          }
+
+  build:
+    needs: validate
+    strategy:
+      matrix:
+        configuration: [ContentPackage]
+        platform: [Windows64]
+        include:
+        - platform: Windows64
+          sdk_label: windows-2022 # str1k3r - can run on any runner
+
+    runs-on: [windows-2022, "${{ matrix.sdk_label }}"]
+
+    steps:
+      - name: Checkout Repository
+        uses: https://github.com/actions/checkout@v4
+        with:
+          fetch-depth: 1
+          clean: false
+          lfs: false
+          submodules: true
+
+      - name: Build Cafeberry
+        run: |
+          & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
+            /p:Configuration=${{ matrix.configuration }} `
+            /p:Platform=${{ matrix.platform }} `
+            /m
+
+      - name: Zip Build
+        run: |
+            7z a -r "LCEWindows64.zip" "./x64/${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.ilk" "-x!*.lib" "-x!*.exp"
+
+      - name: Stage artifacts
+        run: |
+          New-Item -ItemType Directory -Force -Path staging
+          Copy-Item "LCE${{ matrix.platform }}.zip" staging/
+          Copy-Item "./x64/${{ matrix.configuration }}/Minecraft.Client.exe" staging/
+
+      - name: Upload artifacts
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
+        with:
+          name: build-${{ matrix.platform }}
+          path: staging/*
+          compression-level: 0
+
+  release:
+    needs: build
+    runs-on: windows-2022
+    steps:
+      - name: Download all build artifacts
+        uses: https://github.com/christopherHX/gitea-download-artifact@v4
+        with:
+          path: downloaded
+
+      - name: Fetch release notes
+        id: notes
+        run: |
+          $notesSource = "${{ inputs.notes }}"
+          $fallback = "## Cafeberry`n`n### Whoever made this release forgot to put notes, sorry!"
+
+          if ($notesSource -match '^https?://') {
+            try {
+              $body = (Invoke-WebRequest -Uri $notesSource -UseBasicParsing).Content
+              if ([string]::IsNullOrWhiteSpace($body)) { $body = $fallback }
+            } catch {
+              $body = $fallback
+            }
+          } else {
+            $body = $fallback
+          }
+
+          $delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))"
+          $content = "description<<$delimiter`n$body`n$delimiter`n"
+
+          $utf8NoBom = New-Object System.Text.UTF8Encoding($false)
+          [System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, $content, $utf8NoBom)
+
+      - name: Publish Release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          name: ${{ inputs.version }}
+          server_url: ${{ gitea.server_url }}
+          repository: ${{ gitea.repository }}
+          token: ${{ gitea.token }}
+          tag_name: ${{ inputs.version }}
+          prerelease: false
+          verbose: true
+          files: downloaded/**/*
+          body: ${{ steps.notes.outputs.description }}

.gitea/workflows/release.yaml

@@ -45,11 +45,12 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: https://github.com/actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
           clean: false
           lfs: false
+          submodules: recursive
 
       - name: Build Cafeberry
         run: |

.gitignore

@@ -28,6 +28,10 @@
 /Minecraft.Client/PS3/SPU_Tasks/*/Release
 /Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
 
+# Xbox 360 XZP & XURs
+Minecraft.Client/XboxMedia/XZP
+Minecraft.Client/Common/Media/XURs
+
 # Misc
 *.ppu.o
 *.pkg

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "Minecraft.Client/Windows64/4JLibs"]
 	path = Minecraft.Client/Windows64/4JLibs
-	url = https://gitea.str1k3r.xyz/pieeebot/Cafeberry-4JLibs
+	url = https://gitea.str1k3r.xyz/cafeberry/4JLibs.git
 	ignore = untracked
 	branch = main

Minecraft.Client/ClientConnection.cpp

@@ -1784,10 +1784,13 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 		app.SetGameHostOption(eGameHostOption_All,packet->m_serverSettings);
 
 		// 4J-PB - if we go straight in from the menus via an invite, we won't have the DLC info
+		//str1k3r - TMS only exists on Xbox platforms therefore, we only need this on Xbox platforms.
+#if defined(_DURANGO) || defined(_XBOX)
 		if(app.GetTMSGlobalFileListRead()==false)
 		{
 			app.SetTMSAction(ProfileManager.GetPrimaryPad(),eTMSAction_TMSPP_RetrieveFiles_RunPlayGame);
 		}
+#endif
 	}
 
 #ifdef _XBOX
@@ -3614,7 +3617,7 @@ int ClientConnection::HostDisconnectReturned(void *pParam,int iPad,C4JStorage::E
 		}
 	}
 
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 	// Give the player the option to save their game
 	// does the save exist?
 	bool bSaveExists;
@@ -3646,7 +3649,7 @@ int ClientConnection::HostDisconnectReturned(void *pParam,int iPad,C4JStorage::E
 	else
 #endif
 	{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 				StorageManager.SetSaveDisabled(false);
 #endif
 		MinecraftServer::getInstance()->setSaveOnExit( true );
@@ -3665,7 +3668,7 @@ int ClientConnection::ExitGameAndSaveReturned(void *pParam,int iPad,C4JStorage::
 		//INT saveOrCheckpointId = 0;
 		//bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
 		//SentientManager.RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), saveOrCheckpointId);
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 				StorageManager.SetSaveDisabled(false);
 #endif
 		MinecraftServer::getInstance()->setSaveOnExit( true );

Minecraft.Client/Common/App_enums.h

@@ -875,7 +875,8 @@ enum EControllerActions
 	MINECRAFT_ACTION_SPAWN_CREEPER,
 	MINECRAFT_ACTION_CHANGE_SKIN,
 	MINECRAFT_ACTION_FLY_TOGGLE,
-	MINECRAFT_ACTION_RENDER_DEBUG
+	MINECRAFT_ACTION_RENDER_DEBUG,
+	MINECRAFT_ACTION_RENDER_DEBUG_SCREEN
 };
 
 enum eMCLang

Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1

@@ -59,7 +59,7 @@ $fileCopies = @(
 )
 
 foreach ($copy in $fileCopies) {
-    $src = Join-Path $ProjectDir $copy.Source
+    $src = $copy.Source
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force

Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1

@@ -22,8 +22,7 @@ $folderCopies = @(
     @{ Source = "music";                Dest = "music" },
     @{ Source = "Common\res";      		Dest = "Common\res" },
     @{ Source = "Common\Media";    		Dest = "Common\Media" },
-    @{ Source = "DurangoMedia";    		Dest = "Windows64Media" },
-    @{ Source = "Windows64Media";  		Dest = "Windows64Media" },
+    @{ Source = "Windows64Media\DLC";  	Dest = "Windows64Media\DLC" },
 	@{ Source = "Windows64Media\Sound";	Dest = "Windows64Media\Sound" },
 	#@{ Source = "PSVita\Tutorial"; 	Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
 	@{ Source = "Windows64\Miles\lib\redist64"; Dest = "Windows64\redist64" }
@@ -47,7 +46,7 @@ foreach ($copy in $folderCopies) {
 $fileCopies = @(
     @{ Source = Join-Path $ProjectDir   "Windows64\4JLibs\4J_Input\Windows64\vendor\SDL\lib\x64\SDL3.dll"; Dest = "SDL3.dll" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\Windows64\mss64.dll"; Dest = "mss64.dll" },
-	@{ Source = "Windows64\redist64\iggy_w64.dll"; Dest = "iggy_w64.dll" }
+	@{ Source = "Windows64\Iggy\lib\redist64\iggy_w64.dll"; Dest = "iggy_w64.dll" }
 )
 
 foreach ($copy in $fileCopies) {

Minecraft.Client/Common/Consoles_App.cpp

@@ -766,6 +766,8 @@ void CMinecraftApp::InitGameSettings()
 		// 4J-PB - adding in for Windows & PS3 to set the defaults for the joypad
 #if defined _WINDOWS64// || defined __PSVITA__
 		C_4JProfile::PROFILESETTINGS *pProfileSettings=ProfileManager.GetDashboardProfileSettings(i);
+		//str1k3r - Temporary
+		app.SetGameHostOption(eGameHostOption_DisableSaving, 0);
 		// clear this for now - it will come from reading the system values
 		memset(pProfileSettings,0,sizeof(C_4JProfile::PROFILESETTINGS));
 		SetDefaultOptions(pProfileSettings,i);
@@ -2386,7 +2388,7 @@ void CMinecraftApp::ClearGameSettingsChangedFlag(int iPad)
 // Remove the debug settings in the content package build
 //
 ////////////////////////////
-#ifdef _DEBUG_MENUS_ENABLED
+#ifndef _DEBUG_MENUS_ENABLED
 unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
 {
 	return 0;
@@ -2399,9 +2401,7 @@ void CMinecraftApp::SetGameSettingsDebugMask(int iPad, unsigned int uiVal)
 void CMinecraftApp::ActionDebugMask(int iPad,bool bSetAllClear)
 {
 }
-
 #else
-
 unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
 {
 	if(iPad==-1)
@@ -2780,7 +2780,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					app.SetAutosaveTimerTime();
 					SetAction(i,eAppAction_Idle);
 
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 					app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_AutoSaveGame);
 
 					if(app.GetGameHostOption(eGameHostOption_DisableSaving)) StorageManager.SetSaveDisabled(true);
@@ -3567,7 +3567,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					SetAction(i,eAppAction_Idle);
 					// Check the player really wants to do this
 
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 					// Show save option is saves ARE disabled
 					if(ProfileManager.IsFullVersion() && StorageManager.GetSaveDisabled() && i==ProfileManager.GetPrimaryPad() && g_NetworkManager.IsHost() && GetGameStarted() )
 					{			
@@ -3844,9 +3844,9 @@ void CMinecraftApp::HandleXuiActions(void)
 			case eAppAction_SetDefaultOptions:
 				SetAction(i,eAppAction_Idle);
 #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)
-				SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);		
+					SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);		
 #else
-				SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);		
+					SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);		
 #endif
 
 				// if the profile data has been changed, then force a profile write
@@ -5936,7 +5936,7 @@ int CMinecraftApp::ExitAndJoinFromInviteSaveDialogReturned(void *pParam,int iPad
 			else
 #endif
 			{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 				StorageManager.SetSaveDisabled(false);
 #endif
 				MinecraftServer::getInstance()->setSaveOnExit( true );
@@ -6139,7 +6139,7 @@ int CMinecraftApp::ExitAndJoinFromInviteDeclineSaveReturned(void *pParam,int iPa
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
 	{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 		StorageManager.SetSaveDisabled(false);
 #endif
 		MinecraftServer::getInstance()->setSaveOnExit( false );
@@ -6455,7 +6455,7 @@ wstring CMinecraftApp::FormatHTMLString(int iPad, const wstring &desc, int shado
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_DOWN*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_DOWN		) );
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_RIGHT*}",	GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_RIGHT		) );	
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_LEFT*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_LEFT		) );
-#if defined _XBOX_ONE || defined __PSVITA__
+#if defined _XBOX_ONE || defined __PSVITA__ || defined _WINDOWS64
 	text = replaceAll(text, L"{*CONTROLLER_VK_START*}",			GetVKReplacement(VK_PAD_START		) );
 	text = replaceAll(text, L"{*CONTROLLER_VK_BACK*}",			GetVKReplacement(VK_PAD_BACK		) );
 #endif
@@ -6578,8 +6578,16 @@ wstring CMinecraftApp::GetActionReplacement(int iPad, unsigned char ucAction)
 #ifdef __PS3__
 	int size = 30;
 #elif defined _WIN64
-	int size = 45;
-	if(ui.getScreenWidth() < 1920) size = 30;
+	int size;
+
+	if(ui.getScreenWidth() >= 1920)
+	{
+		size = 45;
+	}
+	else
+	{
+		size = 30;
+	}
 #else
 	int size = 45;
 #endif
@@ -6691,7 +6699,7 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
 	case VK_PAD_RTHUMB_DOWNLEFT :
 		replacement = L"ButtonRightStick";
 		break;
-#if defined _XBOX_ONE || defined __PSVITA__
+#if defined _XBOX_ONE || defined __PSVITA__ || defined _WINDOWS64
 	case VK_PAD_START:
 		replacement = L"ButtonStart";
 		break;
@@ -6707,8 +6715,16 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
 #ifdef __PS3__
 	int size = 30;
 #elif defined _WIN64
-	int size = 45;
-	if(ui.getScreenWidth() < 1920) size = 30;
+	int size;
+
+	if(ui.getScreenWidth() >= 1920)
+	{
+		size = 45;
+	}
+	else
+	{
+		size = 30;
+	}
 #else
 	int size = 45;
 #endif
@@ -6738,8 +6754,16 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
 #ifdef __PS3__
 	int size = 22;
 #elif defined _WIN64
-	int size = 33;
-	if(ui.getScreenWidth() < 1920) size = 22;
+	int size; 
+
+	if(ui.getScreenWidth() >= 1920)
+	{
+		int size = 33;
+	}
+	else
+	{
+		int size = 22;
+	}
 #else
 	int size = 33;
 #endif
@@ -9460,7 +9484,7 @@ int CMinecraftApp::GetDLCInfoTexturesOffersCount()
 // AUTOSAVE
 void CMinecraftApp::SetAutosaveTimerTime(void)				
 {
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 	m_uiAutosaveTimer= GetTickCount()+1000*60;
 #else
 	m_uiAutosaveTimer= GetTickCount()+GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_Autosave)*1000*60*15;

Minecraft.Client/Common/Consoles_App.h

@@ -851,15 +851,6 @@ public:
 	static DWORD getSkinIdFromPath(const wstring &skin);
 	static wstring getSkinPathFromId(DWORD skinId);
 
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile)=0;
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt)=0;
-	virtual void FreeLocalTMSFiles(eTMSFileType eType)=0;
-	virtual int GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT)=0;
-
-	virtual bool GetTMSGlobalFileListRead() { return true;}
-	virtual bool GetTMSDLCInfoRead() { return true;}
-	virtual bool GetTMSXUIDsFileRead() { return true;}
-
 	bool GetBanListRead(int iPad) { return m_bRead_BannedListA[iPad];}
 	void SetBanListRead(int iPad,bool bVal) { m_bRead_BannedListA[iPad]=bVal;}
 	void ClearBanList(int iPad) { BannedListA[iPad].pBannedList=NULL;BannedListA[iPad].dwBytes=0;}

Minecraft.Client/Common/DLC/DLCManager.cpp

@@ -406,6 +406,12 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
 	unsigned int uiVersion=*(unsigned int *)pbData;
 	uiCurrentByte+=sizeof(int);
 
+	if(uiVersion > CURRENT_DLC_VERSION_NUM)
+	{
+		if(pbData!=NULL) delete [] pbData;
+		app.DebugPrintf("DLC version of %d is newer than this build can read (%d)\n", uiVersion, CURRENT_DLC_VERSION_NUM);
+		return false;
+	}
 	if(uiVersion < CURRENT_DLC_VERSION_NUM)
 	{
 		if(pbData!=NULL) delete [] pbData;
@@ -613,6 +619,11 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
 	unsigned int uiVersion=*(unsigned int *)pbData;
 	uiCurrentByte+=sizeof(int);
 
+	if(uiVersion > CURRENT_DLC_VERSION_NUM)
+	{
+		app.DebugPrintf("DLC version of %d is newer than this build can read (%d)\n", uiVersion, CURRENT_DLC_VERSION_NUM);
+		return 0;
+	}
 	if(uiVersion < CURRENT_DLC_VERSION_NUM)
 	{
 		app.DebugPrintf("DLC version of %d is too old to be read\n", uiVersion);

Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp

@@ -94,7 +94,7 @@ int IUIScene_PauseMenu::ExitGameSaveDialogReturned(void *pParam,int iPad,C4JStor
 			}
 			else
 			{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 				StorageManager.SetSaveDisabled(false);
 #endif
 				MinecraftServer::getInstance()->setSaveOnExit( true );
@@ -133,7 +133,7 @@ int IUIScene_PauseMenu::ExitGameAndSaveReturned(void *pParam,int iPad,C4JStorage
 		//INT saveOrCheckpointId = 0;
 		//bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
 		//SentientManager.RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), saveOrCheckpointId);
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 		StorageManager.SetSaveDisabled(false);
 #endif
 		if(pScene) pScene->SetIgnoreInput(true);
@@ -178,7 +178,7 @@ int IUIScene_PauseMenu::ExitGameDeclineSaveReturned(void *pParam,int iPad,C4JSto
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
 	{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 		// Don't do this here, as it will still try and save some things even though it shouldn't!
 		//StorageManager.SetSaveDisabled(false);
 #endif
@@ -381,7 +381,7 @@ int IUIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
 
 		if(!MinecraftServer::serverHalted() && !app.GetChangingSessionType() ) app.SetGameStarted(true);
 
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 		if(app.GetGameHostOption(eGameHostOption_DisableSaving)) StorageManager.SetSaveDisabled(true);
 #endif
 	}
@@ -647,7 +647,7 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	app.SetChangingSessionType(false);
 	app.SetReallyChangingSessionType(false);
 
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 	// Make sure we don't think saving is disabled in the menus
 	StorageManager.SetSaveDisabled(false);
 #endif
@@ -659,7 +659,7 @@ int IUIScene_PauseMenu::SaveGameDialogReturned(void *pParam,int iPad,C4JStorage:
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
 	{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 		UINT uiIDA[2];
 		uiIDA[0]=IDS_CONFIRM_CANCEL;
 		uiIDA[1]=IDS_CONFIRM_OK;

Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp

@@ -25,6 +25,8 @@ UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void *initD
 	m_labelPressStart.init( (UIString) [] { return replaceAll(app.GetString(IDS_PRESS_X_TO_JOIN), L"{*CONTROLLER_VK_A*}", app.GetVKReplacement(VK_PAD_A) ); });
 #elif defined _XBOX_ONE
 	m_labelPressStart.init( (UIString) [] { return replaceAll(app.GetString(IDS_PRESS_START_TO_JOIN), L"{*CONTROLLER_VK_START*}", app.GetVKReplacement(VK_PAD_START) ); });
+#elif defined _WINDOWS64
+	m_labelPressStart.init( (UIString) [] { return replaceAll(app.GetString(IDS_PRESS_START_TO_JOIN), L"{*CONTROLLER_VK_START*}", app.GetVKReplacement(VK_PAD_START) ); });
 #else
 	m_labelPressStart.init(IDS_PRESS_START_TO_JOIN);
 #endif

Minecraft.Client/Common/UI/UIController.cpp

@@ -2406,7 +2406,7 @@ void UIController::ShowAutosaveCountdownTimer(bool show)
 
 void UIController::UpdateAutosaveCountdownTimer(unsigned int uiSeconds)
 {
-#if !(defined(_XBOX_ONE) || defined(__ORBIS__))
+#if !(defined(_XBOX_ONE) || defined(__ORBIS__) ||defined(_WINDOWS64))
 	WCHAR wcAutosaveCountdown[100]; 
 	swprintf( wcAutosaveCountdown, 100, app.GetString(IDS_AUTOSAVE_COUNTDOWN),uiSeconds);
 	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(wcAutosaveCountdown);

Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp

@@ -597,7 +597,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 			}
 		}
 	}
-#if defined _XBOX_ONE || defined __ORBIS__
+#if defined _XBOX_ONE || defined __ORBIS__ || defined(_WINDOWS64)
 	app.SetGameHostOption(eGameHostOption_DisableSaving, m_MoreOptionsParams.bDisableSaving?1:0);
 	StorageManager.SetSaveDisabled(m_MoreOptionsParams.bDisableSaving);
 #endif

Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp

@@ -110,7 +110,7 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId)
 					}
 					TelemetryManager->RecordLevelExit(m_iPad, eSen_LevelExitStatus_Failed);
 					
-#if defined (_XBOX_ONE) || defined(__ORBIS__)
+#if defined (_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 					if(g_NetworkManager.IsHost() && StorageManager.GetSaveDisabled())
 					{
 						uiIDA[0]=IDS_CONFIRM_CANCEL;

Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp

@@ -866,7 +866,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 				ui.RequestAlertMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_USING_TRIAL_TEXUREPACK_WARNING, uiIDA, 2, m_iPad,&TrialTexturePackWarningReturned,this);
 #endif
 
-#if defined _XBOX_ONE || defined __ORBIS__
+#if defined _XBOX_ONE || defined __ORBIS__ || defined(_WINDOWS64)
 				StorageManager.SetSaveDisabled(true);
 #endif
 				return;
@@ -875,7 +875,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 	}
 	app.SetGameHostOption(eGameHostOption_WasntSaveOwner, (!m_bIsSaveOwner)); 
 
-#if defined _XBOX_ONE || defined __ORBIS__
+#if defined _XBOX_ONE || defined __ORBIS__ || defined(_WINDOWS64)
 	app.SetGameHostOption(eGameHostOption_DisableSaving, m_MoreOptionsParams.bDisableSaving?1:0);
 	StorageManager.SetSaveDisabled(m_MoreOptionsParams.bDisableSaving);
 

Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp

@@ -38,7 +38,7 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void *initData, UILayer *parentLa
 #else
 	m_buttons[BUTTON_PAUSE_ACHIEVEMENTS].init(app.GetString(IDS_ACHIEVEMENTS),BUTTON_PAUSE_ACHIEVEMENTS);
 #endif
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 	m_bTrialTexturePack = false;
 	if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
 	{
@@ -149,7 +149,7 @@ void UIScene_PauseMenu::tick()
 #endif
 
 
-#if defined _XBOX_ONE || defined __ORBIS__
+#if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64
 	if(!m_bTrialTexturePack && m_savesDisabled != (app.GetGameHostOption(eGameHostOption_DisableSaving) != 0) && ProfileManager.GetPrimaryPad() == m_iPad )
 	{
 		// We show the save button if saves are disabled as this lets us show a prompt to enable them (via purchasing a texture pack)
@@ -239,7 +239,7 @@ void UIScene_PauseMenu::updateComponents()
 
 void UIScene_PauseMenu::handlePreReload()
 {
-#if defined _XBOX_ONE || defined __ORBIS__
+#if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64
 	if(ProfileManager.GetPrimaryPad() == m_iPad)
 	{
 		// 4J-TomK - check for all possible labels being fed into BUTTON_PAUSE_SAVEGAME (Bug 163775)
@@ -257,7 +257,7 @@ void UIScene_PauseMenu::handleReload()
 	updateTooltips();
 	updateControlsVisibility();	
 
-#if defined _XBOX_ONE || defined __ORBIS__
+#if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64
 	if(ProfileManager.GetPrimaryPad() == m_iPad)
 	{
 		// We show the save button if saves are disabled as this lets us show a prompt to enable them (via purchasing a texture pack)
@@ -659,7 +659,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
 					}
 
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 					uiIDA[0]=IDS_CONFIRM_CANCEL;
 					uiIDA[1]=IDS_CONFIRM_OK;
 
@@ -893,7 +893,7 @@ void UIScene_PauseMenu::PerformActionSaveGame()
 	else
 #endif
 	{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 		if(!m_savesDisabled)
 		{
 			UINT uiIDA[2];
@@ -913,7 +913,7 @@ void UIScene_PauseMenu::PerformActionSaveGame()
 			}
 			else
 			{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 				UINT uiIDA[2];
 				uiIDA[0]=IDS_CONFIRM_CANCEL;
 				uiIDA[1]=IDS_CONFIRM_OK;
@@ -1402,7 +1402,7 @@ int UIScene_PauseMenu::ExitGameSaveDialogReturned(void *pParam,int iPad,C4JStora
 			}
 			else
 			{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 				StorageManager.SetSaveDisabled(false);
 #endif
 				MinecraftServer::getInstance()->setSaveOnExit( true );

Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp

@@ -68,7 +68,7 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad, void *initDat
 	m_sliderAutosave.setAllPossibleLabels(9,autosaveLabels);
 	m_sliderAutosave.init(autosaveLabels[ucValue],eControl_Autosave,0,8,ucValue);
 
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 	removeControl(&m_sliderAutosave,true);
 #endif
 
@@ -291,7 +291,7 @@ void UIScene_SettingsOptionsMenu::handleReload()
 	m_sliderAutosave.setAllPossibleLabels(9,autosaveLabels);
 	m_sliderAutosave.init(autosaveLabels[ucValue],eControl_Autosave,0,8,ucValue);
 
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 	removeControl(&m_sliderAutosave,true);
 #endif
 

Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp

@@ -454,12 +454,7 @@ void CXuiSceneAbstractContainer::SetPointerText(vector<HtmlString> *description,
 		return;
 	}
 
-	wstring combinedText;
-	for(size_t i = 0; i < description->size(); ++i)
-	{
-		combinedText += (*description)[i].text;
-		if(i + 1 < description->size()) combinedText += L"\n";
-	}
+	wstring combinedText = HtmlString::Compose(description);
 
 	vector<wstring> unformattedStrings;
 	for(size_t i = 0; i < description->size(); ++i)

Minecraft.Client/Extrax64Stubs.cpp

@@ -34,12 +34,9 @@
 #include <perf.h>
 #endif
 
-#if !defined(__PS3__) && !defined(__ORBIS__) && !defined(__PSVITA__)
 #ifdef _WINDOWS64
-//C4JStorage StorageManager;
 C_4JProfile ProfileManager;
 #endif
-#endif // __PS3__
 CSentientManager SentientManager;
 CXuiStringTable StringTable;
 

Minecraft.Client/Minecraft.Client.vcxproj

@@ -519,8 +519,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
-    <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
-    <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
+    <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    <ImageXexOutput>$(SolutionDir)X360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
     <IntDir>X360_$(Configuration)\</IntDir>
@@ -528,7 +528,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
-    <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
+    <ImageXexOutput>$(SolutionDir)X360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
     <IntDir>X360_$(Configuration)\</IntDir>
@@ -536,7 +536,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
-    <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
+    <ImageXexOutput>$(SolutionDir)X360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
     <IntDir>X360_$(Configuration)\</IntDir>
@@ -544,7 +544,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
-    <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
+    <ImageXexOutput>$(SolutionDir)X360_$(Configuration)\$(ProjectName).xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
     <IntDir>X360_$(Configuration)\</IntDir>
@@ -1144,7 +1144,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>_TU_BUILD;_FINAL_BUILD;_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;_CONTENT_PACKAGE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_FINAL_BUILD;_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;_CONTENT_PACKAGE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
@@ -33056,6 +33056,10 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
     </Library>
     <Library Include="Orbis\4JLibs\Libs\4J_Storage_d.a">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
@@ -33076,6 +33080,10 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
     </Library>
     <Library Include="Orbis\4JLibs\Libs\4J_Storage_r.a">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
@@ -33096,6 +33104,10 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
     </Library>
     <Library Include="Orbis\Iggy\lib\libiggyperfmon_orbis.a">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
@@ -34439,6 +34451,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
     </Library>
     <Library Include="Windows64\4JLibs\libs\4J_Input_d.lib">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -34477,6 +34495,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
     </Library>
     <Library Include="Windows64\4JLibs\libs\4J_Profile_r.lib">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -34515,6 +34539,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
     </Library>
     <Library Include="Windows64\4JLibs\libs\4J_Profile_d.lib">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -34553,6 +34583,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
     </Library>
     <Library Include="Windows64\4JLibs\libs\4J_Render_r.lib">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -34642,6 +34678,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
     </Library>
     <Library Include="Windows64\4JLibs\libs\4J_Storage_r.lib">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>

Minecraft.Client/Minecraft.cpp

@@ -1407,7 +1407,8 @@ void Minecraft::run_middle()
 						if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_RIGHT))			localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_CHANGE_SKIN;
 						if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_UP))				localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_FLY_TOGGLE;
 						if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_DOWN))			localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG;
-						if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_LEFT))			localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_SPAWN_CREEPER;
+						//if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_LEFT))			localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_SPAWN_CREEPER;
+						if(InputManager.ButtonPressed(i, MINECRAFT_ACTION_DPAD_LEFT))			localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG_SCREEN;
 					}
 					else
 #endif
@@ -3475,8 +3476,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 				if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_RENDER_DEBUG)) )
 				{
 #ifndef _CONTENT_PACKAGE
-
-					options->renderDebug = !options->renderDebug;
 #ifdef _XBOX
 					app.EnableDebugOverlay(options->renderDebug,iPad);
 #else
@@ -3486,6 +3485,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 #endif
 				}
 
+				if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_RENDER_DEBUG_SCREEN)) )
+				{
+					options->renderDebug = !options->renderDebug;
+				}
+
+#if 0 //str1k3r - replaced this DPAD bind for opening the F3 Debug Menu
 				if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_SPAWN_CREEPER)) && app.GetMobsDontAttackEnabled())
 				{
 					//shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(Creeper::_class->newInstance( level ));
@@ -3494,6 +3499,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 					mob->moveTo(player->x+1, player->y, player->z+1, level->random->nextFloat() * 360, 0);
 					level->addEntity(mob);
 				}
+#endif
 			}
 
 			if( (player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_FLY_TOGGLE)) )

Minecraft.Client/MinecraftServer.cpp

@@ -998,7 +998,7 @@ void MinecraftServer::stopServer(bool didInit)
 	if((m_bPrimaryPlayerSignedOut==false) && ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad()))
 #endif
 	{
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 		// Always save on exit! Except if saves are disabled.
 		if(!saveOnExitAnswered()) m_saveOnExit = true;
 #endif
@@ -1354,7 +1354,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 				switch(eAction)
 				{
 				case eXuiServerAction_AutoSaveGame:
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 					{
 						PIXBeginNamedEvent(0,"Autosave");
 

Minecraft.Client/Orbis/Orbis_App.cpp

@@ -279,12 +279,6 @@ void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize)
 
 }
 
-int CConsoleMinecraftApp::GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT)
-{
-	return -1;
-}
-
-
 int CConsoleMinecraftApp::LoadLocalDLCImages()
 {
 	// 4J-PB - Any local graphic files for the Minecraft Store?
@@ -352,25 +346,6 @@ int CConsoleMinecraftApp::LoadLocalDLCImage(SONYDLC *pDLCInfo)
 	return 0;
 }
 
-int CConsoleMinecraftApp::LoadLocalTMSFile(char *chTMSFile)
-{
-	return -1;
-}
-int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile)
-{
-	return -1;
-}
-
-int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt)
-{
-	return -1;
-}
-
-void CConsoleMinecraftApp::FreeLocalTMSFiles(eTMSFileType eType)
-{
-
-}
-
 void CConsoleMinecraftApp::TemporaryCreateGameStart()
 {
 	////////////////////////////////////////////////////////////////////////////////////////////// From CScene_Main::OnInit

Minecraft.Client/Orbis/Orbis_App.h

@@ -73,16 +73,10 @@ public:
 	virtual void ReleaseSaveThumbnail();
 	virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize);
 
-	int LoadLocalTMSFile(char *chTMSFile);
 	int LoadLocalDLCImage(SONYDLC *pDLCInfo);
 	int LoadLocalDLCImages();
 	void FreeLocalDLCImages();
 
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile);
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt);
-	virtual void FreeLocalTMSFiles(eTMSFileType eType);
-	virtual int GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT=eFileExtensionType_PNG);
-
 	// BANNED LEVEL LIST
 	virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false) {}
 

Minecraft.Client/PS3/PS3_App.cpp

@@ -445,27 +445,6 @@ void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize)
 
 }
 
-int CConsoleMinecraftApp::GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT)
-{
-	return -1;
-}
-
-
-int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile)
-{
-	return -1;
-}
-
-int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt)
-{
-	return -1;
-}
-
-void CConsoleMinecraftApp::FreeLocalTMSFiles(eTMSFileType eType)
-{
-
-}
-
 LoadSaveDataThreadParam* LoadSaveFromDisk(const wstring& pathName)
 {	
 	File saveFile(pathName);

Minecraft.Client/PS3/PS3_App.h

@@ -76,13 +76,6 @@ public:
 	// BANNED LEVEL LIST
 	virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false) {}
 
-
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile);
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt);
-
-	virtual void FreeLocalTMSFiles(eTMSFileType eType);
-	virtual int GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT=eFileExtensionType_PNG);
-
 	// CHAT/UGC restriction - MOVED TO THE PROFILE LIB - 			ProfileManager.GetChatAndContentRestrictions
 
 // 	void SetVoiceChatAndUGCRestricted(bool bRestricted);

Minecraft.Client/PSVita/PSVita_App.cpp

@@ -271,27 +271,6 @@ void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize)
 
 }
 
-int CConsoleMinecraftApp::GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT)
-{
-	return -1;
-}
-
-
-int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile)
-{
-	return -1;
-}
-
-int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt)
-{
-	return -1;
-}
-
-void CConsoleMinecraftApp::FreeLocalTMSFiles(eTMSFileType eType)
-{
-
-}
-
 void CConsoleMinecraftApp::TemporaryCreateGameStart()
 {
 	////////////////////////////////////////////////////////////////////////////////////////////// From CScene_Main::OnInit

Minecraft.Client/PSVita/PSVita_App.h

@@ -75,11 +75,6 @@ public:
 	virtual void ReleaseSaveThumbnail();
 	virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize);
 
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile);
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt);
-	virtual void FreeLocalTMSFiles(eTMSFileType eType);
-	virtual int GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT=eFileExtensionType_PNG);
-
 	// BANNED LEVEL LIST
 	virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false) {}
 

Minecraft.Client/ServerLevel.cpp

@@ -983,7 +983,7 @@ void ServerLevel::save(bool force, ProgressListener *progressListener, bool bAut
 
 	if (progressListener != NULL) progressListener->progressStage(IDS_PROGRESS_SAVING_CHUNKS);
 
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 	// Our autosave is a minimal save. All the chunks are saves by the constant save process
 	if(bAutosave)
 	{

Minecraft.Client/StringTable.cpp

@@ -119,9 +119,6 @@ void StringTable::ProcessStringTableData(void)
 	else
 	{
 		app.DebugPrintf("Failed to get language\n");
-#ifdef _DEBUG
-		__debugbreak();
-#endif
 
 		isStatic = false;
 	}

Minecraft.Client/Windows64/Windows64_App.cpp

@@ -66,25 +66,6 @@ void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize)
 {
 }
 
-int CConsoleMinecraftApp::GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT)
-{
-	return -1;
-}
-
-int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile)
-{
-	return -1;
-}
-
-int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt)
-{
-	return -1;
-}
-
-void CConsoleMinecraftApp::FreeLocalTMSFiles(eTMSFileType eType)
-{
-}
-
 std::wstring CConsoleMinecraftApp::UTF8ToWide(const char* utf8)
 {
     int size = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, nullptr, 0);

Minecraft.Client/Windows64/Windows64_App.h

@@ -18,12 +18,6 @@ public:
 	virtual void ReleaseSaveThumbnail();
 	virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize);
 
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile);
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt);
-
-	virtual void FreeLocalTMSFiles(eTMSFileType eType);
-	virtual int GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT=eFileExtensionType_PNG);
-
 	// BANNED LEVEL LIST
 	virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false) {}
 

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -4,6 +4,7 @@
 #include "stdafx.h"
 
 #include <assert.h>
+#include <shellapi.h>
 #include "GameConfig\Minecraft.spa.h"
 #include "..\MinecraftServer.h"
 #include "..\LocalPlayer.h"
@@ -24,10 +25,6 @@
 #include "..\..\Minecraft.World\ThreadName.h"
 #include "..\..\Minecraft.Client\StatsCounter.h"
 #include "..\ConnectScreen.h"
-//#include "Social\SocialManager.h"
-//#include "Leaderboards\LeaderboardManager.h"
-//#include "XUI\XUI_Scene_Container.h"
-//#include "NetworkManager.h"
 #include "..\..\Minecraft.Client\Tesselator.h"
 #include "..\..\Minecraft.Client\Options.h"
 #include "Sentient\SentientManager.h"
@@ -42,12 +39,11 @@
 
 HINSTANCE hMyInst;
 LRESULT CALLBACK DlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
+WINDOWPLACEMENT g_wpPrev = { sizeof(g_wpPrev) };
+
 char chGlobalText[256];
 uint16_t ui16GlobalText[256];
 
-#define THEME_NAME		"584111F70AAAAAAA"
-#define THEME_FILESIZE	2797568
-
 //#define THREE_MB 3145728 // minimum save size (checking for this on a selected device)
 //#define FIVE_MB 5242880 // minimum save size (checking for this on a selected device)
 //#define FIFTY_TWO_MB (1024*1024*52) // Maximum TCR space required for a save (checking for this on a selected device)
@@ -58,29 +54,58 @@ uint16_t ui16GlobalText[256];
 #define NUM_PROFILE_SETTINGS 4
 DWORD dwProfileSettingsA[NUM_PROFILE_VALUES]=
 {
-#ifdef _XBOX
-	XPROFILE_OPTION_CONTROLLER_VIBRATION,
-	XPROFILE_GAMER_YAXIS_INVERSION,
-	XPROFILE_GAMER_CONTROL_SENSITIVITY,
-	XPROFILE_GAMER_ACTION_MOVEMENT_CONTROL,
-	XPROFILE_TITLE_SPECIFIC1,
-#else
 	0,0,0,0,0
-#endif
 };
 
-//-------------------------------------------------------------------------------------
-// Time             Since fAppTime is a float, we need to keep the quadword app time
-//                  as a LARGE_INTEGER so that we don't lose precision after running
-//                  for a long time.
-//-------------------------------------------------------------------------------------
+//str1k3r - request dedicated GPU from AMD and NVIDIA drivers
+extern "C"
+{
+	__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
+	__declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001;
+}
 
+BOOL g_isFullscreen = FALSE;
 BOOL g_bWidescreen = TRUE;
 BOOL g_bResolutionSetByCMD = FALSE;
 
 int g_iScreenWidth = 1920;
 int g_iScreenHeight = 1080;
 
+static Windows64LaunchArgs ParseLaunchArgs()
+{
+	Windows64LaunchArgs args = {};
+	args.resolution = 0;
+
+	int argc = 0;
+	LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+	if (argv == nullptr)
+		return args;
+
+	if (argc > 1 && lstrlenW(argv[1]) == 1)
+	{
+		if (argv[1][0] >= L'1' && argv[1][0] <= L'6')
+			args.resolution = argv[1][0] - L'0';
+	}
+
+	for (int i = 1; i < argc; ++i)
+	{
+		if (_wcsicmp(argv[i], L"-fullscreen") == 0)
+		{
+			args.fullscreen = true;
+		}
+		else if (_wcsicmp(argv[i], L"-resolution") == 0)
+		{
+			if (i + 1 < argc && argv[i + 1][0] >= L'1' && argv[i + 1][0] <= L'6')
+			{
+				args.resolution = argv[++i][0] - L'0';
+			}
+		}
+	}
+
+	LocalFree(argv);
+	return args;
+}
+
 void DefineActions(void)
 {
 	// The app needs to define the actions required, and the possible mappings for these
@@ -624,6 +649,39 @@ void Render()
 	g_pSwapChain->Present( 0, 0 );
 }
 
+//--------------------------------------------------------------------------------------
+// Toggle borderless fullscreen
+// Credits to the smartCMD repo for this
+// This is the proper way to do this therefore we just took it
+//--------------------------------------------------------------------------------------
+void ToggleFullscreen()
+{
+	const DWORD dwStyle = GetWindowLong(g_hWnd, GWL_STYLE);
+	if (!g_isFullscreen)
+	{
+		MONITORINFO mi = { sizeof(mi) };
+		if (GetWindowPlacement(g_hWnd, &g_wpPrev) &&
+			GetMonitorInfo(MonitorFromWindow(g_hWnd, MONITOR_DEFAULTTOPRIMARY), &mi))
+		{
+			SetWindowLong(g_hWnd, GWL_STYLE, dwStyle & ~WS_OVERLAPPEDWINDOW);
+			SetWindowPos(g_hWnd, HWND_TOP,
+				mi.rcMonitor.left, mi.rcMonitor.top,
+				mi.rcMonitor.right - mi.rcMonitor.left,
+				mi.rcMonitor.bottom - mi.rcMonitor.top,
+				SWP_NOOWNERZORDER | SWP_FRAMECHANGED);
+		}
+	}
+	else
+	{
+		SetWindowLong(g_hWnd, GWL_STYLE, dwStyle | WS_OVERLAPPEDWINDOW);
+		SetWindowPlacement(g_hWnd, &g_wpPrev);
+		SetWindowPos(g_hWnd, nullptr, 0, 0, 0, 0,
+			SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_FRAMECHANGED);
+	}
+	g_isFullscreen = !g_isFullscreen;
+}
+
+
 //--------------------------------------------------------------------------------------
 // Clean up the objects we've created
 //--------------------------------------------------------------------------------------
@@ -637,8 +695,6 @@ void CleanupDevice()
 	if( g_pd3dDevice ) g_pd3dDevice->Release();
 }
 
-
-
 int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 					   _In_opt_ HINSTANCE hPrevInstance,
 					   _In_ LPTSTR    lpCmdLine,
@@ -647,44 +703,46 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	UNREFERENCED_PARAMETER(hPrevInstance);
 	UNREFERENCED_PARAMETER(lpCmdLine);
 
-	if(lpCmdLine)
+	Windows64LaunchArgs launchArgs = ParseLaunchArgs();
+
+	if(launchArgs.resolution != 0)
 	{
-		if(lpCmdLine[0] == '1')
+		if(launchArgs.resolution == 1)
 		{
 			// 2160p
 			g_iScreenWidth = 3840;
 			g_iScreenHeight = 2160;
 			g_bResolutionSetByCMD = TRUE;
 		}
-		else if(lpCmdLine[0] == '2')
+		else if(launchArgs.resolution == 2)
 		{
 			// 1440p
 			g_iScreenWidth = 2560;
 			g_iScreenHeight = 1440;
 			g_bResolutionSetByCMD = TRUE;
 		}
-		else if (lpCmdLine[0] == '3')
+		else if (launchArgs.resolution == 3)
 		{
 			// 1080p
 			g_iScreenWidth = 1920;
 			g_iScreenHeight = 1080;
 			g_bResolutionSetByCMD = TRUE;
 		}
-		else if(lpCmdLine[0] == '4')
+		else if(launchArgs.resolution == 4)
 		{
 			// 720p
 			g_iScreenWidth = 1280;
 			g_iScreenHeight = 720;
 			g_bResolutionSetByCMD = TRUE;
 		}
-		else if(lpCmdLine[0] == '5')
+		else if(launchArgs.resolution == 5)
 		{
 			// 480p
 			g_iScreenWidth = 640;
 			g_iScreenHeight = 480;
 			g_bResolutionSetByCMD = TRUE;
 		}
-		else if(lpCmdLine[0] == '6')
+		else if(launchArgs.resolution == 6)
 		{
 			// Vita Native, 544p
 			g_iScreenWidth = 960;
@@ -693,7 +751,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		}
 	}
 
-
 	// Initialize global strings
 	MyRegisterClass(hInstance);
 
@@ -711,6 +768,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		return 0;
 	}
 
+	if(launchArgs.fullscreen)
+	{
+		ToggleFullscreen();
+	}
+
 #if 0
 	// Main message loop
 	MSG msg = {0};
@@ -896,12 +958,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 	app.InitGameSettings();
 
-#if 0
-	//bool bDisplayPauseMenu=false;
-
 	// set the default gamma level
 	float fVal=50.0f*327.68f;
 	RenderManager.UpdateGamma((unsigned short)fVal);
+#if 0
+	//bool bDisplayPauseMenu=false;
 
 	// load any skins
 	//app.AddSkinsToMemoryTextureFiles();
@@ -939,14 +1000,8 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	// Set the default sound levels
 	pMinecraft->options->set(Options::Option::MUSIC,1.0f);
 	pMinecraft->options->set(Options::Option::SOUND,1.0f);
-
-	app.NavigateToScene(XUSER_INDEX_ANY,eUIScene_Intro,&initData);
 #endif
 
-	// Set the default sound levels
-	pMinecraft->options->set(Options::Option::MUSIC,1.0f);
-	pMinecraft->options->set(Options::Option::SOUND,1.0f);
-
 	//app.TemporaryCreateGameStart();
 
 	//Sleep(10000);
@@ -1001,11 +1056,14 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 		app.UpdateTime();
 		PIXBeginNamedEvent(0,"Input manager tick");
-		InputManager.Tick();
-		PIXEndNamedEvent();
-		PIXBeginNamedEvent(0,"Profile manager tick");
-		//		ProfileManager.Tick();
+		if (GetFocus())
+		{
+			InputManager.Tick();
+		}
 		PIXEndNamedEvent();
+		/*PIXBeginNamedEvent(0,"Profile manager tick");
+		ProfileManager.Tick();
+		PIXEndNamedEvent();*/
 		PIXBeginNamedEvent(0,"Storage manager tick");
 		StorageManager.Tick();
 		PIXEndNamedEvent();
@@ -1013,23 +1071,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		RenderManager.Tick();
 		PIXEndNamedEvent();
 
-		// Tick the social networking manager.
-		PIXBeginNamedEvent(0,"Social network manager tick");
-		//		CSocialManager::Instance()->Tick();
-		PIXEndNamedEvent();
-
-		// Tick sentient.
-		PIXBeginNamedEvent(0,"Sentient tick");
-		MemSect(37);
-		//		SentientManager.Tick();
-		MemSect(0);
-		PIXEndNamedEvent();
-
 		PIXBeginNamedEvent(0,"Network manager do work #1");
 		//		g_NetworkManager.DoWork();
 		PIXEndNamedEvent();
 
-		//		LeaderboardManager::Instance()->Tick();
+		// LeaderboardManager::Instance()->Tick();
 		// Render game graphics.
 		if(app.GetGameStarted())
 		{
@@ -1192,6 +1238,18 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 #if 0
 		PIXEndNamedEvent();
 #endif
+		isF11Pressed = (GetAsyncKeyState(VK_F11) & 0x8000) != 0;
+
+		if(isF11Pressed && !wasF11Pressed && GetFocus())
+		{
+			ToggleFullscreen();
+		}
+		else if(isF11Pressed && !wasF11Pressed && GetFocus())
+		{
+			ToggleFullscreen();
+		}
+
+		wasF11Pressed = isF11Pressed;
 
 		// 4J-PB - Update the trial timer display if we are in the trial version
 		if(!ProfileManager.IsFullVersion())

Minecraft.Client/Windows64/Windows64_Minecraft.h

@@ -2,6 +2,9 @@
 
 #include <d3d11.h>
 
+static bool isF11Pressed = false;
+static bool wasF11Pressed = false;
+
 extern BOOL g_bWidescreen;
 
 extern int g_iScreenWidth;
@@ -11,4 +14,10 @@ extern BOOL g_bResolutionSetByCMD;
 
 extern ID3D11Device* g_pd3dDevice;
 
-void CleanupDevice();
+void CleanupDevice();
+
+struct Windows64LaunchArgs
+{
+	bool fullscreen;
+	int resolution;
+};

Minecraft.Client/Windows64Media/loc/4J_stringsGeneric.xml

@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
 	<data name="IDS_NULL">
 		<value>Not Used</value>
 	</data>	

Minecraft.Client/Windows64Media/loc/4J_stringsPlatformSpecific.xml

@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
   <data name="IDS_NOFREESPACE_TEXT">
     <value>Your selected storage device doesn't have enough free space to create a game save.</value>
   </data>

Minecraft.Client/Windows64Media/loc/stringsGeneric.xml

@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
 	<data name="IDS_TIPS_GAMETIP_NEWDLC">
 		<value>New Downloadable Content is available! Access it from the Minecraft Store button on the Main Menu.</value>
 	</data>	
@@ -277,7 +278,8 @@ If you are holding an item in your hand, use{*CONTROLLER_ACTION_USE*} to use tha
 	<data name="IDS_HOW_TO_PLAY_HUD">
 		<value>{*T3*}HOW TO PLAY : HUD{*ETW*}{*B*}{*B*}
 The HUD shows information about your status; your health, your remaining oxygen when you are under water, your hunger level (you need to eat to replenish this), and your armor if you are wearing any. If you lose some health, but have a food bar with 9 or more{*ICON_SHANK_01*} in it, your health will automatically replenish. Eating food will replenish your food bar.{*B*}
-The Experience Bar is also shown here, with a numeric value to show your Experience Level, and the bar indicating how many Experience Points are required to increase your Experience Level. Experience Points are gained by collecting the Experience Orbs dropped by mobs when they die, mining certain block types, breeding animals, fishing, and smelting ores in a furnace.{*B*}{*B*}
+The Experience Bar is also shown here, with a numeric value to show your Experience Level, and the bar indicating how many Experience Points are required to increase your Experience Level. 
+Experience Points are gained by collecting the Experience Orbs dropped by mobs when they die, mining certain block types, breeding animals, fishing, and smelting ores in a furnace.{*B*}{*B*}
 It also shows the items that are available to use. Use{*CONTROLLER_ACTION_LEFT_SCROLL*} and{*CONTROLLER_ACTION_RIGHT_SCROLL*} to change the item in your hand.</value>
 	</data>	
 
@@ -368,11 +370,11 @@ You'll need to experiment with combinations of ingredients in order to find out
 	<data name="IDS_HOW_TO_PLAY_ENCHANTMENT">
 		<value>{*T3*}HOW TO PLAY : ENCHANTING{*ETW*}{*B*}{*B*}
 The Experience Points collected when a mob dies, or when certain blocks are mined or smelted in a furnace, can be used to enchant some tools, weapons, armor and books.{*B*}
-When a Sword, Bow, Axe, Pickaxe, Shovel, Armor or Book is placed in the slot below the book in the Enchantment Table, the three buttons to the right of the slot will display some enchantments and their Experience Levels costs.{*B*}
+When a Sword, Bow, Axe, Pickaxe, Shovel, Armor or Book is placed in the slot below the book in the Enchantment Table, the three buttons to the right of the slot will display some enchantments and their Experience Levels costs.{*B*} 
 If you do not have enough Experience Levels to use some of these, the cost will appear in red, otherwise it will be shown in green.{*B*}{*B*}
 The actual enchantment applied is randomly selected based on the cost displayed.{*B*}{*B*}
 If the Enchantment Table is surrounded by Bookshelves (up to a maximum of 15 Bookshelves), with a one block gap between the Bookcase and the Enchantment Table, the potency of the enchantments will be increased, and arcane glyphs will be seen coming from the book on the Enchantment Table.{*B*}{*B*}
-All the ingredients for an Enchantment Table can be found within the villages in a world, or by mining and cultivation of the world.{*B*}{*B*}
+All the ingredients for an Enchantment Table can be found within the villages in a world, or by mining and cultivation of the world.{*B*}{*B}
 Enchanted Books are used at the Anvil to apply enchantments to items. This gives you more control over which enchantments you would like on your items.{*B*}
 </value>
 	</data>	
@@ -395,7 +397,8 @@ There is a limit on the number of animals it is possible to have in a world, so
 
 	<data name="IDS_HOW_TO_PLAY_NETHERPORTAL">
 		<value>{*T3*}HOW TO PLAY : NETHER PORTAL{*ETW*}{*B*}{*B*}
-A Nether Portal allows the player to travel between the Overworld and the Nether world. The Nether world can be used to fast-travel in the Overworld - traveling one block distance in the Nether is equivalent to traveling 3 blocks in the Overworld, so when you build a portal in the Nether world and exit through it, you will be 3 times further away from your entry point.{*B*}{*B*}
+A Nether Portal allows the player to travel between the Overworld and the Nether world. The Nether world can be used to fast-travel in the Overworld - traveling one block distance in the Nether is equivalent to traveling 3 blocks in the Overworld, so when you build a portal
+in the Nether world and exit through it, you will be 3 times further away from your entry point.{*B*}{*B*}
 A minimum of 10 Obsidian blocks are required to build the portal, and the portal needs to be 5 blocks high by 4 blocks wide by 1 block deep. Once the portal frame is built, the space inside the frame needs to be set on fire to activate it. This can be done using the Flint and Steel item, or the Fire Charge item.{*B*}{*B*}
 Examples of portal construction are shown in the picture to the right.
   </value>
@@ -466,7 +469,7 @@ When creating a new world there are some additional options.{*B*}{*B*}
 	When enabled, the Nether will be re-generated. This is useful if you have an older save where Nether Fortresses were not present.{*B*}{*B*}
 
 	{*T1*}In-Game Options{*ETW*}{*B*}
-	While in the game a number of options can be accessed by pressing {*BACK_BUTTON*} to bring up the in-game menu.{*B*}{*B*}
+	While in the game a number of options can be accessed by pressing {*CONTROLLER_VK_BACK*} to bring up the in-game menu.{*B*}{*B*}
 	
 	{*T2*}Host Options{*ETW*}{*B*}
 	The host player, and any players set as moderators can access the "Host Option" menu. In this menu they can enable and disable fire spreading and TNT exploding.{*B*}{*B*}
@@ -604,7 +607,7 @@ If "Host Privileges" is enabled the host player can modify some privileges for t
 		<value>{*T3*}HOW TO PLAY : THE END{*ETW*}{*B*}{*B*}
 The End is another dimension in the game, which is reached through an active End Portal. The End Portal can be found in a Stronghold, which is deep underground in the Overworld.{*B*}
 To activate the End Portal, you'll need to put an Eye of Ender into any End Portal Frame without one.{*B*}
-Once the portal is active, jump in to it to go to The End.{*B*}{*B*}
+Once the portal is active, jump into it to go to The End.{*B*}{*B*}
 In The End you will meet the Ender Dragon, a fierce and powerful enemy, along with many Enderman, so you will have to be well prepared for the battle before going there!{*B*}{*B*}
 You'll find that there are Ender Crystals on top of eight Obsidian spikes that the Ender Dragon uses to heal itself, 
 so the first step in the battle is to destroy each of these.{*B*}
@@ -4101,93 +4104,13 @@ Can also be used for low-level lighting.</value>
 		<value>Layout 3</value>
 	</data>	
 
-	<data name="IDS_CONTROLLER_A">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonA.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_B">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonB.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_X">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonX.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_Y">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonY.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_LEFT_STICK">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonLeftStick.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_RIGHT_STICK">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonRightStick.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_LEFT_TRIGGER">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonLeftTrigger.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_RIGHT_TRIGGER">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonRightTrigger.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_LEFT_BUMPER">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonLeftBumper.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_RIGHT_BUMPER">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonRightBumper.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_BACK">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonBack.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_START">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonStart.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_RIGHT_THUMBSTICK">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonRS.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_LEFT_THUMBSTICK">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonLS.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_DPAD_R">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonDpadR.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_DPAD_L">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonDpadL.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_DPAD_U">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonDpadU.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_CONTROLLER_DPAD_D">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\X360ControllerIcons\ButtonDpadD.png" align="middle" height="30" width="30"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_ICON_SHANK_01">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\Icon_Shank.png" align="middle" height="22" width="22"/&gt;]]></value>
-	</data>	
-
-	<data name="IDS_ICON_SHANK_03">
-		<value><![CDATA[&amp;nbsp;&lt;img src="{*IMAGEROOT*}Graphics\Icon_Shank.png" align="middle" height="22" width="22"/&gt;&lt;img src="{*IMAGEROOT*}Graphics\Icon_Shank.png" align="middle" height="22" width="22"/&gt;&lt;img src="{*IMAGEROOT*}Graphics\Icon_Shank.png" align="middle" height="22" width="22"/&gt;]]></value>
-	</data>	
-
 	<data name="IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE">
 		<value>{*B*}Press{*CONTROLLER_VK_A*} to continue.</value>
 	</data>	
 
 	<data name="IDS_TUTORIAL_PROMPT_START_TUTORIAL">
 		<value>{*B*}Press{*CONTROLLER_VK_A*} to start the tutorial.{*B*}
-Press{*CONTROLLER_VK_B*} if you think you are ready to play on your own.</value>
+      Press{*CONTROLLER_VK_B*} if you think you are ready to play on your own.</value>
 	</data>	
 
 	<data name="IDS_TUTORIAL_TASK_OVERVIEW">
@@ -4225,7 +4148,7 @@ At night monsters come out, make sure to build a shelter before that happens.</v
 
 	<data name="IDS_TUTORIAL_TASK_INVENTORY">
 		<value>As you collect and craft more items, your inventory will fill up.{*B*}
-Press{*CONTROLLER_ACTION_INVENTORY*} to open the inventory.</value>
+    Press{*CONTROLLER_ACTION_INVENTORY*} to open the inventory.</value>
 	</data>	
 
 	<data name="IDS_TUTORIAL_TASK_FOOD_BAR_DEPLETE">
@@ -5753,9 +5676,13 @@ Press{*CONTROLLER_VK_B*} if you already know about Fireworks.</value>
 
 	<data name="IDS_CORRUPT_OR_DAMAGED_SAVE_TEXT">
 		<value>This save is corrupt or damaged. Would you like to delete it?</value>
-	</data>	
+	</data>
 
-	<data name="IDS_CONFIRM_EXIT_GAME_CONFIRM_DISCONNECT_SAVE">
+  <data name="IDS_CONFIRM_EXIT_GAME_CONFIRM_DISCONNECT">
+    <value>Are you sure you want to exit to the main menu?</value>
+  </data>
+
+  <data name="IDS_CONFIRM_EXIT_GAME_CONFIRM_DISCONNECT_SAVE">
 		<value>Are you sure you want to exit to the main menu and disconnect all players from the game? Any unsaved progress will be lost.</value>
 	</data>	
 
@@ -5804,7 +5731,7 @@ Press{*CONTROLLER_VK_B*} if you already know about Fireworks.</value>
 	</data>	
 
 	<data name="IDS_PRESS_START_TO_JOIN">
-		<value>Press START to join game</value>
+		<value>Press{*CONTROLLER_VK_START*} to join game</value>
 	</data>	
 
 	<data name="IDS_EXITING_GAME">

Minecraft.Client/Windows64Media/loc/stringsLeaderboards.xml

@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
   <data name="IDS_LEADERBOARD_KILLS_EASY">
     <value>Kills Easy</value>
   </data>

Minecraft.Client/Windows64Media/loc/stringsPlatformSpecific.xml

@@ -4,7 +4,7 @@
 	</data>	
 
 	<data name="IDS_TIPS_GAMETIP_1">
-		<value>Connect extra controllers to your console and press START on them to join a game at any point.</value>
+		<value>Connect extra controllers to your console and press {*CONTROLLER_VK_START*} on them to join a game at any point.</value>
 	</data>	
 
 	<data name="IDS_TIPS_GAMETIP_48">
@@ -29,9 +29,9 @@
 
 	<data name="IDS_HOW_TO_PLAY_MULTIPLAYER">
 		<value>{*T3*}HOW TO PLAY : MULTIPLAYER{*ETW*}{*B*}{*B*}
-Minecraft on the Xbox One console is a multiplayer game by default. If you are playing in a High Definition mode, you can have local players join your game by attaching controllers and pressing START at any point during the game.{*B*}{*B*}
+Minecraft on the Xbox One console is a multiplayer game by default. If you are playing in a High Definition mode, you can have local players join your game by attaching controllers and pressing{*CONTROLLER_VK_START*} at any point during the game.{*B*}{*B*}
 When you start or join an online game, it will be visible to people in your friends list (unless you've selected Invite Only when hosting the game), and if they join the game, it will also be visible to people in their friends list (if you have selected the Allow Friends of Friends option).{*B*}
-When you are in a game, you can press the BACK button to bring up a list of all other players in the game, view their Gamer Cards, Kick players from the game, and invite others to the game.
+When you are in a game, you can press the{*CONTROLLER_VK_BACK*} button to bring up a list of all other players in the game, view their Gamer Cards, Kick players from the game, and invite others to the game.
   </value>
 	</data>	
 
@@ -273,11 +273,20 @@ If you try to save while using the trial version, you will be given the option t
   <data name="IDS_GAMEOPTION_WORLD_SIZE">
     <value>Select a world size to vary the amount of the world that you can explore.</value>
   </data>
-  <data name="IDS_DISABLE_SAVING">
+  <data name="IDS_TITLE_ENABLE_AUTOSAVE">
+    <value>Enable autosave</value>
+  </data>
+  <data name="IDS_CONFIRM_ENABLE_AUTOSAVE">
+    <value>Would you like to enable the constant, automatic saving of the world?</value>
+  </data>
+  <data name="IDS_DISABLE_AUTOSAVE">
+    <value>Disable Autosave</value>
+  </data>
+  <data name="IDS_TITLE_DISABLE_AUTOSAVE">
     <value>Disable autosave</value>
   </data>
-  <data name="IDS_GAMEOPTION_DISABLE_SAVING">
-    <value>Turn off the constant, automatic saving of the world. If you later choose to save it could take a long time.</value>
+  <data name="IDS_CONFIRM_DISABLE_AUTOSAVE">
+    <value>Are you sure you want to disable the constant, automatic saving of the world?</value>
   </data>
 
   <data name="IDS_ERROR_NETWORK">

Minecraft.Client/Xbox/xex.xml

@@ -1,11 +1,17 @@
 <?xml version="1.0"?>
 <xex>
-  <version major="0x3" minor="0x0" build="0x0000" qfe="0x00"/>
+  <titleid id="0x584111F7"/>
+  <privilege id="10"/>
+  <version major="0x0" minor="0x0" build="0x0001" qfe="0x00"/>
+  <gameregion>
+    <na/>
+  </gameregion>
+  <rating esrb="ESRB_E10+"/>
   <mediatypes>
     <livepackage/>
     <signedpackage/>
   </mediatypes>
-	<format>
-        	<compressed/>
-        </format>
+  <format>
+    <compressed/>
+  </format>
 </xex>

Minecraft.Client/stdafx.h

@@ -339,8 +339,8 @@ typedef XUID GameSessionUID;
 #endif
 
 
-
-#if defined(_FINAL_BUILD) && !defined(_WINDOWS64)
+#if !defined(_WINDOWS64)
+#if defined(_FINAL_BUILD)
 #define printf BREAKTHECOMPILE
 #define wprintf BREAKTHECOMPILE
 #undef OutputDebugString
@@ -348,5 +348,6 @@ typedef XUID GameSessionUID;
 #define OutputDebugStringA BREAKTHECOMPILE
 #define OutputDebugStringW BREAKTHECOMPILE
 #endif
+#endif
 
 void MemSect(int sect);

Minecraft.World/Minecraft.World.vcxproj

@@ -923,7 +923,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>_TU_BUILD;_FINAL_BUILD;NDEBUG;_XBOX;_LIB;_CONTENT_PACKAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_FINAL_BUILD;_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;_CONTENT_PACKAGE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

Minecraft.World/stdafx.h

@@ -134,8 +134,8 @@ typedef XUID GameSessionUID;
 #include "compression.h"
 #include "PerformanceTimer.h"
 
-
-#if defined(_FINAL_BUILD) && !defined(_WINDOWS64)
+#if !defined(_WINDOWS64)
+#if defined(_FINAL_BUILD)
 #define printf BREAKTHECOMPILE
 #define wprintf BREAKTHECOMPILE
 #undef OutputDebugString
@@ -143,6 +143,7 @@ typedef XUID GameSessionUID;
 #define OutputDebugStringA BREAKTHECOMPILE
 #define OutputDebugStringW BREAKTHECOMPILE
 #endif
+#endif
 
 
 void MemSect(int sect);

MinecraftConsoles.sln

@@ -47,7 +47,8 @@ Global
 		ReleaseForArt|Xbox 360 = ReleaseForArt|Xbox 360
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Durango.ActiveCfg = ContentPackage_NO_TU|x64
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Durango.ActiveCfg = ContentPackage_NO_TU|Durango
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Durango.Build.0 = ContentPackage_NO_TU|Durango
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|ORBIS.ActiveCfg = ContentPackage_NO_TU|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|ORBIS.Build.0 = ContentPackage_NO_TU|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|PS3.ActiveCfg = ContentPackage_NO_TU|PS3
@@ -58,7 +59,8 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Windows64.Build.0 = ContentPackage_NO_TU|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Xbox 360.ActiveCfg = ContentPackage_NO_TU|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Xbox 360.Build.0 = ContentPackage_NO_TU|Xbox 360
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Durango.ActiveCfg = CONTENTPACKAGE_SYMBOLS|x64
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Durango.ActiveCfg = CONTENTPACKAGE_SYMBOLS|Durango
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Durango.Build.0 = CONTENTPACKAGE_SYMBOLS|Durango
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|ORBIS.ActiveCfg = CONTENTPACKAGE_SYMBOLS|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|ORBIS.Build.0 = CONTENTPACKAGE_SYMBOLS|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|PS3.ActiveCfg = CONTENTPACKAGE_SYMBOLS|PS3
@@ -69,7 +71,8 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Windows64.Build.0 = CONTENTPACKAGE_SYMBOLS|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Xbox 360.ActiveCfg = CONTENTPACKAGE_SYMBOLS|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Xbox 360.Build.0 = CONTENTPACKAGE_SYMBOLS|Xbox 360
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Durango.ActiveCfg = ContentPackage|x64
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Durango.ActiveCfg = ContentPackage|Durango
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Durango.Build.0 = ContentPackage|Durango
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|ORBIS.ActiveCfg = ContentPackage|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|ORBIS.Build.0 = ContentPackage|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
@@ -80,7 +83,8 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Windows64.Build.0 = ContentPackage|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Xbox 360.ActiveCfg = ContentPackage|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Xbox 360.Build.0 = ContentPackage|Xbox 360
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Durango.ActiveCfg = Debug|x64
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Durango.ActiveCfg = Debug|Durango
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Durango.Build.0 = Debug|Durango
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|ORBIS.Build.0 = Debug|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|PS3.ActiveCfg = Debug|PS3
@@ -91,7 +95,8 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Windows64.Build.0 = Debug|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Durango.ActiveCfg = Release|x64
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Durango.ActiveCfg = Release|Durango
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Durango.Build.0 = Release|Durango
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|ORBIS.ActiveCfg = Release|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|ORBIS.Build.0 = Release|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|PS3.ActiveCfg = Release|PS3
@@ -102,7 +107,8 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Windows64.Build.0 = Release|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Xbox 360.Build.0 = Release|Xbox 360
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Durango.ActiveCfg = ReleaseForArt|x64
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Durango.ActiveCfg = ReleaseForArt|Durango
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Durango.Build.0 = ReleaseForArt|Durango
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|ORBIS.ActiveCfg = ReleaseForArt|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|ORBIS.Build.0 = ReleaseForArt|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|PS3.ActiveCfg = ReleaseForArt|x64
@@ -112,7 +118,8 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Windows64.Build.0 = ReleaseForArt|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Xbox 360.ActiveCfg = ReleaseForArt|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Xbox 360.Build.0 = ReleaseForArt|Xbox 360
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Durango.ActiveCfg = ContentPackage_NO_TU|x64
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Durango.ActiveCfg = ContentPackage_NO_TU|Durango
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Durango.Build.0 = ContentPackage_NO_TU|Durango
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|ORBIS.ActiveCfg = ContentPackage_NO_TU|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|ORBIS.Build.0 = ContentPackage_NO_TU|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|PS3.ActiveCfg = ContentPackage_NO_TU|PS3
@@ -123,7 +130,8 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Windows64.Build.0 = ContentPackage_NO_TU|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Xbox 360.ActiveCfg = ContentPackage_NO_TU|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Xbox 360.Build.0 = ContentPackage_NO_TU|Xbox 360
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Durango.ActiveCfg = CONTENTPACKAGE_SYMBOLS|x64
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Durango.ActiveCfg = CONTENTPACKAGE_SYMBOLS|Durango
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Durango.Build.0 = CONTENTPACKAGE_SYMBOLS|Durango
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|ORBIS.ActiveCfg = CONTENTPACKAGE_SYMBOLS|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|ORBIS.Build.0 = CONTENTPACKAGE_SYMBOLS|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|PS3.ActiveCfg = CONTENTPACKAGE_SYMBOLS|PS3
@@ -134,7 +142,8 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Windows64.Build.0 = CONTENTPACKAGE_SYMBOLS|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Xbox 360.ActiveCfg = CONTENTPACKAGE_SYMBOLS|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Xbox 360.Build.0 = CONTENTPACKAGE_SYMBOLS|Xbox 360
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Durango.ActiveCfg = ContentPackage|x64
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Durango.ActiveCfg = ContentPackage|Durango
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Durango.Build.0 = ContentPackage|Durango
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|ORBIS.ActiveCfg = ContentPackage|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|ORBIS.Build.0 = ContentPackage|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
@@ -145,7 +154,8 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Windows64.Build.0 = ContentPackage|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Xbox 360.ActiveCfg = ContentPackage|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Xbox 360.Build.0 = ContentPackage|Xbox 360
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Durango.ActiveCfg = Debug|x64
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Durango.ActiveCfg = Debug|Durango
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Durango.Build.0 = Debug|Durango
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|ORBIS.Build.0 = Debug|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|PS3.ActiveCfg = Debug|PS3
@@ -156,7 +166,8 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Windows64.Build.0 = Debug|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Durango.ActiveCfg = Release|x64
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Durango.ActiveCfg = Release|Durango
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Durango.Build.0 = Release|Durango
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|ORBIS.ActiveCfg = Release|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|ORBIS.Build.0 = Release|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|PS3.ActiveCfg = Release|PS3
@@ -168,7 +179,8 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Windows64.Deploy.0 = Release|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Xbox 360.Build.0 = Release|Xbox 360
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Durango.ActiveCfg = ReleaseForArt|x64
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Durango.ActiveCfg = ReleaseForArt|Durango
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Durango.Build.0 = ReleaseForArt|Durango
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|ORBIS.ActiveCfg = ReleaseForArt|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|ORBIS.Build.0 = ReleaseForArt|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|PS3.ActiveCfg = ReleaseForArt|x64