General fixes

# Conflicts:
#	.gitea/workflows/release.yaml
#	.gitignore
#	Minecraft.Client/Common/Audio/SoundEngine.cpp
#	Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
#	Minecraft.Client/Common/Media/MediaOrbis.arc
#	Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1
#	Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1
#	Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1
#	Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1
#	Minecraft.Client/Minecraft.Client.vcxproj
#	Minecraft.Client/Minecraft.Client.vcxproj.filters
#	Minecraft.Client/OrbisMedia/loc/stringsGeneric.xml
#	Minecraft.Client/OrbisMedia/strings.h
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Debug/ChunkUpdate.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Debug/CompressedTile.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Debug/CompressedTileStorage_compress.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Debug/LevelRenderer_FindNearestChunk.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Debug/LevelRenderer_cull.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Debug/Texture_blit.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Release/ChunkUpdate.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Release/CompressedTile.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Release/CompressedTileStorage_compress.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Release/LevelRenderer_FindNearestChunk.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Release/LevelRenderer_cull.ppu.o
#	Minecraft.Client/PS3/SPU_Tasks/ObjFiles/Release/Texture_blit.ppu.o
#	Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
#	Minecraft.World/Minecraft.World.vcxproj
#	MinecraftConsoles.sln
#	README.md

.gitea/workflows/orbis.yaml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2022
+    runs-on: sdk-orbis
 
     strategy:
       matrix:
@@ -27,6 +27,7 @@ jobs:
         uses: https://github.com/actions/checkout@v4
         with:
           fetch-depth: 1
+          clean: false
           lfs: false
 
       - name: Build Cafeberry
@@ -48,7 +49,8 @@ jobs:
           Copy-Item "./ORBIS_${{ inputs.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg
 
       - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
         with:
           name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0

.gitea/workflows/ps3.yaml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2022
+    runs-on: sdk-ps3
 
     strategy:
       matrix:
@@ -27,6 +27,7 @@ jobs:
         uses: https://github.com/actions/checkout@v4
         with:
           fetch-depth: 1
+          clean: false
           lfs: false
 
       - name: Build Cafeberry
@@ -37,7 +38,7 @@ jobs:
             /m
 
       - name: Zip Build
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
+        run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map"
 
       - name: Stage artifacts
         run: |
@@ -45,7 +46,8 @@ jobs:
           Copy-Item LCE${{ matrix.platform }}.zip staging/ 
 
       - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
         with:
           name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0

.gitea/workflows/psvita.yaml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2022
+    runs-on: sdk-psvita
 
     strategy:
       matrix:
@@ -27,6 +27,7 @@ jobs:
         uses: https://github.com/actions/checkout@v4
         with:
           fetch-depth: 1
+          clean: false
           lfs: false
 
       - name: Build Cafeberry
@@ -46,7 +47,8 @@ jobs:
           Copy-Item "./PSVita_${{ inputs.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk
 
       - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
         with:
           name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0

.gitea/workflows/release.yaml

@@ -25,19 +25,31 @@ jobs:
 
   build:
     needs: validate
-    runs-on: windows-2022
-
     strategy:
       matrix:
         configuration: [Release]
-        platform: [PS3, Windows64, Orbis] #[PS3, PSVita, Xbox360, ORBIS, Windows64]
+        platform: [Windows64, Xbox360, Orbis, PSVita, PS3]
+        include:
+        - platform: Windows64
+          sdk_label: windows-2022 # str1k3r - can run on any runner
+        - platform: Xbox360
+          sdk_label: sdk-xbox360
+        - platform: Orbis
+          sdk_label: sdk-orbis
+        - platform: PSVita
+          sdk_label: sdk-psvita
+        - platform: PS3
+          sdk_label: sdk-ps3
+
+    runs-on: [windows-2022, "${{ matrix.sdk_label }}"]
 
     steps:
       - name: Checkout Repository
         uses: https://github.com/actions/checkout@v4
         with:
           fetch-depth: 1
-          lfs: false 
+          clean: false
+          lfs: false
 
       - name: Build Cafeberry
         run: |
