fix: 4J

.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

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

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/Consoles_App.cpp

@@ -3841,7 +3841,11 @@ void CMinecraftApp::HandleXuiActions(void)
 				break;
 			case eAppAction_SetDefaultOptions:
 				SetAction(i,eAppAction_Idle);
-				SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);
+#if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)
+					SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);		
+#else
+					SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);		
+#endif
 
 				// if the profile data has been changed, then force a profile write
 				// It seems we're allowed to break the 5 minute rule if it's the result of a user action

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/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/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/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/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">
@@ -5804,7 +5727,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>	
 

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