@@ -57,7 +69,7 @@ jobs:
           } elseif ("${{ matrix.platform }}" -eq "PSVita") {
             7z a -r "LCEPSVita.zip" "./PSVita_${{ matrix.configuration }}/PSVITA_GAME/*"
           } elseif ("${{ matrix.platform }}" -eq "PS3") {
-            7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/PS3_GAME/*"
+            7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/*" "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map"
           } elseif ("${{ matrix.platform }}" -eq "Xbox360") {
             7z a -r "LCEXbox360.zip" "./X360_${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.xdb"
           } else {
@@ -78,17 +90,18 @@ jobs:
           }
 
       - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        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/actions/download-artifact@v3
+        uses: https://github.com/christopherHX/gitea-download-artifact@v4
         with:
           path: downloaded
 
@@ -110,9 +123,10 @@ jobs:
           }
 
           $delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))"
-          "description<<$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
-          $body | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
-          "$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
+          $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

.gitea/workflows/windows64.yaml

@@ -27,6 +27,7 @@ jobs:
         uses: https://github.com/actions/checkout@v4
         with:
           fetch-depth: 1
+          clean: false
           lfs: false
 
       - name: Build Cafeberry
@@ -46,7 +47,8 @@ jobs:
           Copy-Item LCE${{ matrix.platform }}.zip staging/ 
 
       - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
         with:
           name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0

.gitea/workflows/xbox.yaml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2022
+    runs-on: sdk-xbox360
 
     strategy:
       matrix:
@@ -27,6 +27,7 @@ jobs:
         uses: https://github.com/actions/checkout@v4
         with:
           fetch-depth: 1
+          clean: false
           lfs: false
 
       - name: Build Cafeberry
@@ -48,7 +49,8 @@ jobs:
           Copy-Item LCE${{ matrix.platform }}.zip staging/ 
 
       - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
         with:
           name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0

.gitignore

@@ -1,44 +1,35 @@
-/*Debug
-/*Release
-/*ContentPackage
-/*ContentPackage_NO_TU
-/*ContentPackage_SYMBOLS
-/*ReleaseForArt
+.vs
 /x64
 /ipch
-.vs/
+.vscode
+/*Debug
+/*Release*
+/*ContentPackage*
 
 # Minecraft.Client
-/Minecraft.Client/x64/
+/Minecraft.Client/x64
 /Minecraft.Client/x64_*
 /Minecraft.Client/*Debug
-/Minecraft.Client/*Release
-/Minecraft.Client/*ContentPackage
-/Minecraft.Client/*ContentPackage_NO_TU
-/Minecraft.Client/*ContentPackage_SYMBOLS
-/Minecraft.Client/*ReleaseForArt
+/Minecraft.Client/*Release*
+/Minecraft.Client/*ContentPackage*
 /Minecraft.Client/Windows64/GameHDD
 
 # Minecraft.world
-/Minecraft.World/x64/
+/Minecraft.World/x64
 /Minecraft.World/x64_*
 /Minecraft.World/*Debug
-/Minecraft.World/*Release
-/Minecraft.World/*ContentPackage
-/Minecraft.World/*ContentPackage_NO_TU
-/Minecraft.World/*ContentPackage_SYMBOLS
-/Minecraft.World/*ReleaseForArt
+/Minecraft.World/*Release*
+/Minecraft.World/*ContentPackage*
 
-# PS3 SPU
-/Minecraft.Client/PS3/SPU_Tasks/objFiles/
-/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3*
+# PS3 SPU Tasks
+/Minecraft.Client/PS3/SPU_Tasks/objFiles
+/Minecraft.Client/PS3/SPU_Tasks/*/PS3*
+/Minecraft.Client/PS3/SPU_Tasks/*/Debug
+/Minecraft.Client/PS3/SPU_Tasks/*/Release
+/Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
 
 # Misc
+*.ppu.o
 *.pkg
 /*.gp4p
 /*.vpk
@@ -46,4 +37,5 @@
 *-app
 *.sdf
 *.opensdf
-*.v11.suo
+*.v11.suo
+*.vcxproj.user

Minecraft.Client/Common/CommonMedia.sln

@@ -4,14 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonMedia", "CommonMedia.vcxproj", "{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}"
 EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 2
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
-		SccProjectUniqueName0 = CommonMedia.vcxproj
-		SccLocalPath0 = .
-		SccLocalPath1 = .
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32

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/Leaderboards/LeaderboardManager.cpp

@@ -9,7 +9,7 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
 		L"Friends", L"MyScore", L"TopRank"
 	};
 
-#ifdef __PS3__ // str1k3r - only PS3 needs this, also this wasnt in the leak?
+#if defined(__PS3__) && !defined(_CONTENT_PACKAGE) // str1k3r - only PS3 needs this, also this wasnt in the leak?
 LeaderboardManager *LeaderboardManager::m_instance = NULL;
 #endif
 

Minecraft.Client/Common/Leaderboards/base64.cpp

@@ -1,7 +1,7 @@
 /* 
    base64.cpp and base64.h
 
-   Copyright (C) 2004-2008 René Nyffenegger
+   Copyright (C) 2004-2008 Ren� Nyffenegger
 
    This source code is provided 'as-is', without any express or implied
    warranty. In no event will the author be held liable for any damages
@@ -21,7 +21,7 @@
 
    3. This notice may not be removed or altered from any source distribution.
 
-   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+   Ren� Nyffenegger rene.nyffenegger@adp-gmbh.ch
 
 */
 
@@ -41,7 +41,7 @@ static inline bool is_base64(unsigned char c) {
 }
 
 // 4J ADDED,
-std::string base64_encode(std::string str)
+std::string base64_encode(const std::string& str)
 {
 	return base64_encode( reinterpret_cast<const unsigned char*>(str.c_str()), str.length() );
 }

Minecraft.Client/Common/Leaderboards/base64.h

@@ -2,6 +2,6 @@
 
 #include <string>
 
-std::string base64_encode(std::string str);
+std::string base64_encode(const std::string& str);
 std::string base64_encode(unsigned char const* , unsigned int len);
 std::string base64_decode(std::string const& s);

Minecraft.Client/Common/Network/GameNetworkManager.cpp

@@ -314,13 +314,13 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 	Minecraft *pMinecraft = Minecraft::GetInstance();	
 	// Make sure that we have transitioned through any joining/creating stages and are actually playing the game, so that we know the players should be valid
 	bool changedMessage = false;
-	while(!IsReadyToPlayOrIdle())
-	{
-		changedMessage = true;
-		pMinecraft->progressRenderer->progressStage( g_NetworkManager.CorrectErrorIDS(IDS_PROGRESS_SAVING_TO_DISC) );		// "Finalizing..." vaguest message I could find
-		pMinecraft->progressRenderer->progressStagePercentage( g_NetworkManager.GetJoiningReadyPercentage() );
-		Sleep(10);
-	}
+		while(!IsReadyToPlayOrIdle())
+		{
+			changedMessage = true;
+			pMinecraft->progressRenderer->progressStage( g_NetworkManager.CorrectErrorIDS(IDS_PROGRESS_SAVING_TO_DISC) );		// "Finalizing..." vaguest message I could find
+			pMinecraft->progressRenderer->progressStagePercentage( g_NetworkManager.GetJoiningReadyPercentage() );
+			Sleep(0);
+		}
 	if( changedMessage )
 	{
 		pMinecraft->progressRenderer->progressStagePercentage( 100 );
@@ -898,7 +898,7 @@ int CGameNetworkManager::RunNetworkGameThreadProc( void* lpParameter )
 		TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
 		while ( tPack->isLoadingData() || (Minecraft::GetInstance()->skins->needsUIUpdate() || ui.IsReloadingSkin()) )
 		{
-			Sleep(1);
+			Sleep(0);
 		}
 		ui.CleanUpSkinReload();
 		if(app.GetDisconnectReason() == DisconnectPacket::eDisconnect_None) 
@@ -935,7 +935,7 @@ int CGameNetworkManager::ServerThreadProc( void* lpParameter )
 		{
 			while((Minecraft::GetInstance()->skins->needsUIUpdate() || ui.IsReloadingSkin()))
 			{
-				Sleep(1);
+				Sleep(0);
 			}
 			param->levelGen->loadBaseSaveData();
 		}
@@ -977,7 +977,7 @@ int	CGameNetworkManager::ExitAndJoinFromInviteThreadProc( void* lpParam )
 
 	while( g_NetworkManager.IsInSession() )
 	{
-		Sleep(1);
+		Sleep(0);
 	}
 
 	// Xbox should always be online when receiving invites - on PS3 we need to check & ask the user to sign in
@@ -1237,7 +1237,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
 	// wait for the current session to end
 	while( g_NetworkManager.IsInSession() )
 	{
-		Sleep(1);
+		Sleep(0);
 	}
 	
 	// Reset this flag as the we don't need to know that we only lost the room only from this point onwards, the behaviour is exactly the same

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

@@ -1,6 +1,7 @@
 param(
     [string]$OutDir,
-    [string]$ProjectDir
+    [string]$ProjectDir,
+	[string]$Configuration
 )
 
 Write-Host "PS3 Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
@@ -59,7 +60,12 @@ foreach ($copy in $fileCopies) {
 	}
 }
 
-$builtFile = Join-Path $OutDir "Minecraft.Client.self"
+if ($Configuration -match "ContentPackage") {
+    $builtFile = Join-Path $OutDir "Minecraft.Client.elf"
+} else {
+    $builtFile = Join-Path $OutDir "Minecraft.Client.self"
+}
+
 $newName   = "EBOOT.BIN"
 $destDir   = Join-Path $OutDir "PS3_GAME\USRDIR"
 $destPath  = Join-Path $destDir $newName

Minecraft.Client/Common/UI/UIController.cpp

@@ -528,58 +528,37 @@ void UIController::loadSkins()
 	}
 
 #endif
-	// Every platform has one of these, so nothing shared
-	if(m_fScreenHeight==1080.0f)
+
+	// str1k3r - Fixes 720p/480p Crashes on Windows64, also allows this to be used on 1080p consoles instead of just Windows64
+	// This also cleans up some 4J code and turns 3 if statements into 1.
+	if (m_fScreenHeight >= 1080.0f)
 	{
 		m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskinHD.swf");
+		m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
+		m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
+		m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
+		m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinHDGraphicsTooltips.swf", L"skinHDGraphicsTooltips.swf");
+		m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinHDGraphicsLabels.swf", L"skinHDGraphicsLabels.swf");
+		m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinHDLabels.swf", L"skinHDLabels.swf");
+		m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinHDInGame.swf", L"skinHDInGame.swf");
+		m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
+		m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
+		m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
 	}
 	else
 	{
 		m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskin.swf");
+		m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
+		m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
+		m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
+		m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf");
+		m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf");
+		m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf");
+		m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf");
+		m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
+		m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
+		m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf");
 	}
-
-#if defined(__PS3__) || defined(__PSVITA__)
-	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
-	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
-	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
-	m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf");
-	m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf");
-	m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf");
-	m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf");
-	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
-	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
-	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf");
-#endif
-
-#if ( defined(_WINDOWS64) || defined(_DURANGO) || defined(__ORBIS__) )
-
-#if defined(_WINDOWS64)
-	// 4J Stu - Load the 720/480 skins so that we have something to fallback on during development
-#ifndef _FINAL_BUILD
-	m_iggyLibraries[eLibraryFallback_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
-	m_iggyLibraries[eLibraryFallback_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
-	m_iggyLibraries[eLibraryFallback_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
-	m_iggyLibraries[eLibraryFallback_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf");
-	m_iggyLibraries[eLibraryFallback_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf");
-	m_iggyLibraries[eLibraryFallback_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf");
-	m_iggyLibraries[eLibraryFallback_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf");
-	m_iggyLibraries[eLibraryFallback_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
-	m_iggyLibraries[eLibraryFallback_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
-	m_iggyLibraries[eLibraryFallback_Default] = loadSkin(L"skin.swf", L"skin.swf");
-#endif
-#endif
-
-	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
-	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
-	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
-	m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinHDGraphicsTooltips.swf", L"skinHDGraphicsTooltips.swf");
-	m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinHDGraphicsLabels.swf", L"skinHDGraphicsLabels.swf");
-	m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinHDLabels.swf", L"skinHDLabels.swf");
-	m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinHDInGame.swf", L"skinHDInGame.swf");
-	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
-	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
-	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
-#endif // HD platforms
 }
 
 IggyLibrary UIController::loadSkin(const wstring &skinPath, const wstring &skinName)

Minecraft.Client/Common/UI/UIController.h

@@ -96,24 +96,7 @@ private:
 		eLibrary_HUD,
 		eLibrary_Tooltips,
 		eLibrary_Default,
-
-#if ( defined(_WINDOWS64) )
-	// 4J Stu - Load the 720/480 skins so that we have something to fallback on during development
-#ifndef _FINAL_BUILD
-		eLibraryFallback_Platform,
-		eLibraryFallback_GraphicsDefault,
-		eLibraryFallback_GraphicsHUD,
-		eLibraryFallback_GraphicsInGame,
-		eLibraryFallback_GraphicsTooltips,
-		eLibraryFallback_GraphicsLabels,
-		eLibraryFallback_Labels,
-		eLibraryFallback_InGame,
-		eLibraryFallback_HUD,
-		eLibraryFallback_Tooltips,
-		eLibraryFallback_Default,
-#endif
-#endif
-
+		
 		eLibrary_Count,
 	};
 

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/Durango/Layout/Image/Loose/Common/res/TitleUpdate/GameRules/BuildOnly/GameRules.sln

@@ -4,14 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRules", "GameRules.vcxproj", "{0DD2FD59-36AC-476F-9201-D687A4CE9E98}"
 EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 2
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
-		SccProjectUniqueName0 = GameRules.vcxproj
-		SccLocalPath0 = .
-		SccLocalPath1 = .
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Xbox 360 = Debug|Xbox 360
 		Release|Xbox 360 = Release|Xbox 360

Minecraft.Client/EnderDragonRenderer.cpp

@@ -145,10 +145,11 @@ void EnderDragonRenderer::render(shared_ptr<Entity> _mob, double x, double y, do
 		int steps = 8;
 		for (int i = 0; i <= steps; i++)
 		{
-			double d=i % steps * PI * 2 / steps;
-			float s = sin(i % steps * PI * 2 / steps) * 0.75f;
-			float c = cos(i % steps * PI * 2 / steps) * 0.75f;
-			float u = i % steps * 1.0f / steps;
+			int idx = i % steps;
+			double d = idx * PI * 2 / steps;
+			float s = sin(d) * 0.75f;
+			float c = cos(d) * 0.75f;
+			float u = idx * 1.0f / steps;
 			//t->color(0x000000);
 			t->vertexUV(s * 0.2f, c * 0.2f, 0, u, v1);
 			//t->color(0xffffff);

Minecraft.Client/EntityRenderDispatcher.cpp

@@ -94,6 +94,17 @@ void EntityRenderDispatcher::staticCtor()
 	instance = new EntityRenderDispatcher();
 }
 
+EntityRenderDispatcher::~EntityRenderDispatcher()
+{
+	AUTO_VAR(itEnd, renderers.end());
+	for( classToRendererMap::iterator it = renderers.begin(); it != itEnd; it++ )
+	{
+		delete it->second;
+		it->second = NULL;
+	}
+	renderers.clear();
+}
+
 EntityRenderDispatcher::EntityRenderDispatcher()
 {
 	glEnable(GL_LIGHTING);

Minecraft.Client/EntityRenderDispatcher.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "EntityRenderer.h"
-#include "..\Minecraft.World\Entity.h"
 #include "..\Minecraft.World\JavaIntHash.h"
+class Entity;
 class font;
 using namespace std;
 
@@ -37,6 +37,7 @@ public:
 
 private:
 	EntityRenderDispatcher();
+	~EntityRenderDispatcher();
 
 public:
 	EntityRenderer *getRenderer(eINSTANCEOF e);

Minecraft.Client/GameRenderer.cpp

@@ -105,8 +105,6 @@ GameRenderer::GameRenderer(Minecraft *mc)
 	zoom = 1;
 	zoom_x = 0;
 	zoom_y = 0;
-	rainXa = NULL;
-	rainZa = NULL;
 	lastActiveTime = Minecraft::currentTimeMillis();
 	lastNsTime = 0;
 	random = new Random();
@@ -181,8 +179,9 @@ GameRenderer::GameRenderer(Minecraft *mc)
 // 4J Stu Added to go with 1.8.2 change
 GameRenderer::~GameRenderer()
 {
-	if(rainXa != NULL) delete [] rainXa;
-	if(rainZa != NULL) delete [] rainZa;
+	delete random;
+	delete cameraPos;
+	delete lb;
 }
 
 void GameRenderer::tick(bool first)		// 4J - add bFirst
@@ -838,19 +837,21 @@ void GameRenderer::updateLightTexture(float a)
 		Level *level = player->level;		// 4J - was mc->level when it was just to update the one light texture
 
 		float skyDarken1 = level->getSkyDarken((float) 1);
+		float darken = skyDarken1 * 0.95f + 0.05f;
+		float rsGsMul = skyDarken1 * 0.65f + 0.35f;
+		float blockMul = blr * 0.1f + 1.5f;
 		for (int i = 0; i < 256; i++)
 		{
-			float darken = skyDarken1 * 0.95f + 0.05f;
 			float sky = level->dimension->brightnessRamp[i / 16] * darken;
-			float block = level->dimension->brightnessRamp[i % 16] * (blr * 0.1f + 1.5f);
+			float block = level->dimension->brightnessRamp[i % 16] * blockMul;
 
 			if (level->skyFlashTime > 0)
 			{
 				sky = level->dimension->brightnessRamp[i / 16];
 			}
 
-			float rs = sky * (skyDarken1 * 0.65f + 0.35f);
-			float gs = sky * (skyDarken1 * 0.65f + 0.35f);
+			float rs = sky * rsGsMul;
+			float gs = sky * rsGsMul;
 			float bs = sky;
 
 			float rb = block;
@@ -1526,27 +1527,30 @@ void GameRenderer::tickRain()
 		int x = x0 + random->nextInt(r) - random->nextInt(r);
 		int z = z0 + random->nextInt(r) - random->nextInt(r);
 		int y = level->getTopRainBlock(x, z);
-		int t = level->getTile(x, y - 1, z);
-		Biome *biome = level->getBiome(x,z);
-		if (y <= y0 + r && y >= y0 - r && biome->hasRain() && biome->getTemperature() >= 0.2f)
+		if (y <= y0 + r && y >= y0 - r)
 		{
-			float xa = random->nextFloat();
-			float za = random->nextFloat();
-			if (t > 0)
+			int t = level->getTile(x, y - 1, z);
+			Biome *biome = level->getBiome(x,z);
+			if (biome->hasRain() && biome->getTemperature() >= 0.2f)
 			{
-				if (Tile::tiles[t]->material == Material::lava)
+				float xa = random->nextFloat();
+				float za = random->nextFloat();
+				if (t > 0)
 				{
-					mc->particleEngine->add( shared_ptr<SmokeParticle>( new SmokeParticle(level, x + xa, y + 0.1f - Tile::tiles[t]->getShapeY0(), z + za, 0, 0, 0) ) );
-				}
-				else
-				{
-					if (random->nextInt(++rainPosSamples) == 0)
+					if (Tile::tiles[t]->material == Material::lava)
 					{
-						rainPosX = x + xa;
-						rainPosY = y + 0.1f - Tile::tiles[t]->getShapeY0();
-						rainPosZ = z + za;
+						mc->particleEngine->add( shared_ptr<SmokeParticle>( new SmokeParticle(level, x + xa, y + 0.1f - Tile::tiles[t]->getShapeY0(), z + za, 0, 0, 0) ) );
+					}
+					else
+					{
+						if (random->nextInt(++rainPosSamples) == 0)
+						{
+							rainPosX = x + xa;
+							rainPosY = y + 0.1f - Tile::tiles[t]->getShapeY0();
+							rainPosZ = z + za;
+						}
+						mc->particleEngine->add( shared_ptr<WaterDropParticle>( new WaterDropParticle(level, x + xa, y + 0.1f - Tile::tiles[t]->getShapeY0(), z + za) ) );
 					}
-					mc->particleEngine->add( shared_ptr<WaterDropParticle>( new WaterDropParticle(level, x + xa, y + 0.1f - Tile::tiles[t]->getShapeY0(), z + za) ) );
 				}
 			}
 		}
@@ -1581,10 +1585,12 @@ void GameRenderer::renderSnowAndRain(float a)
 
 	turnOnLightLayer(a);
 
-	if (rainXa == NULL) 
+	static float rainXa[32 * 32];
+	static float rainZa[32 * 32];
+	static bool rainArraysInitialized = false;
+	if (!rainArraysInitialized) 
 	{
-		rainXa = new float[32 * 32];
-		rainZa = new float[32 * 32];
+		rainArraysInitialized = true;
 
 		for (int z = 0; z < 32; z++)
 		{

Minecraft.Client/GameRenderer.h

@@ -128,8 +128,6 @@ private:
     void tickRain();
 private:
 	// 4J - brought forward from 1.8.2
-	float *rainXa;
-	float *rainZa;
 protected:
 	void renderSnowAndRain(float a);
     volatile int xMod;

Minecraft.Client/HorseRenderer.cpp

@@ -10,7 +10,7 @@ ResourceLocation HorseRenderer::HORSE_DONKEY_LOCATION = ResourceLocation(TN_MOB_
 ResourceLocation HorseRenderer::HORSE_ZOMBIE_LOCATION = ResourceLocation(TN_MOB_HORSE_ZOMBIE);
 ResourceLocation HorseRenderer::HORSE_SKELETON_LOCATION = ResourceLocation(TN_MOB_HORSE_SKELETON);
 
-std::map<wstring, ResourceLocation *> HorseRenderer::LAYERED_LOCATION_CACHE;
+std::map<wstring, ResourceLocation> HorseRenderer::LAYERED_LOCATION_CACHE;
 
 HorseRenderer::HorseRenderer(Model *model, float f) : MobRenderer(model, f)
 {
@@ -114,14 +114,14 @@ ResourceLocation *HorseRenderer::getOrCreateLayeredTextureLocation(shared_ptr<En
 	ResourceLocation *location;
 	if (it != LAYERED_LOCATION_CACHE.end())
 	{
-		location = it->second;
+		location = &(it->second);
 	}
 	else
 	{
-		LAYERED_LOCATION_CACHE[textureName] = new ResourceLocation(horse->getLayeredTextureLayers());
+		LAYERED_LOCATION_CACHE[textureName] = ResourceLocation(horse->getLayeredTextureLayers());
 			
 		it = LAYERED_LOCATION_CACHE.find(textureName);
-		location = it->second;
+		location = &(it->second);
 	}
 
     return location;

Minecraft.Client/HorseRenderer.h

@@ -8,7 +8,7 @@ class PathfinderMob;
 class HorseRenderer : public MobRenderer
 {
 private:
-	static std::map<wstring, ResourceLocation *> LAYERED_LOCATION_CACHE;
+	static std::map<wstring, ResourceLocation> LAYERED_LOCATION_CACHE;
 
 	static ResourceLocation HORSE_LOCATION;
 	static ResourceLocation HORSE_MULE_LOCATION;

Minecraft.Client/Minecraft.Client.vcxproj

@@ -806,9 +806,15 @@
       </Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"</Command>
       <Message>Run PS3 postbuild script</Message>
     </PostBuildEvent>
+    <PreLinkEvent>
+      <Command>"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Debug /v:minimal</Command>
+    </PreLinkEvent>
+    <PreLinkEvent>
+      <Message>Build PS3 SPU Tasks</Message>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">
     <ClCompile>
@@ -893,11 +899,17 @@
       </Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Run PS3 postbuild script</Message>
     </PostBuildEvent>
+    <PreLinkEvent>
+      <Command>"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Release /v:minimal</Command>
+    </PreLinkEvent>
+    <PreLinkEvent>
+      <Message>Build PS3 SPU Tasks</Message>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -920,7 +932,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_Debug\Minecraft.World.lib;%(AdditionalDependencies);XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib</AdditionalDependencies>
+      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>NotSet</ShowProgress>
       <SuppressStartupBanner>false</SuppressStartupBanner>
     </Link>
@@ -1015,7 +1027,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>_LARGE_WORLDS;_FINAL_BUILD;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
       <AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -1027,7 +1039,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_Release\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>NotSet</ShowProgress>
       <SuppressStartupBanner>false</SuppressStartupBanner>
     </Link>
@@ -1340,11 +1352,17 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <DataStripping>StripFuncsAndData</DataStripping>
     </Link>
     <PostBuildEvent>
-      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Run PS3 postbuild script</Message>
     </PostBuildEvent>
+    <PreLinkEvent>
+      <Command>"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=ContentPackage /v:minimal</Command>
+    </PreLinkEvent>
+    <PreLinkEvent>
+      <Message>Build PS3 SPU Tasks</Message>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">
     <ClCompile>
@@ -1431,11 +1449,17 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <DataStripping>StripFuncsAndData</DataStripping>
     </Link>
     <PostBuildEvent>
-      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Run PS3 postbuild script</Message>
     </PostBuildEvent>
+    <PreLinkEvent>
+      <Command>"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=ContentPackage /v:minimal</Command>
+    </PreLinkEvent>
+    <PreLinkEvent>
+      <Message>Build PS3 SPU Tasks</Message>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">
     <ClCompile>
@@ -1530,11 +1554,17 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <DataStripping>StripFuncsAndData</DataStripping>
     </Link>
     <PostBuildEvent>
-      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Run PS3 postbuild script</Message>
     </PostBuildEvent>
+    <PreLinkEvent>
+      <Command>"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=Release /v:minimal</Command>
+    </PreLinkEvent>
+    <PreLinkEvent>
+      <Message>Build PS3 SPU Tasks</Message>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">
     <ClCompile>
@@ -1606,6 +1636,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <DisableSpecificWarnings>1700;613;1011</DisableSpecificWarnings>
       <AdditionalOptions>-Xpch_override=1 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>PS3\Iggy\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1620,11 +1651,17 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <DataStripping>StripFuncsAndData</DataStripping>
     </Link>
     <PostBuildEvent>
-      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Run PS3 postbuild script</Message>
     </PostBuildEvent>
+    <PreLinkEvent>
+      <Command>"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" "$(ProjectDir)PS3\SPU_Tasks\SPU_Tasks.sln" /p:Configuration=ContentPackage /v:minimal</Command>
+    </PreLinkEvent>
+    <PreLinkEvent>
+      <Message>Build PS3 SPU Tasks</Message>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">
     <ClCompile>
@@ -1681,7 +1718,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>_FINAL_BUILD;NDEBUG;_CONTENT_PACKAGE;_WINDOWS64;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_FINAL_BUILD;_CONTENT_PACKAGE;_WINDOWS64;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
@@ -1694,12 +1731,12 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <OptimizeReferences>false</OptimizeReferences>
       <ProgramDatabaseFile>$(OutDir)default.pdb</ProgramDatabaseFile>
       <SetChecksum>true</SetChecksum>
-      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_Release\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
       <GenerateMapFile>false</GenerateMapFile>
       <MapExports>false</MapExports>
-      <LinkTimeCodeGeneration />
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <PostBuildEvent>
       <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
@@ -1733,7 +1770,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <OptimizeReferences>false</OptimizeReferences>
       <ProgramDatabaseFile>$(OutDir)default.pdb</ProgramDatabaseFile>
       <SetChecksum>true</SetChecksum>
-      <AdditionalDependencies>xavatar2.lib;xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xbox\Sentient\libs\SenCore.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;xuirun.lib;xuirender.lib;xuihtml.lib;xonline.lib;xhv2.lib;qnetxaudio2.lib;xbox\4JLibs\libs\4J_Input.lib;xbox\4JLibs\libs\4J_Storage.lib;xbox\4JLibs\libs\4J_Profile.lib;xbox\4JLibs\libs\4J_Render.lib;..\Minecraft.World\ContentPackage\Minecraft.World.lib;xsocialpost.lib;xrnm.lib;xparty.lib;xbox\Sentient\libs\SenNews.lib;xbox\Sentient\libs\SenUGC.lib;xbox\Sentient\libs\SenBoxArt.lib;NuiApi.lib;ST.lib;NuiFitnessApi.lib;NuiHandles.lib;NuiSpeech.lib;NuiAudio.lib;xhttp.lib;xauth.lib;xgetserviceendpoint.lib;xav.lib;xjson.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>xapilib.lib</IgnoreSpecificDefaultLibraries>
       <GenerateMapFile>false</GenerateMapFile>
       <MapExports>false</MapExports>
@@ -1767,7 +1804,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_ReleaseForArt\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>NotSet</ShowProgress>
       <SuppressStartupBanner>false</SuppressStartupBanner>
     </Link>
@@ -1803,7 +1840,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <OptimizeReferences>false</OptimizeReferences>
       <ProgramDatabaseFile>$(OutDir)default.pdb</ProgramDatabaseFile>
       <SetChecksum>true</SetChecksum>
-      <AdditionalDependencies>xavatar2.lib;xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xbox\Sentient\libs\SenCore.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;xuirun.lib;xuirender.lib;xuihtml.lib;xonline.lib;xhv2.lib;qnetxaudio2.lib;xbox\4JLibs\libs\4J_Input.lib;xbox\4JLibs\libs\4J_Storage.lib;xbox\4JLibs\libs\4J_Profile.lib;xbox\4JLibs\libs\4J_Render.lib;..\Minecraft.World\ContentPackage\Minecraft.World.lib;xsocialpost.lib;xrnm.lib;xparty.lib;xbox\Sentient\libs\SenNews.lib;xbox\Sentient\libs\SenUGC.lib;xbox\Sentient\libs\SenBoxArt.lib;NuiApi.lib;ST.lib;NuiFitnessApi.lib;NuiHandles.lib;NuiSpeech.lib;NuiAudio.lib;xhttp.lib;xauth.lib;xgetserviceendpoint.lib;xav.lib;xjson.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>xapilib.lib</IgnoreSpecificDefaultLibraries>
       <GenerateMapFile>false</GenerateMapFile>
       <MapExports>false</MapExports>
@@ -14112,8 +14149,46 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="PSVita\Miles\include\mss.h" />
-    <ClInclude Include="PSVita\Miles\include\rrCore.h" />
+    <ClInclude Include="PSVita\Miles\include\mss.h">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="PSVita\Miles\include\rrCore.h">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="PSVita\Network\SonyVoiceChat_Vita.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
@@ -14225,7 +14300,32 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="PSVita\OldSdk.h" />
+    <ClInclude Include="PSVita\PSVitaExtras\OldSdk.h">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="PSVita\PSVitaExtras\Conf.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
@@ -27664,7 +27764,32 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="PSVita\OldSdk.cpp" />
+    <ClCompile Include="PSVita\PSVitaExtras\OldSdk.cpp">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="PSVita\PSVitaExtras\CustomMap.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
@@ -33883,12 +34008,110 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     </Library>
     <Library Include="PSVita\4JLibs\libs\libSceNpToolkitUtils_rtti.a">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </Library>
+    <Library Include="PSVita\4JLibs\libs\libSceNpToolkitUtils_rtti_dbg.a">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
     </Library>
-    <Library Include="PSVita\4JLibs\libs\libSceNpToolkitUtils_rtti_dbg.a" />
     <Library Include="PSVita\4JLibs\libs\libSceNpToolkit_rtti.a">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </Library>
+    <Library Include="PSVita\4JLibs\libs\libSceNpToolkit_rtti_dbg.a">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
     </Library>
-    <Library Include="PSVita\4JLibs\libs\libSceNpToolkit_rtti_dbg.a" />
     <Library Include="PSVita\Iggy\lib\libiggyperfmon_psp2.a">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
@@ -33963,10 +34186,110 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
     </Library>
-    <Library Include="PSVita\Miles\lib\binkapsp2.a" />
-    <Library Include="PSVita\Miles\lib\fltpsp2.a" />
-    <Library Include="PSVita\Miles\lib\msspsp2.a" />
-    <Library Include="PSVita\Miles\lib\msspsp2midi.a" />
+    <Library Include="PSVita\Miles\lib\binkapsp2.a">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </Library>
+    <Library Include="PSVita\Miles\lib\fltpsp2.a">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </Library>
+    <Library Include="PSVita\Miles\lib\msspsp2.a">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </Library>
+    <Library Include="PSVita\Miles\lib\msspsp2midi.a">
+      <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)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+    </Library>
     <Library Include="Windows64\4JLibs\libs\4J_Input.lib">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
@@ -33976,7 +34299,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
@@ -34029,6 +34352,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
     </Library>
+    <Library Include="Windows64\4JLibs\libs\4J_Profile.lib" />
     <Library Include="Windows64\4JLibs\libs\4J_Render_PC.lib">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
@@ -34045,7 +34369,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
@@ -34089,7 +34413,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">false</ExcludedFromBuild>
@@ -34132,7 +34456,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>

Minecraft.Client/Minecraft.Client.vcxproj.filters

@@ -3772,7 +3772,7 @@
     <ClInclude Include="Common\Leaderboards\LeaderboardInterface.h">
       <Filter>Common\Source Files\Leaderboards</Filter>
     </ClInclude>
-    <ClInclude Include="PSVita\OldSdk.h">
+    <ClInclude Include="PSVita\PSVitaExtras\OldSdk.h">
       <Filter>PSVita</Filter>
     </ClInclude>
   </ItemGroup>
@@ -5916,7 +5916,7 @@
     <ClCompile Include="Common\Leaderboards\LeaderboardInterface.cpp">
       <Filter>Common\Source Files\Leaderboards</Filter>
     </ClCompile>
-    <ClCompile Include="PSVita\OldSdk.cpp">
+    <ClCompile Include="PSVita\PSVitaExtras\OldSdk.cpp">
       <Filter>PSVita</Filter>
     </ClCompile>
   </ItemGroup>
@@ -6176,6 +6176,7 @@
     <Library Include="PSVita\4JLibs\libs\libSceNpToolkitUtils_rtti_dbg.a">
       <Filter>PSVita\4JLibs\libs</Filter>
     </Library>
+    <Library Include="Windows64\4JLibs\libs\4J_Profile.lib" />
   </ItemGroup>
   <ItemGroup>
     <Xsd Include="Xbox\Sentient\SentientStats.xsd">

Minecraft.Client/Minecraft.Client.vcxproj.user

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>

Minecraft.Client/MinecraftServer.cpp

@@ -165,7 +165,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
 	//localIp = settings->getString(L"server-ip", L"");
 	//onlineMode = settings->getBoolean(L"online-mode", true);
 	//motd = settings->getString(L"motd", L"A Minecraft Server");
-	//motd.replace('§', '$');
+	//motd.replace('�', '$');
 
 	setAnimals(settings->getBoolean(L"spawn-animals", true));
 	setNpcsEnabled(settings->getBoolean(L"spawn-npcs", true));
@@ -210,7 +210,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
 
 	// 4J-JEV: Need to wait for levelGenerationOptions to load.
 	while ( app.getLevelGenerationOptions() != NULL && !app.getLevelGenerationOptions()->hasLoadedData() )
-		Sleep(1);
+		Sleep(0);
 
 	if ( app.getLevelGenerationOptions() != NULL && !app.getLevelGenerationOptions()->ready() )
 	{
@@ -319,7 +319,7 @@ int MinecraftServer::runPostUpdate(void* lpParam)
 		{
 			LeaveCriticalSection(&server->m_postProcessCS);
 		}
-		Sleep(1);
+		Sleep(0);
 	} while (!server->m_postUpdateTerminate && ShutdownManager::ShouldRun(ShutdownManager::ePostProcessThread));
 	//#ifndef __PS3__
 	// One final pass through updates to make sure we're done

Minecraft.Client/Orbis/Leaderboards/base64.cpp

@@ -1,7 +1,7 @@
 /* 
    base64.cpp and base64.h
 
-   Copyright (C) 2004-2008 René Nyffenegger
+   Copyright (C) 2004-2008 Ren� Nyffenegger
 
    This source code is provided 'as-is', without any express or implied
    warranty. In no event will the author be held liable for any damages
@@ -21,7 +21,7 @@
 
    3. This notice may not be removed or altered from any source distribution.
 
-   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+   Ren� Nyffenegger rene.nyffenegger@adp-gmbh.ch
 
 */
 
@@ -41,7 +41,7 @@ static inline bool is_base64(unsigned char c) {
 }
 
 // 4J ADDED,
-std::string base64_encode(std::string str)
+std::string base64_encode(const std::string& str)
 {
 	return base64_encode( reinterpret_cast<const unsigned char*>(str.c_str()), str.length() );
 }

Minecraft.Client/Orbis/Leaderboards/base64.h

@@ -2,6 +2,6 @@
 
 #include <string>
 
-std::string base64_encode(std::string str);
+std::string base64_encode(const std::string& str);
 std::string base64_encode(unsigned char const* , unsigned int len);
 std::string base64_decode(std::string const& s);

Minecraft.Client/PS3/Leaderboards/base64.cpp

@@ -1,7 +1,7 @@
 /* 
    base64.cpp and base64.h
 
-   Copyright (C) 2004-2008 René Nyffenegger
+   Copyright (C) 2004-2008 Ren� Nyffenegger
 
    This source code is provided 'as-is', without any express or implied
    warranty. In no event will the author be held liable for any damages
@@ -21,7 +21,7 @@
 
    3. This notice may not be removed or altered from any source distribution.
 
-   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+   Ren� Nyffenegger rene.nyffenegger@adp-gmbh.ch
 
 */
 
@@ -41,7 +41,7 @@ static inline bool is_base64(unsigned char c) {
 }
 
 // 4J ADDED,
-std::string base64_encode(std::string str)
+std::string base64_encode(const std::string& str)
 {
 	return base64_encode( reinterpret_cast<const unsigned char*>(str.c_str()), str.length() );
 }

Minecraft.Client/PS3/Leaderboards/base64.h

@@ -2,6 +2,6 @@
 
 #include <string>
 
-std::string base64_encode(std::string str);
+std::string base64_encode(const std::string& str);
 std::string base64_encode(unsigned char const* , unsigned int len);
 std::string base64_decode(std::string const& s);

Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp

@@ -141,14 +141,12 @@ void ShutdownManager::SysUtilCallback(uint64_t status, uint64_t param, void *use
 		StartShutdown();
 		break;
 	case CELL_SYSUTIL_SYSTEM_MENU_OPEN:
-		// Tell the game UI to stop processing
+	case CELL_SYSUTIL_DRAWING_BEGIN:
 		StorageManager.SetSystemUIDisplaying(true);
 		break;
 	case CELL_SYSUTIL_DRAWING_END:
-		StorageManager.SetSystemUIDisplaying(false);
-		break;
-	case CELL_SYSUTIL_DRAWING_BEGIN:
 	case CELL_SYSUTIL_SYSTEM_MENU_CLOSE:
+		StorageManager.SetSystemUIDisplaying(false);
 		break;
 	case CELL_SYSUTIL_BGMPLAYBACK_PLAY:
 		if( minecraft )

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj

@@ -171,15 +171,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -211,8 +211,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -234,8 +237,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -257,9 +263,12 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
       <StripMode>Hard</StripMode>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/Common/Prebuild.ps1

@@ -0,0 +1,15 @@
+# str1k3r - This prebuild makes sure that the ObjFiles directory exists so the PS3 SPU tasks can properly build
+param(
+    [string]$ProjectDir,
+    [string]$Configuration
+)
+
+$ParentDir = Split-Path -Path $ProjectDir -Parent
+
+$directories = @(
+    "ObjFiles\$Configuration"
+)
+
+foreach ($dir in $directories) {
+    New-Item -ItemType Directory -Path (Join-Path $ParentDir $dir) -Force | Out-Null
+}

Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile.spu.vcxproj

@@ -65,15 +65,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -104,8 +104,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -127,8 +130,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -150,9 +156,12 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
       <StripMode>Hard</StripMode>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.spu.vcxproj

@@ -61,15 +61,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -100,8 +100,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -123,8 +126,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -146,9 +152,12 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
       <StripMode>Hard</StripMode>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.spu.vcxproj

@@ -57,15 +57,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_Release\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -96,8 +96,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -119,8 +122,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -142,8 +148,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.spu.vcxproj

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="us-ascii"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="ContentPackage|PS3">
+      <Configuration>ContentPackage</Configuration>
+      <Platform>PS3</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|PS3">
       <Configuration>Debug</Configuration>
       <Platform>PS3</Platform>
@@ -25,6 +29,10 @@
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>SPU</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>SPU</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>SPU</PlatformToolset>
@@ -35,25 +43,34 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">false</GenerateManifest>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(ProjectName)</TargetName>
     <SpursUsage>SpursInit</SpursUsage>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
     <ClCompile>
@@ -74,7 +91,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -96,8 +117,37 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
+    <ClCompile>
+      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OptimizationLevel>Level3</OptimizationLevel>
+      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <SpuElfConversion>
+      <EmbedFormat>JobBin2</EmbedFormat>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
+    </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.spu.vcxproj

@@ -56,15 +56,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -95,8 +95,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -119,8 +122,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -143,9 +149,12 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
       <StripMode>Hard</StripMode>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.spu.vcxproj

@@ -56,15 +56,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -95,8 +95,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -119,8 +122,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -143,9 +149,12 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
       <StripMode>Hard</StripMode>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.spu.vcxproj

@@ -56,15 +56,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -95,8 +95,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -119,8 +122,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -143,9 +149,12 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
       <StripMode>Hard</StripMode>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise.spu.vcxproj

@@ -61,15 +61,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -101,8 +101,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -125,8 +128,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -149,9 +155,12 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
       <StripMode>Hard</StripMode>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.spu.vcxproj

@@ -56,15 +56,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -95,8 +95,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -119,8 +122,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -143,9 +149,12 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
       <StripMode>Hard</StripMode>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PS3/SPU_Tasks/SPU_Tasks.sln

@@ -13,60 +13,89 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LevelRenderer_FindNearestCh
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Texture_blit", "Texture_blit\Texture_blit.spu.vcxproj", "{A71AAA51-6541-4348-9814-E5FE2D36183B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompressedTileStorage_getData", "CompressedTileStorage_getData\CompressedTileStorage_getData.spu.vcxproj", "{ED672663-B86E-436B-9530-A6589DE02366}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRenderer_updateLightTexture", "GameRenderer_updateLightTexture\GameRenderer_updateLightTexture.spu.vcxproj", "{1F6ECBFE-3089-457D-8A11-5CFDC0392439}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LevelRenderer_zSort", "LevelRenderer_zSort\LevelRenderer_zSort.spu.vcxproj", "{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerlinNoise", "PerlinNoise\PerlinNoise.spu.vcxproj", "{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Renderer_TextureUpdate", "Renderer_TextureUpdate\Renderer_TextureUpdate.spu.vcxproj", "{AEC81E5C-04B5-4F77-91A0-D94065F885B7}"
+EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 7
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = CompressedTile\\CompressedTile.spu.vcxproj
-		SccProjectName1 = CompressedTile
-		SccLocalPath1 = CompressedTile
-		SccProjectUniqueName2 = LevelRenderer_cull\\LevelRenderer_cull.spu.vcxproj
-		SccProjectName2 = LevelRenderer_cull
-		SccLocalPath2 = LevelRenderer_cull
-		SccProjectUniqueName3 = ChunkUpdate\\ChunkUpdate.spu.vcxproj
-		SccProjectName3 = ChunkUpdate
-		SccLocalPath3 = ChunkUpdate
-		SccProjectUniqueName4 = CompressedTileStorage_compress\\CompressedTileStorage_compress.spu.vcxproj
-		SccProjectName4 = CompressedTileStorage_compress
-		SccLocalPath4 = CompressedTileStorage_compress
-		SccProjectUniqueName5 = LevelRenderer_FindNearestChunk\\LevelRenderer_FindNearestChunk.spu.vcxproj
-		SccProjectName5 = LevelRenderer_FindNearestChunk
-		SccLocalPath5 = LevelRenderer_FindNearestChunk
-		SccProjectUniqueName6 = Texture_blit\\Texture_blit.spu.vcxproj
-		SccProjectName6 = Texture_blit
-		SccLocalPath6 = Texture_blit
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		ContentPackage|PS3 = ContentPackage|PS3
 		Debug|PS3 = Debug|PS3
 		Release|PS3 = Release|PS3
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
 		{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Debug|PS3.ActiveCfg = Debug|PS3
 		{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Debug|PS3.Build.0 = Debug|PS3
 		{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Release|PS3.ActiveCfg = Release|PS3
 		{4B7786BE-4F10-4FAA-A75A-631DF39570DD}.Release|PS3.Build.0 = Release|PS3
+		{4B436D43-D35B-4E56-988A-A3543B70C8E5}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{4B436D43-D35B-4E56-988A-A3543B70C8E5}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
 		{4B436D43-D35B-4E56-988A-A3543B70C8E5}.Debug|PS3.ActiveCfg = Debug|PS3
 		{4B436D43-D35B-4E56-988A-A3543B70C8E5}.Debug|PS3.Build.0 = Debug|PS3
 		{4B436D43-D35B-4E56-988A-A3543B70C8E5}.Release|PS3.ActiveCfg = Release|PS3
 		{4B436D43-D35B-4E56-988A-A3543B70C8E5}.Release|PS3.Build.0 = Release|PS3
+		{297888B4-8234-461B-9861-214988A95711}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{297888B4-8234-461B-9861-214988A95711}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
 		{297888B4-8234-461B-9861-214988A95711}.Debug|PS3.ActiveCfg = Debug|PS3
 		{297888B4-8234-461B-9861-214988A95711}.Debug|PS3.Build.0 = Debug|PS3
 		{297888B4-8234-461B-9861-214988A95711}.Release|PS3.ActiveCfg = Release|PS3
 		{297888B4-8234-461B-9861-214988A95711}.Release|PS3.Build.0 = Release|PS3
+		{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
 		{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Debug|PS3.ActiveCfg = Debug|PS3
 		{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Debug|PS3.Build.0 = Debug|PS3
 		{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Release|PS3.ActiveCfg = Release|PS3
 		{0FC6FCFB-7793-4EEE-8356-2C129621C67A}.Release|PS3.Build.0 = Release|PS3
+		{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
 		{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Debug|PS3.ActiveCfg = Debug|PS3
 		{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Debug|PS3.Build.0 = Debug|PS3
 		{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Release|PS3.ActiveCfg = Release|PS3
 		{E26485AE-71A5-4785-A14D-6456FF7C4FB0}.Release|PS3.Build.0 = Release|PS3
+		{A71AAA51-6541-4348-9814-E5FE2D36183B}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{A71AAA51-6541-4348-9814-E5FE2D36183B}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
 		{A71AAA51-6541-4348-9814-E5FE2D36183B}.Debug|PS3.ActiveCfg = Debug|PS3
 		{A71AAA51-6541-4348-9814-E5FE2D36183B}.Debug|PS3.Build.0 = Debug|PS3
 		{A71AAA51-6541-4348-9814-E5FE2D36183B}.Release|PS3.ActiveCfg = Release|PS3
 		{A71AAA51-6541-4348-9814-E5FE2D36183B}.Release|PS3.Build.0 = Release|PS3
+		{ED672663-B86E-436B-9530-A6589DE02366}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{ED672663-B86E-436B-9530-A6589DE02366}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
+		{ED672663-B86E-436B-9530-A6589DE02366}.Debug|PS3.ActiveCfg = Debug|PS3
+		{ED672663-B86E-436B-9530-A6589DE02366}.Debug|PS3.Build.0 = Debug|PS3
+		{ED672663-B86E-436B-9530-A6589DE02366}.Release|PS3.ActiveCfg = Release|PS3
+		{ED672663-B86E-436B-9530-A6589DE02366}.Release|PS3.Build.0 = Release|PS3
+		{1F6ECBFE-3089-457D-8A11-5CFDC0392439}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{1F6ECBFE-3089-457D-8A11-5CFDC0392439}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
+		{1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Debug|PS3.ActiveCfg = Debug|PS3
+		{1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Debug|PS3.Build.0 = Debug|PS3
+		{1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Release|PS3.ActiveCfg = Release|PS3
+		{1F6ECBFE-3089-457D-8A11-5CFDC0392439}.Release|PS3.Build.0 = Release|PS3
+		{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
+		{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Debug|PS3.ActiveCfg = Debug|PS3
+		{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Debug|PS3.Build.0 = Debug|PS3
+		{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Release|PS3.ActiveCfg = Release|PS3
+		{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}.Release|PS3.Build.0 = Release|PS3
+		{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
+		{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Debug|PS3.ActiveCfg = Debug|PS3
+		{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Debug|PS3.Build.0 = Debug|PS3
+		{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Release|PS3.ActiveCfg = Release|PS3
+		{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}.Release|PS3.Build.0 = Release|PS3
+		{AEC81E5C-04B5-4F77-91A0-D94065F885B7}.ContentPackage|PS3.ActiveCfg = ContentPackage|PS3
+		{AEC81E5C-04B5-4F77-91A0-D94065F885B7}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
+		{AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Debug|PS3.ActiveCfg = Debug|PS3
+		{AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Debug|PS3.Build.0 = Debug|PS3
+		{AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Release|PS3.ActiveCfg = Release|PS3
+		{AEC81E5C-04B5-4F77-91A0-D94065F885B7}.Release|PS3.Build.0 = Release|PS3
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.spu.vcxproj

@@ -56,15 +56,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(Platform)_$(Configuration)\</IntDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
@@ -95,8 +95,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
     <ClCompile>
@@ -119,8 +122,11 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <ClCompile>
@@ -143,9 +149,12 @@
     </Link>
     <SpuElfConversion>
       <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
+      <OutputFile>..\ObjFiles\$(Configuration)\$(TargetName).ppu$(ObjectExt)</OutputFile>
       <StripMode>Hard</StripMode>
     </SpuElfConversion>
+    <PreBuildEvent>
+      <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)../Common/Prebuild.ps1" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)/" </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h

@@ -10,7 +10,7 @@
 
 #include "..\..\Common\Network\Sony\SQRNetworkManager.h"
 
-#include "../OldSdk.h"
+#include "../PSVitaExtras/OldSdk.h"
 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;

Minecraft.Client/PSVita/PSVitaExtras/OldSdk.cpp

@@ -0,0 +1,51 @@
+#include "stdafx.h"
+#include "OldSdk.h"
+
+int sceNpBasicGetFriendOnlineStatus(const SceNpId *friendId, SceNpBasicOnlineStatus *status) {
+	if (status) *status = SCE_NP_BASIC_ONLINE_STATUS_UNKNOWN;
+	return -1;
+}
+
+int sceNpBasicGetFriendContextState(const SceNpId *friendId, SceNpBasicFriendContextState *state) {
+	if (state) *state = SCE_NP_BASIC_FRIEND_CONTEXT_STATE_UNKNOWN;
+	return -1;
+}
+
+int sceNpBasicGetGamePresenceOfFriend(const SceNpId *friendId, SceNpBasicGamePresence *presence) {
+	if (presence) memset(presence, 0, sizeof(SceNpBasicGamePresence));
+	return -1;
+}
+
+int sceNpBasicGetFriendListEntryCount(SceSize *count) {
+	if (count) *count = 0;
+	return 0;
+}
+
+int sceNpBasicGetFriendListEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved) {
+	if (retrieved) *retrieved = 0;
+	return 0;
+}
+
+int sceNpBasicGetFriendRequestEntryCount(SceSize *count) {
+	if (count) *count = 0;
+	return 0;
+}
+
+int sceNpBasicGetFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved) {
+	if (retrieved) *retrieved = 0;
+	return 0;
+}
+
+int sceNpBasicGetRequestedFriendRequestEntryCount(SceSize *count) {
+	if (count) *count = 0;
+	return 0;
+}
+
+int sceNpBasicGetRequestedFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved) {
+	if (retrieved) *retrieved = 0;
+	return 0;
+}
+
+SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEventParam *eventParam, SceAppUtilNpBasicJoinablePresenceParam *param) {
+	return -1;
+}

Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h

@@ -0,0 +1,53 @@
+#pragma once
+#ifndef _OLD_SDK_H
+#define _OLD_SDK_H 1 
+
+#include <np.h>
+#include <np/np_basic.h>
+#include <apputil.h>
+#include <np_toolkit.h>
+#include <np_toolkit\friends_interface.h>
+
+typedef enum {
+	SCE_NP_BASIC_ONLINE_STATUS_UNKNOWN = 0,
+	SCE_NP_BASIC_ONLINE_STATUS_OFFLINE = 1,
+	SCE_NP_BASIC_ONLINE_STATUS_AFK = 2,
+	SCE_NP_BASIC_ONLINE_STATUS_ONLINE = 3
+} SceNpBasicOnlineStatus;
+
+typedef void(*SceNpBasicFriendOnlineStatusEventHandler)(
+	const SceNpId *friendId,
+	SceNpBasicOnlineStatus status,
+	void *userdata
+	);
+
+typedef enum {
+	SCE_NP_BASIC_FRIEND_CONTEXT_STATE_UNKNOWN = 0,
+	SCE_NP_BASIC_FRIEND_CONTEXT_STATE_OUT_OF_CONTEXT = 1,
+	SCE_NP_BASIC_FRIEND_CONTEXT_STATE_IN_CONTEXT = 2
+} SceNpBasicFriendContextState;
+
+typedef void(*SceNpBasicFriendContextEventHandler)(
+	const SceNpId *friendId,
+	SceNpBasicFriendContextState state,
+	void *userdata
+	);
+typedef struct SceAppUtilNpBasicJoinablePresenceParam {
+	SceNpCommunicationId	commId;
+	SceNpId					npId;
+} SceAppUtilNpBasicJoinablePresenceParam;
+
+int sceNpBasicGetFriendOnlineStatus(const SceNpId *friendId, SceNpBasicOnlineStatus *status);
+int sceNpBasicGetFriendContextState(const SceNpId *friendId, SceNpBasicFriendContextState *state);
+int sceNpBasicGetGamePresenceOfFriend(const SceNpId *friendId, SceNpBasicGamePresence *presence);
+int sceNpBasicGetFriendListEntryCount(SceSize *count);
+int sceNpBasicGetFriendListEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved);
+int sceNpBasicGetFriendRequestEntryCount(SceSize *count);
+int sceNpBasicGetFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved);
+int sceNpBasicGetRequestedFriendRequestEntryCount(SceSize *count);
+int sceNpBasicGetRequestedFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved);
+SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEventParam *eventParam, SceAppUtilNpBasicJoinablePresenceParam *param);
+
+#define SCE_APPUTIL_APPEVENT_TYPE_NP_BASIC_JOINABLE_PRESENCE	(3)	
+
+#endif

Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp

@@ -141,14 +141,12 @@ void ShutdownManager::SysUtilCallback(uint64_t status, uint64_t param, void *use
 		StartShutdown();
 		break;
 	case CELL_SYSUTIL_SYSTEM_MENU_OPEN:
-		// Tell the game UI to stop processing
+	case CELL_SYSUTIL_DRAWING_BEGIN:
 		StorageManager.SetSystemUIDisplaying(true);
 		break;
 	case CELL_SYSUTIL_DRAWING_END:
-		StorageManager.SetSystemUIDisplaying(false);
-		break;
-	case CELL_SYSUTIL_DRAWING_BEGIN:
 	case CELL_SYSUTIL_SYSTEM_MENU_CLOSE:
+		StorageManager.SetSystemUIDisplaying(false);
 		break;
 	case CELL_SYSUTIL_BGMPLAYBACK_PLAY:
 		if( minecraft )

Minecraft.World/Connection.cpp

@@ -341,7 +341,7 @@ bool Connection::readTick()
 //		printf("Con:0x%x readTick close EOS\n",this);
 
 		// 4J Stu - Remove this line
-		// Fix for #10410 - UI: If the player is removed from a splitscreened host’s game, the next game that player joins will produce a message stating that the host has left.
+		// Fix for #10410 - UI: If the player is removed from a splitscreened host�s game, the next game that player joins will produce a message stating that the host has left.
 		//close(DisconnectPacket::eDisconnect_EndOfStream);
 	}
 
@@ -666,7 +666,7 @@ int Connection::runClose(void* lpParam)
 
 	//try {
 
-	Sleep(2000);
+	Sleep(500);
 	if (con->running)
 	{
 		// 4J TODO writeThread.interrupt();
@@ -690,7 +690,7 @@ int Connection::runSendAndQuit(void* lpParam)
 
 	//try {
 
-	Sleep(2000);
+	Sleep(500);
 	if (con->running)
 	{
 		// 4J TODO writeThread.interrupt();

Minecraft.World/Minecraft.World.vcxproj

@@ -857,7 +857,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>_LARGE_WORLDS;_FINAL_BUILD;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ShowIncludes>false</ShowIncludes>
@@ -1237,9 +1237,10 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>_FINAL_BUILD;NDEBUG;_WINDOWS64;_LIB;_CONTENT_PACKAGE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_FINAL_BUILD;_CONTENT_PACKAGE;_WINDOWS64;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

Minecraft.World/Minecraft.World.vcxproj.user

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>

README.md

@@ -7,13 +7,16 @@ Cafeberry is a project aiming to update the December 17th 2014 codebase (mostly)
 | Platform       | Development Status    | Known Issues                                                              |
 | :------------- | :-------------------- | :------------------------------------------------------------------------ |
 | PS3            | Active                | SPU variants for TU19 blocks are missing, needs to be further optimized.  |
-| Xbox 360       | On hold               | Havent tested, should work?                                               |
-| PS4            | Active                | Only buildable on Windows 7 With 1.70 SDK. See Notes                      |
+| Xbox 360       | Active                | Works, Crashes when using updated XUI Scenes. See Notes                   |
+| PS4            | Active                | Only Easily buildable on Windows 7. See Notes                             |
 | Xbox One       | On hold               | Needs to be re-coded to run on Developer Mode UWP instead.                |
-| PS Vita        | Active                | Only buildable on Windows 7 With 3.75 SDK.                                |
+| PSVita         | Active                | Buildable With 3.570 or 3.750 SDK.                                        |
 | Wii U & Switch | Work in progress      | UI System (ImXui) is still in progress, need to decompile the rest.       |
 
 **Notes:**
 - **PS4:** Can't be built on Windows 10+ because the 1.70 SDK only supports Windows 7, solutions:
   1. Attempt to add support for 4.50 SDK (difficult or unlikely to work)
-  2. Getting the 1.70 SDK on Windows 10+ (annoying to do)
+  2. Force the 1.70 SDK on Windows 10+ (Takes 5-15m)
+- **Xbox 360:** Needs XUI Scenes from TU18+, solutions:
+  1. Get XURS from built .xex's and turn them back into XUI file's
+  2. Recreate XUI scenes based off of Iggy scenes from TU57+