wip_feat(PS3): Implement SPU variants for a portion of TU19's blocks

crashes at a stack overflow, cant be assed to fix it atm

.gitea/workflows/release.yaml

@@ -1,106 +0,0 @@
-name: Build & Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version tag for release (e.g. v1.0.0).'
-        required: true
-        default: ''
-      notes:
-        description: 'URL to notes for release.'
-        required: false
-        default: ''
-
-jobs:
-  validate:
-    runs-on: windows-2022
-    steps:
-      - name: Validate version format
-        run: |
-          if (-not ("${{ inputs.version }}" -match '^v\d+\.\d+\.\d+[a-zA-Z0-9.-]*$')) {
-            Write-Error "Version '${{ inputs.version }}' doesn't match expected format (e.g. v1.0.0)"
-            exit 1
-          }
-
-  build:
-    runs-on: windows-2022
-
-    strategy:
-      matrix:
-        configuration: [Release]
-        platform: [PS3, Windows64] #[PS3, PSVita, Xbox 360, ORBIS, Windows64]
-
-    steps:
-      - name: Checkout Repository
-        uses: https://github.com/actions/checkout@v4
-
-      - name: Build Cafeberry
-        run: |
-          & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
-            /p:Configuration=${{ matrix.configuration }} `
-            /p:Platform=${{ matrix.platform }} `
-            /m
-
-      - name: Zip Build (Consoles)
-        if: matrix.platform != 'Windows64'
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
-
-      - name: Zip Build (Windows64)
-        if: matrix.platform == 'Windows64'
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./x64/${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
-
-      - name: Stage artifacts
-        run: |
-          New-Item -ItemType Directory -Force -Path staging
-          Copy-Item LCE${{ matrix.platform }}.zip staging/ 
-
-      - name: Stage exe
-        if: matrix.platform == 'Windows64'
-        run: |
-          Copy-Item ./x64/${{ matrix.configuration }}/Minecraft.Client.exe staging/
-
-      - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
-        with:
-          name: build-${{ matrix.platform }}
-          path: staging/*
-
-  release:
-    needs: build
-    runs-on: windows-2022
-    steps:
-      - name: Download all build artifacts
-        uses: https://github.com/actions/download-artifact@v3
-        with:
-          path: downloaded
-
-      - name: Fetch release notes
-        id: notes
-        run: |
-          $notesSource = "${{ inputs.notes }}"
-          $fallback = "## Cafeberry`n`n### Whoever made this release forgot to put notes, sorry!"
-
-          if ($notesSource -match '^https?://') {
-            try {
-              $body = (Invoke-WebRequest -Uri $notesSource -UseBasicParsing).Content
-              if ([string]::IsNullOrWhiteSpace($body)) { $body = $fallback }
-            } catch {
-              $body = $fallback
-            }
-          }
-
-          "description<<EOF`n$body`nEOF" | Out-File -Append -Encoding utf8 -NoNewline:$false $env:GITHUB_OUTPUT
-
-      - name: Publish Release
-        uses: akkuman/gitea-release-action@v1
-        with:
-          name: ${{ inputs.version }}
-          server_url: ${{ gitea.server_url }}
-          repository: ${{ gitea.repository }}
-          token: ${{ gitea.token }}
-          tag_name: ${{ inputs.version }}
-          prerelease: false
-          verbose: true
-          files: downloaded/**/*
-          body: ${{ steps.notes.outputs.description }}

Minecraft.Client/ClientConnection.cpp

@@ -1941,7 +1941,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 	isAtLeastOneFriend = TRUE;
 	cantPlayContentRestricted= FALSE;
 
-#if !defined DISABLE_PSN && ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
+#if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
 
 	if(!g_NetworkManager.IsHost() && !app.GetGameHostOption(eGameHostOption_FriendsOfFriends))
 	{

Minecraft.Client/Common/App_structs.h

@@ -162,7 +162,7 @@ MOJANG_DATA;
 typedef struct  
 {
 	eDLCContentType eDLCType;
-#if !defined(DISABLE_PSN) && defined( __PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if defined( __PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 	char chImageURL[256];//SCE_NP_COMMERCE2_URL_LEN
 #else
 

Minecraft.Client/Common/Consoles_App.cpp

@@ -5094,9 +5094,6 @@ void CMinecraftApp::NotificationsCallback(LPVOID pParam,DWORD dwNotification, un
 #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 int CMinecraftApp::MustSignInFullVersionPurchaseReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #ifdef __PS3__
@@ -5109,15 +5106,11 @@ int CMinecraftApp::MustSignInFullVersionPurchaseReturned(void *pParam,int iPad,C
 	}
 
 	return 0;
-#endif
 }
 
 #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #ifdef __PS3__
@@ -5133,7 +5126,6 @@ int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial(void *pParam,i
 	app.SetAction(iPad,eAppAction_ExitWorldTrial);	
 
 	return 0;
-#endif
 }
 #endif
 
@@ -6769,7 +6761,7 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
 #endif
 }
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 unordered_map<PlayerUID, MOJANG_DATA *, PlayerUID::Hash> CMinecraftApp::MojangData;
 unordered_map<int, char * >  CMinecraftApp::DLCTextures_PackID;
 unordered_map<string, DLC_INFO * >  CMinecraftApp::DLCInfo;
@@ -6780,12 +6772,6 @@ unordered_map<int, wstring >  CMinecraftApp::DLCTextures_PackID; // for mash-up
 //unordered_map<ULONGLONG,DLC_INFO * > CMinecraftApp::DLCInfo_Trial; // full offerid, dlc_info
 unordered_map<wstring,DLC_INFO * > CMinecraftApp::DLCInfo_Full; // full offerid, dlc_info
 unordered_map<wstring, wstring >  CMinecraftApp::DLCInfo_SkinName; // skin name, full offer id
-#elif defined(DISABLE_PSN) && defined(__PS3__)
-unordered_map<PlayerUID, MOJANG_DATA *, PlayerUID::Hash> CMinecraftApp::MojangData;
-unordered_map<int, ULONGLONG >  CMinecraftApp::DLCTextures_PackID;
-unordered_map<ULONGLONG, DLC_INFO * >  CMinecraftApp::DLCInfo_Trial;
-unordered_map<ULONGLONG, DLC_INFO * >  CMinecraftApp::DLCInfo_Full;
-unordered_map<wstring, ULONGLONG >  CMinecraftApp::DLCInfo_SkinName;
 #else
 unordered_map<PlayerUID, MOJANG_DATA *> CMinecraftApp::MojangData;
 unordered_map<int, ULONGLONG >  CMinecraftApp::DLCTextures_PackID;
@@ -6868,7 +6854,7 @@ HRESULT CMinecraftApp::RegisterConfigValues(WCHAR *pType, int iValue)
 	return hr;
 }
 
-#if (defined _XBOX || defined _WINDOWS64 || defined DISABLE_PSN)
+#if (defined _XBOX || defined _WINDOWS64)
 HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGender, __uint64 ullOfferID_Full, __uint64 ullOfferID_Trial, WCHAR *pFirstSkin, unsigned int uiSortIndex, int iConfig, WCHAR *pDataFile)
 {
 	HRESULT hr=S_OK;
@@ -7060,7 +7046,7 @@ HRESULT CMinecraftApp::RegisterDLCData(char *pchDLCName, unsigned int uiSortInde
 
 
 
-#if !defined(DISABLE_PSN) && defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal)
 {
 	AUTO_VAR(it, DLCInfo_SkinName.find(FirstSkin));
@@ -7328,7 +7314,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForProductName(WCHAR *pwchProductName)
 	return NULL;
 }
 
-#elif !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#elif defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 #else
 
 DLC_INFO *CMinecraftApp::GetDLCInfoForFullOfferID(ULONGLONG ullOfferID_Full)
@@ -9439,7 +9425,7 @@ byteArray CMinecraftApp::getArchiveFile(const wstring &filename)
 
 // DLC
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 int CMinecraftApp::GetDLCInfoCount() 
 { 
 	return (int)DLCInfo.size();

Minecraft.Client/Common/Consoles_App.h

@@ -594,7 +594,7 @@ public:
 	MOJANG_DATA *GetMojangDataForXuid(PlayerUID xuid);
 	static HRESULT RegisterConfigValues(WCHAR *pType, int iValue);
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 	HRESULT RegisterDLCData(char *pchDLCName, unsigned int uiSortIndex, char *pchImageURL);
 	bool GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal);
 	DLC_INFO *GetDLCInfoForTrialOfferID(ULONGLONG ullOfferID_Trial);
@@ -631,7 +631,7 @@ private:
 
 	std::vector <SCreditTextItemDef *> vDLCCredits;
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 	static unordered_map<PlayerUID,MOJANG_DATA *, PlayerUID::Hash > MojangData;
 	static unordered_map<int, char * >  DLCTextures_PackID; // for mash-up packs & texture packs
 	static unordered_map<string,DLC_INFO * > DLCInfo; 
@@ -642,12 +642,6 @@ private:
 	//static unordered_map<wstring,DLC_INFO * > DLCInfo_Trial; // full offerid, dlc_info
 	static unordered_map<wstring,DLC_INFO * > DLCInfo_Full; // full offerid, dlc_info
 	static unordered_map<wstring, wstring >  DLCInfo_SkinName; // skin name, full offer id
-#elif defined(DISABLE_PSN) && defined(__PS3__)
-	static unordered_map<PlayerUID,MOJANG_DATA *, PlayerUID::Hash > MojangData;
-	static unordered_map<int, ULONGLONG >  DLCTextures_PackID; // for mash-up packs & texture packs
-	static unordered_map<ULONGLONG,DLC_INFO * > DLCInfo_Trial; // full offerid, dlc_info
-	static unordered_map<ULONGLONG,DLC_INFO * > DLCInfo_Full; // full offerid, dlc_info
-	static unordered_map<wstring, ULONGLONG >  DLCInfo_SkinName; // skin name, full offer id
 #else
 	static unordered_map<PlayerUID,MOJANG_DATA * > MojangData;
 	static unordered_map<int, ULONGLONG >  DLCTextures_PackID; // for mash-up packs & texture packs
@@ -778,7 +772,7 @@ public:
 	void			ClearTMSPPFilesRetrieved();
 	unsigned int	AddTMSPPFileTypeRequest(eDLCContentType eType, bool bPromote=false);
 	int				GetDLCInfoTexturesOffersCount();
-#if !defined(DISABLE_PSN) && defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 	DLC_INFO *GetDLCInfo(int iIndex);	
 	DLC_INFO *GetDLCInfo(char *);
 	DLC_INFO *GetDLCInfoFromTPackID(int iTPID);

Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp

@@ -9,9 +9,7 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
 		L"Friends", L"MyScore", L"TopRank"
 	};
 
-#if !defined(_DURANGO) && !defined(_WINDOWS64) && !defined(_XBOX) && !defined(__ORBIS__) // str1k3r - some platforms complain about this, also this wasnt in the leak?
 LeaderboardManager *LeaderboardManager::m_instance = NULL;
-#endif
 
 void LeaderboardManager::DeleteInstance()
 {

Minecraft.Client/Common/Network/GameNetworkManager.cpp

@@ -68,7 +68,7 @@ void CGameNetworkManager::Initialise()
 	int flagIndexSize = LevelRenderer::getGlobalChunkCount() / (Level::maxBuildHeight / 16);		// dividing here by number of renderer chunks in one column
 #ifdef _XBOX
 	s_pPlatformNetworkManager = new CPlatformNetworkManagerXbox();
-#elif !defined(DISABLE_PSN) && defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
+#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
 	s_pPlatformNetworkManager = new CPlatformNetworkManagerSony();
 #elif defined _DURANGO
 	s_pPlatformNetworkManager = new CPlatformNetworkManagerDurango();
@@ -167,11 +167,6 @@ bool CGameNetworkManager::_RunNetworkGame(LPVOID lpParameter)
 			return true;
 		}
 	}
-	else
-	{
-		// Client needs QNET_STATE_GAME_PLAY so that IsInGameplay() returns true
-		s_pPlatformNetworkManager->SetGamePlayState();
-	}
 	
 	if( g_NetworkManager.IsLeavingGame() ) return false;
 
@@ -341,12 +336,10 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 
 	// 4J Stu - Wait a while to make sure that DLC is loaded. This is the last point before the network communication starts
 	// so the latest we can check this
-#ifndef DISABLE_PSN
 	while( !app.DLCInstallProcessCompleted() && app.DLCInstallPending() && !g_NetworkManager.IsLeavingGame() )
 	{
 		Sleep( 10 );
 	}
-#endif
 	if( g_NetworkManager.IsLeavingGame() )
 	{
 		MinecraftServer::HaltServer();
@@ -503,7 +496,7 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 				// The connections should tick at 20 per second
 				Sleep(50);
 				app.DebugPrintf("<***> %d %d %d %d %d\n",IsInSession(), !connection->isStarted(),!connection->isClosed(),ProfileManager.IsSignedIn(idx),!g_NetworkManager.IsLeavingGame());
-#if defined _XBOX || defined __PS3__ && !defined DISABLE_PSN
+#if defined _XBOX || __PS3__
 			} while (IsInSession() && !connection->isStarted() && !connection->isClosed() && ProfileManager.IsSignedIn(idx) && !g_NetworkManager.IsLeavingGame() );
 #else
 				// TODO - This SHOULD be something just like the code above but temporarily changing here so that we don't have to depend on the profilemanager behaviour
@@ -801,7 +794,7 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void *pParam,bool bContin
 
 			// Check if user-created content is allowed, as we cannot play multiplayer if it's not
 			bool noUGC = false;
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__PSVITA__)
+#if defined(__PS3__) || defined(__PSVITA__)
 			ProfileManager.GetChatAndContentRestrictions(iPad,false,&noUGC,NULL,NULL);
 #elif defined(__ORBIS__)
 			ProfileManager.GetChatAndContentRestrictions(iPad,false,NULL,&noUGC,NULL);
@@ -1014,9 +1007,6 @@ int	CGameNetworkManager::ExitAndJoinFromInviteThreadProc( void* lpParam )
 // The pair of methods MustSignInReturned_0 & PSNSignInReturned_0 handle this
 int	CGameNetworkManager::MustSignInReturned_0(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #ifdef __PS3__
@@ -1035,14 +1025,10 @@ int	CGameNetworkManager::MustSignInReturned_0(void *pParam,int iPad,C4JStorage::
 	}
 
 	return 0;
-#endif
 }
 
 int CGameNetworkManager::PSNSignInReturned_0(void* pParam, bool bContinue, int iPad)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	JoinFromInviteData *inviteData = (JoinFromInviteData *)pParam;
 
 	// If the invite data isn't set up yet (indicated by it being all zeroes, easiest detected via the net version), then try and get it again... this can happen if we got
@@ -1075,16 +1061,12 @@ int CGameNetworkManager::PSNSignInReturned_0(void* pParam, bool bContinue, int i
 	}
 
 	return 0;
-#endif
 }
 
 // This case happens when we were in the main menus when we got an invite, and weren't signed in... now can proceed with the normal flow of code for this situation
 // The pair of methods MustSignInReturned_1 & PSNSignInReturned_1 handle this
 int	CGameNetworkManager::MustSignInReturned_1(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #ifdef __PS3__
@@ -1096,14 +1078,10 @@ int	CGameNetworkManager::MustSignInReturned_1(void *pParam,int iPad,C4JStorage::
 #endif
 	}
 	return 0;
-#endif
 }
 
 int CGameNetworkManager::PSNSignInReturned_1(void* pParam, bool bContinue, int iPad)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	INVITE_INFO *inviteInfo = (INVITE_INFO *)pParam;
 
 	// If the invite data isn't set up yet (indicated by it being all zeroes, easiest detected via the net version), then try and get it again... this can happen if we got
@@ -1131,7 +1109,6 @@ int CGameNetworkManager::PSNSignInReturned_1(void* pParam, bool bContinue, int i
 	}
 
 	return 0;
-#endif
 }
 #endif
 
@@ -1469,7 +1446,7 @@ void CGameNetworkManager::StateChange_AnyToEnding(bool bStateWasPlaying)
 			if(pNetworkPlayer != NULL && ProfileManager.IsSignedIn( i ) )
 			{
 				app.DebugPrintf("Stats save for an offline game for the player at index %d\n", i );
-				//Minecraft::GetInstance()->forceStatsSave(pNetworkPlayer->GetUserIndex());
+				Minecraft::GetInstance()->forceStatsSave(pNetworkPlayer->GetUserIndex());
 			}
 		}
 	}
@@ -1812,7 +1789,7 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
 #endif
 		if( !g_NetworkManager.IsInSession() )
 		{	
-#if !defined(DISABLE_PSN) && defined (__PS3__) || defined (__PSVITA__)
+#if defined (__PS3__) || defined (__PSVITA__)
 			// PS3 is more complicated here - we need to make sure that the player is online. If they are then we can do the same as the xbox, if not we need to try and get them online and then, if they do sign in, go down the same path
 			
 			// Determine why they're not "signed in live"
@@ -1962,7 +1939,7 @@ void CGameNetworkManager::HandleDisconnect(bool bLostRoomOnly)
 	if((g_NetworkManager.GetLockedProfile()!=-1) && iPrimaryPlayer!=-1 && g_NetworkManager.IsInSession() )
 	{
 		m_bLastDisconnectWasLostRoomOnly = bLostRoomOnly;
-#if !defined(DISABLE_PSN) && defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
+#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 		m_bSignedOutofPSN=bPSNSignout;
 #endif
 		app.SetAction(iPrimaryPlayer,eAppAction_EthernetDisconnected);

Minecraft.Client/Common/Network/GameNetworkManager.h

@@ -6,7 +6,7 @@ using namespace std;
 #include "NetworkPlayerInterface.h"
 #ifdef _XBOX
 #include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h"
-#elif !defined DISABLE_PSN && defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
+#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
 #include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h"
 #elif defined _DURANGO
 #include "..\..\Durango\Network\PlatformNetworkManagerDurango.h"
@@ -32,7 +32,7 @@ class CGameNetworkManager
 {
 #ifdef _XBOX
 	friend class CPlatformNetworkManagerXbox;
-#elif !defined DISABLE_PSN && defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
+#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
 	friend class CPlatformNetworkManagerSony;
 #elif defined _DURANGO
 	friend class CPlatformNetworkManagerDurango;

Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h

@@ -84,7 +84,7 @@ public:
 	virtual void HandleSignInChange() = 0;
 
 	virtual bool _RunNetworkGame() = 0;
-	virtual void SetGamePlayState() {}
+
 private:
 	virtual bool _LeaveGame(bool bMigrateHost, bool bLeaveRoom) = 0;
 	virtual void _HostGame(int usersMask, unsigned char publicSlots = MINECRAFT_NET_MAX_PLAYERS, unsigned char privateSlots = 0) = 0;

Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp

@@ -3,11 +3,6 @@
 #include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "PlatformNetworkManagerStub.h"
 #include "..\..\Xbox\Network\NetworkPlayerXbox.h"		// TODO - stub version of this?
-#include "..\..\Minecraft.h"
-#include "..\..\User.h"
-#if defined _WINDOWS64 || defined __PS3__
-#include "..\..\Common\Network\WinsockNetLayer.h"
-#endif
 
 CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
 
@@ -119,42 +114,10 @@ void CPlatformNetworkManagerStub::NotifyPlayerJoined(IQNetPlayer *pQNetPlayer	)
 	}
 }
 
-void CPlatformNetworkManagerStub::NotifyPlayerLeaving(IQNetPlayer *pQNetPlayer)
-{
-	app.DebugPrintf("Player 0x%p \"%ls\" leaving.\n", pQNetPlayer, pQNetPlayer->GetGamertag());
-
-	INetworkPlayer *networkPlayer = getNetworkPlayer(pQNetPlayer);
-	if (networkPlayer == NULL)
-		return;
-
-	Socket *socket = networkPlayer->GetSocket();
-	if (socket != NULL)
-	{
-		if (m_pIQNet->IsHost())
-			g_NetworkManager.CloseConnection(networkPlayer);
-	}
-
-	if (m_pIQNet->IsHost())
-	{
-		SystemFlagRemovePlayer(networkPlayer);
-	}
-
-	g_NetworkManager.PlayerLeaving(networkPlayer);
-
-	for (int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
-	{
-		if (playerChangedCallback[idx] != NULL)
-			playerChangedCallback[idx](playerChangedCallbackParam[idx], networkPlayer, true);
-	}
-
-	removeNetworkPlayer(pQNetPlayer);
-}
-
 bool CPlatformNetworkManagerStub::Initialise(CGameNetworkManager *pGameNetworkManager, int flagIndexSize)
 {
 	m_pGameNetworkManager = pGameNetworkManager;
 	m_flagIndexSize = flagIndexSize;
-	m_pIQNet = new IQNet();
 	g_pPlatformNetworkManager = this;
 	for( int i = 0; i < XUSER_MAX_COUNT; i++ )
 	{
@@ -211,35 +174,6 @@ bool CPlatformNetworkManagerStub::isSystemPrimaryPlayer(IQNetPlayer *pQNetPlayer
 // We call this twice a frame, either side of the render call so is a good place to "tick" things
 void CPlatformNetworkManagerStub::DoWork()
 {
-	extern QNET_STATE _iQNetStubState;
-	if (_iQNetStubState == QNET_STATE_SESSION_STARTING && app.GetGameStarted())
-	{
-		_iQNetStubState = QNET_STATE_GAME_PLAY;
-		if (m_pIQNet->IsHost())
-			WinsockNetLayer::UpdateAdvertiseJoinable(true);
-	}
-	if (_iQNetStubState == QNET_STATE_IDLE)
-		TickSearch();
-	if (_iQNetStubState == QNET_STATE_GAME_PLAY && m_pIQNet->IsHost())
-	{
-		BYTE disconnectedSmallId;
-		while (WinsockNetLayer::PopDisconnectedSmallId(&disconnectedSmallId))
-		{
-			IQNetPlayer *qnetPlayer = m_pIQNet->GetPlayerBySmallId(disconnectedSmallId);
-			if (qnetPlayer != NULL && qnetPlayer->m_smallId == disconnectedSmallId)
-			{
-				NotifyPlayerLeaving(qnetPlayer);
-				qnetPlayer->m_smallId = 0;
-				qnetPlayer->m_isRemote = false;
-				qnetPlayer->m_isHostPlayer = false;
-				qnetPlayer->m_gamertag[0] = 0;
-				qnetPlayer->SetCustomDataValue(0);
-				WinsockNetLayer::PushFreeSmallId(disconnectedSmallId);
-				if (IQNet::s_playerCount > 1)
-					IQNet::s_playerCount--;
-			}
-		}
-	}
 }
 
 int CPlatformNetworkManagerStub::GetPlayerCount()
@@ -297,7 +231,6 @@ bool CPlatformNetworkManagerStub::LeaveGame(bool bMigrateHost)
 	if( m_bLeavingGame ) return true;
 
 	m_bLeavingGame = true;
-	WinsockNetLayer::StopAdvertising();
 
 	// If we are the host wait for the game server to end
 	if(m_pIQNet->IsHost() && g_NetworkManager.ServerStoppedValid())
@@ -306,20 +239,6 @@ bool CPlatformNetworkManagerStub::LeaveGame(bool bMigrateHost)
 		g_NetworkManager.ServerStoppedWait();
 		g_NetworkManager.ServerStoppedDestroy();
 	}
-	else
-	{
-		m_pIQNet->EndGame();
-	}
-
-	for (AUTO_VAR(it, currentNetworkPlayers.begin()); it != currentNetworkPlayers.end(); it++)
-		delete *it;
-	currentNetworkPlayers.clear();
-	m_machineQNetPrimaryPlayers.clear();
-	SystemFlagReset();
-
-	WinsockNetLayer::Shutdown();
-	WinsockNetLayer::Initialize();
-
 	return true;
 }
 
@@ -343,20 +262,7 @@ void CPlatformNetworkManagerStub::HostGame(int localUsersMask, bool bOnlineGame,
 
 	m_pIQNet->HostGame();
 
-	IQNet::m_player[0].m_smallId = 0;
-	IQNet::m_player[0].m_isRemote = false;
-	IQNet::m_player[0].m_isHostPlayer = true;
-	IQNet::s_playerCount = 1;
-
 	_HostGame( localUsersMask, publicSlots, privateSlots );
-
-	int port = WIN64_NET_DEFAULT_PORT;
-	if (!WinsockNetLayer::IsActive())
-		WinsockNetLayer::HostGame(port);
-
-	const wchar_t *hostName = IQNet::m_player[0].m_gamertag;
-	unsigned int settings = app.GetGameHostOption(eGameHostOption_All);
-	WinsockNetLayer::StartAdvertising(port, hostName, settings, 0, 0, MINECRAFT_NET_VERSION);
 //#endif
 }
 
@@ -371,47 +277,6 @@ bool CPlatformNetworkManagerStub::_StartGame()
 
 int CPlatformNetworkManagerStub::JoinGame(FriendSessionInfo *searchResult, int localUsersMask, int primaryUserIndex)
 {
-	if (searchResult == NULL)
-		return CGameNetworkManager::JOINGAME_FAIL_GENERAL;
-
-	const char *hostIP = searchResult->data.hostIP;
-	int hostPort = searchResult->data.hostPort;
-
-	if (hostPort <= 0 || hostIP[0] == 0)
-		return CGameNetworkManager::JOINGAME_FAIL_GENERAL;
-
-	m_bLeavingGame = false;
-	IQNet::s_isHosting = false;
-	m_pIQNet->ClientJoinGame();
-
-	IQNet::m_player[0].m_smallId = 0;
-	IQNet::m_player[0].m_isRemote = true;
-	IQNet::m_player[0].m_isHostPlayer = true;
-	wcsncpy(IQNet::m_player[0].m_gamertag, searchResult->data.hostName, 31);
-
-	WinsockNetLayer::StopDiscovery();
-
-	if (!WinsockNetLayer::JoinGame(hostIP, hostPort))
-	{
-		app.DebugPrintf("Win64 LAN: Failed to connect to %s:%d\n", hostIP, hostPort);
-		return CGameNetworkManager::JOINGAME_FAIL_GENERAL;
-	}
-
-	BYTE localSmallId = WinsockNetLayer::GetLocalSmallId();
-
-	IQNet::m_player[localSmallId].m_smallId = localSmallId;
-	IQNet::m_player[localSmallId].m_isRemote = false;
-	IQNet::m_player[localSmallId].m_isHostPlayer = false;
-
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	wcsncpy(IQNet::m_player[localSmallId].m_gamertag, pMinecraft->user->name.c_str(), 32);
-	IQNet::s_playerCount = localSmallId + 1;
-
-	NotifyPlayerJoined(&IQNet::m_player[0]);
-	NotifyPlayerJoined(&IQNet::m_player[localSmallId]);
-
-	m_pGameNetworkManager->StateChange_AnyToStarting();
-
 	return CGameNetworkManager::JOINGAME_SUCCESS;
 }
 
@@ -450,21 +315,6 @@ void CPlatformNetworkManagerStub::HandleSignInChange()
 
 bool CPlatformNetworkManagerStub::_RunNetworkGame()
 {
-	extern QNET_STATE _iQNetStubState;
-	_iQNetStubState = QNET_STATE_GAME_PLAY;
-
-	for (DWORD i = 0; i < IQNet::s_playerCount; i++)
-	{
-		if (IQNet::m_player[i].m_isRemote)
-		{
-			INetworkPlayer *pNetworkPlayer = getNetworkPlayer(&IQNet::m_player[i]);
-			if (pNetworkPlayer != NULL && pNetworkPlayer->GetSocket() != NULL)
-			{
-				Socket::addIncomingSocket(pNetworkPlayer->GetSocket());
-			}
-		}
-	}
-
 	return true;
 }
 
@@ -653,90 +503,10 @@ wstring CPlatformNetworkManagerStub::GatherRTTStats()
 
 void CPlatformNetworkManagerStub::TickSearch()
 {
-	if (m_SessionsUpdatedCallback == NULL)
-		return;
-
-	static DWORD lastSearchTime = 0;
-	DWORD now = GetTickCount();
-	if (now - lastSearchTime < 2000)
-		return;
-	lastSearchTime = now;
-
-	SearchForGames();
 }
 
 void CPlatformNetworkManagerStub::SearchForGames()
 {
-	std::vector<Win64LANSession> lanSessions = WinsockNetLayer::GetDiscoveredSessions();
-
-	if (g_Win64MultiplayerJoin)
-	{
-		bool alreadyPresent = false;
-		for (size_t i = 0; i < lanSessions.size(); i++)
-		{
-			if (strcmp(lanSessions[i].hostIP, g_Win64MultiplayerIP) == 0 &&
-				lanSessions[i].hostPort == g_Win64MultiplayerPort)
-			{
-				alreadyPresent = true;
-				break;
-			}
-		}
-		if (!alreadyPresent)
-		{
-			Win64LANSession manual;
-			memset(&manual, 0, sizeof(manual));
-			strncpy(manual.hostIP, g_Win64MultiplayerIP, sizeof(manual.hostIP) - 1);
-			manual.hostIP[sizeof(manual.hostIP) - 1] = '\0';
-
-			manual.hostPort = g_Win64MultiplayerPort;
-
-			swprintf(manual.hostName, 32, L"%hs:%d", g_Win64MultiplayerIP, g_Win64MultiplayerPort);
-			manual.hostName[31] = L'\0';
-			manual.playerCount = 0;
-			manual.maxPlayers = MINECRAFT_NET_MAX_PLAYERS;
-			manual.isJoinable = true;
-			manual.lastSeenTick = GetTickCount();
-			lanSessions.push_back(manual);
-		}
-	}
-
-	for (size_t i = 0; i < friendsSessions[0].size(); i++)
-		delete friendsSessions[0][i];
-	friendsSessions[0].clear();
-
-	for (size_t i = 0; i < lanSessions.size(); i++)
-	{
-		FriendSessionInfo *info = new FriendSessionInfo();
-		size_t nameLen = wcslen(lanSessions[i].hostName);
-		info->displayLabel = new wchar_t[nameLen + 1];
-		wcsncpy(info->displayLabel, lanSessions[i].hostName, nameLen);
-		info->displayLabel[nameLen] = L'\0';
-		info->displayLabelLength = (unsigned char)nameLen;
-		info->displayLabelViewableStartIndex = 0;
-
-		info->data.netVersion = lanSessions[i].netVersion;
-		info->data.m_uiGameHostSettings = lanSessions[i].gameHostSettings;
-		info->data.texturePackParentId = lanSessions[i].texturePackParentId;
-		info->data.subTexturePackId = lanSessions[i].subTexturePackId;
-		info->data.isReadyToJoin = lanSessions[i].isJoinable;
-		info->data.isJoinable = lanSessions[i].isJoinable;
-		strncpy(info->data.hostIP, lanSessions[i].hostIP, sizeof(info->data.hostIP) - 1);
-		info->data.hostIP[sizeof(info->data.hostIP) - 1] = '\0';
-		info->data.hostPort = lanSessions[i].hostPort;
-		wcsncpy(info->data.hostName, lanSessions[i].hostName, XUSER_NAME_SIZE - 1);
-		info->data.hostName[XUSER_NAME_SIZE - 1] = L'\0';
-		info->data.playerCount = lanSessions[i].playerCount;
-		info->data.maxPlayers = lanSessions[i].maxPlayers;
-
-		info->sessionId = (ULONGLONG)((unsigned __int64)inet_addr(lanSessions[i].hostIP) | ((unsigned __int64)lanSessions[i].hostPort << 32));
-
-		friendsSessions[0].push_back(info);
-	}
-
-	m_searchResultsCount[0] = (int)friendsSessions[0].size();
-
-	if (m_SessionsUpdatedCallback != NULL)
-		m_SessionsUpdatedCallback(m_pSearchParam);
 }
 
 int CPlatformNetworkManagerStub::SearchForGamesThreadProc( void* lpParameter )
@@ -752,9 +522,7 @@ void CPlatformNetworkManagerStub::SetSearchResultsReady(int resultCount)
 
 vector<FriendSessionInfo *> *CPlatformNetworkManagerStub::GetSessionList(int iPad, int localPlayers, bool partyOnly)
 {
-	vector<FriendSessionInfo *> *filteredList = new vector<FriendSessionInfo *>();
-	for (size_t i = 0; i < friendsSessions[0].size(); i++)
-		filteredList->push_back(friendsSessions[0][i]);
+	vector<FriendSessionInfo *> *filteredList = new vector<FriendSessionInfo *>();;
 	return filteredList;
 }
 

Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h

@@ -23,11 +23,7 @@ public:
 	virtual bool RemoveLocalPlayerByUserIndex( int userIndex );
 	virtual INetworkPlayer *GetLocalPlayerByUserIndex( int userIndex );
 	virtual INetworkPlayer *GetPlayerByIndex(int playerIndex);
-#ifdef __PS3
-	virtual INetworkPlayer * GetPlayerByXuid(PlayerUID* xuid)
-#else
 	virtual INetworkPlayer * GetPlayerByXuid(PlayerUID xuid);
-#endif
 	virtual INetworkPlayer * GetPlayerBySmallId(unsigned char smallId);
 	virtual bool ShouldMessageForFullSession();
 
@@ -165,9 +161,8 @@ public:
 	virtual void GetFullFriendSessionInfo( FriendSessionInfo *foundSession, void (* FriendSessionUpdatedFn)(bool success, void *pParam), void *pParam );
 	virtual void ForceFriendsSessionRefresh();
 
-public:
+private:
 	void NotifyPlayerJoined( IQNetPlayer *pQNetPlayer );
-	void NotifyPlayerLeaving( IQNetPlayer *pQNetPlayer );
 
 #ifndef _XBOX
 	void FakeLocalPlayerJoined() { NotifyPlayerJoined(m_pIQNet->GetLocalPlayerByUserIndex(0)); }

Minecraft.Client/Common/Network/SessionInfo.h

@@ -32,7 +32,7 @@ typedef struct _GameSessionData
 		subTexturePackId = 0;
 	}
 } GameSessionData;
-#elif (defined __PS3__ && !defined DISABLE_PSN) || defined __ORBIS__ || defined(__PSVITA__)
+#elif defined __PS3__ || defined __ORBIS__ || defined(__PSVITA__)
 typedef struct _GameSessionData
 {
 	unsigned short netVersion;										//   2 bytes
@@ -47,11 +47,6 @@ typedef struct _GameSessionData
 	unsigned char playerCount;										//   1 byte
 	bool isReadyToJoin;												//   1 byte
 
-	char hostIP[64];												//	 64 bytes
-	int hostPort;													//	 4 bytes
-	wchar_t hostName[XUSER_NAME_SIZE];								//	 64 bytes ( 32*2 )
-	unsigned char maxPlayers;										//	 1 byte
-
 	_GameSessionData()
 	{
 		netVersion = 0;
@@ -62,11 +57,7 @@ typedef struct _GameSessionData
 		subTexturePackId = 0;
 		playerCount = 0;
 		isReadyToJoin = false;
-		memset(hostIP, 0, sizeof(hostIP));
-		hostPort = 0;
-		memset(hostName, 0, sizeof(hostName));
-		playerCount = 0;
-		maxPlayers = MINECRAFT_NET_MAX_PLAYERS;
+
 	}
 } GameSessionData;
 #else
@@ -78,13 +69,6 @@ typedef struct _GameSessionData
 	unsigned char subTexturePackId;									//   1 byte
 
 	bool isReadyToJoin;												//   1 byte
-	bool isJoinable;												//	 1 byte
-
-	char hostIP[64];												//	 64 bytes
-	int hostPort;													//	 4 bytes
-	wchar_t hostName[XUSER_NAME_SIZE];								//	 64 bytes ( 32*2 )
-	unsigned char playerCount;										//	 1 byte
-	unsigned char maxPlayers;										//	 1 byte
 
 	_GameSessionData()
 	{
@@ -92,13 +76,6 @@ typedef struct _GameSessionData
 		m_uiGameHostSettings = 0;
 		texturePackParentId = 0;
 		subTexturePackId = 0;
-		isReadyToJoin = false;
-		isJoinable = true;
-		memset(hostIP, 0, sizeof(hostIP));
-		hostPort = 0;
-		memset(hostName, 0, sizeof(hostName));
-		playerCount = 0;
-		maxPlayers = MINECRAFT_NET_MAX_PLAYERS;
 	}
 } GameSessionData;
 #endif
@@ -109,7 +86,7 @@ public:
 	SessionID sessionId;
 #ifdef _XBOX
 	XSESSION_SEARCHRESULT searchResult;
-#elif (defined __PS3__ && !defined DISABLE_PSN) || defined(__ORBIS__) || defined (__PSVITA__)
+#elif defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 	SQRNetworkManager::SessionSearchResult searchResult;
 #elif defined(_DURANGO)
 	DQRNetworkManager::SessionSearchResult searchResult;

Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "NetworkPlayerSony.h"
-#ifndef DISABLE_PSN
 
 NetworkPlayerSony::NetworkPlayerSony(SQRNetworkPlayer *qnetPlayer)
 {
@@ -136,4 +135,3 @@ int NetworkPlayerSony::GetTimeSinceLastChunkPacket_ms()
 	__int64 currentTime = System::currentTimeMillis();
 	return (int)( currentTime - m_lastChunkPacketTime );
 }
-#endif

Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h

@@ -1,5 +1,5 @@
 #pragma once
-#ifndef _DISABLE_PSN
+
 #include "..\..\Common\Network\NetworkPlayerInterface.h"
 #include "SQRNetworkPlayer.h"
 
@@ -41,4 +41,3 @@ private:
 	Socket *m_pSocket;
 	__int64 m_lastChunkPacketTime;
 };
-#endif

Minecraft.Client/Common/Network/Sony/SQRNetworkManager.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#ifndef DISABLE_PSN
+
 #include "SQRNetworkManager.h"
 
 bool SQRNetworkManager::s_safeToRespondToGameBootInvite = false;
@@ -80,5 +80,4 @@ void SQRNetworkManager::TickWriteAcks()
 		}
 	}
 	LeaveCriticalSection(&m_csAckQueue);
-}
-#endif
+}

Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#ifndef DISABLE_PSN
 #include "SQRNetworkPlayer.h"
 
 #ifdef __PS3__
@@ -610,4 +609,3 @@ bool SQRNetworkPlayer::IsMutedByLocalUser(int userIndex)
 	return SonyVoiceChat::isMutedPlayer(pMan->m_roomSyncData.players[userIndex].m_roomMemberId);
 #endif
 }
-#endif

Minecraft.Client/Common/Network/WinsockNetLayer.h

@@ -1,162 +0,0 @@
-#pragma once
-
-#if defined _WINDOWS64
-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#elif defined __PS3__
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netex/net.h>
-#include <netex/errno.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-
-#include <vector>
-#include "..\..\Common\Network\NetworkPlayerInterface.h"
-
-#ifdef _WINDOWS64
-#pragma comment(lib, "Ws2_32.lib")
-#endif
-
-#define WIN64_NET_DEFAULT_PORT 25565
-#define WIN64_NET_MAX_CLIENTS 7
-#define WIN64_NET_RECV_BUFFER_SIZE 65536
-#define WIN64_LAN_DISCOVERY_PORT 25566
-#define WIN64_LAN_BROADCAST_MAGIC 0x4D434C4E
-
-#ifdef __PS3__
-typedef int SOCKET;
-#define INVALID_SOCKET -1
-#endif
-
-class Socket;
-
-#pragma pack(push, 1)
-struct Win64LANBroadcast
-{
-	DWORD magic;
-	WORD netVersion;
-	WORD gamePort;
-	char hostName[32];
-	BYTE playerCount;
-	BYTE maxPlayers;
-	DWORD gameHostSettings;
-	DWORD texturePackParentId;
-	BYTE subTexturePackId;
-	BYTE isJoinable;
-};
-#pragma pack(pop)
-
-struct Win64LANSession
-{
-	char hostIP[64];
-	int hostPort;
-	wchar_t hostName[32];
-	unsigned short netVersion;
-	unsigned char playerCount;
-	unsigned char maxPlayers;
-	unsigned int gameHostSettings;
-	unsigned int texturePackParentId;
-	unsigned char subTexturePackId;
-	bool isJoinable;
-	DWORD lastSeenTick;
-};
-
-struct Win64RemoteConnection
-{
-	SOCKET tcpSocket;
-	BYTE smallId;
-	C4JThread* recvThread;
-	volatile bool active;
-};
-
-class WinsockNetLayer
-{
-public:
-	static bool Initialize();
-	static void Shutdown();
-
-	static bool HostGame(int port);
-	static bool JoinGame(const char *ip, int port);
-
-	static bool SendToSmallId(BYTE targetSmallId, const void *data, int dataSize);
-	static bool SendOnSocket(SOCKET sock, const void *data, int dataSize);
-
-	static bool IsHosting() { return s_isHost; }
-	static bool IsConnected() { return s_connected; }
-	static bool IsActive() { return s_active; }
-
-	static BYTE GetLocalSmallId() { return s_localSmallId; }
-	static BYTE GetHostSmallId() { return s_hostSmallId; }
-
-	static SOCKET GetSocketForSmallId(BYTE smallId);
-
-	static void HandleDataReceived(BYTE fromSmallId, BYTE toSmallId, unsigned char *data, unsigned int dataSize);
-
-	static bool PopDisconnectedSmallId(BYTE *outSmallId);
-	static void PushFreeSmallId(BYTE smallId);
-
-	static bool StartAdvertising(int gamePort, const wchar_t *hostName, unsigned int gameSettings, unsigned int texPackId, unsigned char subTexId, unsigned short netVer);
-	static void StopAdvertising();
-	static void UpdateAdvertisePlayerCount(BYTE count);
-	static void UpdateAdvertiseJoinable(bool joinable);
-
-	static bool StartDiscovery();
-	static void StopDiscovery();
-	static vector<Win64LANSession> GetDiscoveredSessions();
-
-	static int GetHostPort() { return s_hostGamePort; }
-
-private:
-	static int AcceptThreadProc(void* param);
-	static int RecvThreadProc(void* param);
-	static int ClientRecvThreadProc(void* param);
-	static int AdvertiseThreadProc(void* param);
-	static int DiscoveryThreadProc(void* param);
-
-	static SOCKET s_listenSocket;
-	static SOCKET s_hostConnectionSocket;
-	static C4JThread* s_acceptThread;
-	static C4JThread* s_clientRecvThread;
-
-	static bool s_isHost;
-	static bool s_connected;
-	static bool s_active;
-	static bool s_initialized;
-
-	static BYTE s_localSmallId;
-	static BYTE s_hostSmallId;
-	static BYTE s_nextSmallId;
-
-	static CRITICAL_SECTION s_sendLock;
-	static CRITICAL_SECTION s_connectionsLock;
-
-	static std::vector<Win64RemoteConnection> s_connections;
-
-	static SOCKET s_advertiseSock;
-	static C4JThread* s_advertiseThread;
-	static volatile bool s_advertising;
-	static Win64LANBroadcast s_advertiseData;
-	static CRITICAL_SECTION s_advertiseLock;
-	static int s_hostGamePort;
-
-	static SOCKET s_discoverySock;
-	static C4JThread* s_discoveryThread;
-	static volatile bool s_discovering;
-	static CRITICAL_SECTION s_discoveryLock;
-	static std::vector<Win64LANSession> s_discoveredSessions;
-
-	static CRITICAL_SECTION s_disconnectLock;
-	static std::vector<BYTE> s_disconnectedSmallIds;
-
-	static CRITICAL_SECTION s_freeSmallIdLock;
-	static std::vector<BYTE> s_freeSmallIds;
-};
-
-extern bool g_Win64MultiplayerHost;
-extern bool g_Win64MultiplayerJoin;
-extern int g_Win64MultiplayerPort;
-extern char g_Win64MultiplayerIP[256];

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

@@ -24,7 +24,7 @@ $folderCopies = @(
     @{ Source = "DurangoMedia";    		Dest = "Windows64Media" },
     @{ Source = "Windows64Media";  		Dest = "Windows64Media" },
 	@{ Source = "PSVita\Tutorial"; 		Dest = "Windows64Media\Tutorial" },
-	@{ Source = "music"; Dest = "Windows64Media\music" },
+	@{ Source = "Windows64Media\music"; Dest = "Windows64Media\music" },
 	@{ Source = "Windows64Media\Sound"; Dest = "Windows64Media\Sound" },
 	@{ Source = "Common\Postbuilds\Contents\Windows64\redist64"; Dest = "redist64" }
 )

Minecraft.Client/Common/UI/IUIScene_StartGame.cpp

@@ -54,7 +54,7 @@ void IUIScene_StartGame::HandleDLCMountingComplete()
 	for(unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i)
 	{
 		bTexturePackAlreadyListed=false;
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 		char *pchName=app.GetDLCInfoTextures(i);
 		pDLCInfo=app.GetDLCInfo(pchName);
 #elif defined _XBOX_ONE

Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp

@@ -502,9 +502,6 @@ UIScene_InGameInfoMenu::PlayerInfo *UIScene_InGameInfoMenu::BuildPlayerInfo(INet
 #if defined __PS3__ || defined __PSVITA__
 int UIScene_InGameInfoMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	UIScene_InGameInfoMenu* pClass = (UIScene_InGameInfoMenu*)pParam;
 
 	if(result==C4JStorage::EMessage_ResultAccept) 
@@ -517,7 +514,6 @@ int UIScene_InGameInfoMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStora
 	}
 
 	return 0;
-#endif
 }
 
 int UIScene_InGameInfoMenu::ViewInvites_SignInReturned(void *pParam,bool bContinue, int iPad)

Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp

@@ -59,7 +59,7 @@ void UIScene_JoinMenu::tick()
 
 		m_buttonListPlayers.init(eControl_GamePlayers);
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
+#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
 		for( int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++ )
 		{
 			if( m_selectedSession->data.players[i] != NULL )
@@ -353,9 +353,6 @@ void UIScene_JoinMenu::checkPrivilegeCallback(LPVOID lpParam, bool hasPrivilege,
 
 void UIScene_JoinMenu::StartSharedLaunchFlow()
 {
-#if defined DISABLE_PSN && defined __PS3__
-	JoinGame(this);
-#else
 	if(!app.IsLocalMultiplayerAvailable())
 	{
 		JoinGame(this);
@@ -369,17 +366,12 @@ void UIScene_JoinMenu::StartSharedLaunchFlow()
 		info.requireOnline = true;
 		ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_QuadrantSignin,&info);
 	}
-#endif
 }
 
 int UIScene_JoinMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
 	UIScene_JoinMenu* pClass = (UIScene_JoinMenu*)ui.GetSceneFromCallbackId((size_t)pParam);
 
-#if defined DISABLE_PSN && defined __PS3__
-	JoinGame(pClass);
-	return 0;
-#else
 	if(pClass)
 	{
 		if(bContinue==true)
@@ -400,7 +392,6 @@ int UIScene_JoinMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int
 		}
 	}
 	return 0;
-#endif
 }
 
 // Shared function to join the game that is the same whether we used the sign-in UI or not
@@ -440,9 +431,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 			if( !ProfileManager.AllowedToPlayMultiplayer(ProfileManager.GetPrimaryPad()) ) noPrivileges = true;
 			dwLocalUsersMask |= CGameNetworkManager::GetLocalPlayerMask(ProfileManager.GetPrimaryPad());
 
-#ifndef DISABLE_PSN
 			isSignedInLive = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad());
-#endif
 #ifdef __PSVITA__
 			if(CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus())
 				isSignedInLive = true;
@@ -481,7 +470,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 	BOOL pccAllowed = TRUE;
 	BOOL pccFriendsAllowed = TRUE;
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__PSVITA__)
+#if defined(__PS3__) || defined(__PSVITA__)
 	if(isSignedInLive)
 	{
 		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&noUGC,NULL,NULL);

Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp

@@ -731,7 +731,7 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry(LeaderboardManager::ReadScor
 		}
 	}
 
-#if !defined(DISABLE_PSN) && defined(__PS3__)
+#ifdef __PS3__
 	// m_name can be unicode characters somehow for Japan - should use m_onlineID
 	wstring wstr=convStringToWstring(statsRow->m_uid.getOnlineID());
 	swprintf(leaderboardEntry->m_gamerTag, XUSER_NAME_SIZE, L"%ls",wstr.c_str());

Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp

@@ -2385,9 +2385,6 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 int UIScene_LoadOrJoinMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
     UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
 
 	if(result==C4JStorage::EMessage_ResultAccept) 
@@ -2406,7 +2403,6 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStora
 	}
 
     return 0;
-#endif
 }
 
 int UIScene_LoadOrJoinMenu::PSN_SignInReturned(void *pParam,bool bContinue, int iPad)

Minecraft.Client/Common/UI/UIScene_MainMenu.cpp

@@ -550,7 +550,6 @@ int UIScene_MainMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EM
 {
 	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
 
-#ifndef DISABLE_PSN
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #ifdef __PS3__
@@ -630,9 +629,6 @@ int UIScene_MainMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EM
 			pClass->m_bIgnorePress=false;
 		}
 	}
-#endif
-	CreateLoad_SignInReturned(pClass, true, 0);
-	pClass->m_bIgnorePress=false;
 
 	return 0;
 }

Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp

@@ -1029,9 +1029,6 @@ int UIScene_PauseMenu::BanGameDialogReturned(void *pParam,int iPad,C4JStorage::E
 #if defined(__PS3__)  || defined (__PSVITA__) || defined(__ORBIS__)
 int UIScene_PauseMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)ui.GetSceneFromCallbackId((size_t)pParam);
 	if(result==C4JStorage::EMessage_ResultAccept && pClass) 
 	{
@@ -1094,7 +1091,6 @@ int UIScene_PauseMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::E
 	}
 
 	return 0;
-#endif
 }
 
 int UIScene_PauseMenu::ViewLeaderboards_SignInReturned(void *pParam,bool bContinue, int iPad)
@@ -1135,9 +1131,6 @@ int UIScene_PauseMenu::ViewLeaderboards_SignInReturned(void *pParam,bool bContin
 
 int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)ui.GetSceneFromCallbackId((size_t)pParam);
 
 #ifdef __ORBIS__
@@ -1251,7 +1244,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 		}
 	}
 #endif		//	
-#endif
+
 	return 0;
 }
 

Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp

@@ -110,7 +110,7 @@ void UIScene_SaveMessage::handlePress(F64 controlId, F64 childId)
 
 		m_bIgnoreInput=true;
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 		// wait for the profile to be read - this has been kicked off earlier, so should be read by now
 		addTimer(PROFILE_LOADED_TIMER_ID,PROFILE_LOADED_TIMER_TIME);
 #else
@@ -126,7 +126,7 @@ void UIScene_SaveMessage::handleTimerComplete(int id)
 	{
 	case PROFILE_LOADED_TIMER_ID:
 		{
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 			C4JStorage::eOptionsCallback eStatus=app.GetOptionsCallbackStatus(0);
 
 			switch(eStatus)

Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp

@@ -1518,7 +1518,7 @@ void UIScene_SkinSelectMenu::HandleDLCMountingComplete()
 void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad)
 {
 	// need to be signed in to live. get them to sign in to online
-#if !defined(DISABLE_PSN) && defined(__PS3__)
+#if defined(__PS3__)
 	SQRNetworkManager_PS3::AttemptPSNSignIn(NULL, this);		
 
 #elif defined(__PSVITA__)

Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp

@@ -402,7 +402,7 @@ wstring CScene_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, LPCWS
 		}
 		else if(temp.find(L"{*StoneIcon*}")!=wstring::npos)
 		{
-			m_pCraftingPic->SetIcon(m_iPad, Tile::rock_Id,0,1,10,31,false);
+			m_pCraftingPic->SetIcon(m_iPad, Tile::stone_Id,0,1,10,31,false);
 		}
 		else
 		{

Minecraft.Client/CreeperModel.cpp

@@ -6,7 +6,7 @@
 // 4J - added
 void CreeperModel::_init(float g)
 {
-    int yo = 6;
+    int yo = 4;
 
     head = new ModelPart(this, 0, 0);
     head->addBox(-4, - 8, -4, 8, 8, 8, g); // Head

Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp

@@ -112,22 +112,22 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 	sp->addArgs(1, Tile::dirt_Id, 0); // works
 	sp->addArgs(2, Tile::dirt_Id, 0); // works
 
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  0); // fixed (+ach 'Rainbow Collection')
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  1);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  2);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  3);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  4);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  5);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  6);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  7);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  8);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  9);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 10);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 11);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 12);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 13);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 14);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 15);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  0); // fixed (+ach 'Rainbow Collection')
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  1);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  2);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  3);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  4);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  5);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  6);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  7);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  8);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  9);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 10);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 11);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 12);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 13);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 14);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 15);
 
 	out->m_stats.push_back(sp);
 
@@ -166,20 +166,20 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 
 	sp = new StatParam(L"BlockBroken.BlockId.*");
 	sp->addArgs( Tile::dirt_Id );
-	sp->addArgs( Tile::rock_Id ); 
+	sp->addArgs( Tile::stone_Id ); 
 	sp->addArgs( Tile::emeraldOre_Id );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken.BlockId.*.BlockAux.*");
 	sp->addArgs( Tile::dirt_Id, 0 );
-	sp->addArgs( Tile::rock_Id, 0 );
+	sp->addArgs( Tile::stone_Id, 0 );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken.DifficultyLevelId.*.BlockId.*");
 	sp->addArgs( 1, Tile::dirt_Id );
 	sp->addArgs( 2, Tile::dirt_Id );
-	sp->addArgs( 1, Tile::rock_Id );
-	sp->addArgs( 2, Tile::rock_Id );
+	sp->addArgs( 1, Tile::stone_Id );
+	sp->addArgs( 2, Tile::stone_Id );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken");
@@ -188,7 +188,7 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 
 	sp = new StatParam(L"BlockPlaced.BlockId.*");
 	sp->addArgs( Tile::dirt_Id );
-	sp->addArgs( Tile::stoneBrick_Id ); 
+	sp->addArgs( Tile::cobblestone_Id ); 
 	sp->addArgs( Tile::sand_Id );		// works
 	sp->addArgs( Tile::sign_Id );		// fixed
 	sp->addArgs( Tile::wallSign_Id );	// fixed

Minecraft.Client/Extrax64Stubs.cpp

@@ -5,7 +5,6 @@
 
 #ifdef __PS3__
 #include "PS3\Sentient\SentientManager.h"
-#include "Common\Network\WinsockNetLayer.h"
 #include "StatsCounter.h"
 #include "PS3\Social\SocialManager.h"
 #include <libsn.h>
@@ -18,7 +17,6 @@
 #include "Durango\DurangoExtras\xcompress.h"
 #elif defined _WINDOWS64
 #include "Windows64\Sentient\SentientManager.h"
-#include "Common\Network\WinsockNetLayer.h"
 #include "StatsCounter.h"
 #include "Windows64\Social\SocialManager.h"
 #include "Windows64\Sentient\DynamicConfigurations.h"
@@ -170,10 +168,8 @@ void PIXSetMarkerDeprecated(int a, char *b, ...) {}
 
 bool IsEqualXUID(PlayerUID a, PlayerUID b)
 {
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__) || defined(_DURANGO)
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__) || defined(_DURANGO)
 	return (a == b);
-#elif defined(DISABLE_PSN) && defined(__PS3__)
-	return (a.XUID == b.XUID);
 #else
 	return false;
 #endif
@@ -189,23 +185,20 @@ D3DXVECTOR3::D3DXVECTOR3() {}
 D3DXVECTOR3::D3DXVECTOR3(float x,float y,float z) : x(x), y(y), z(z) {}
 D3DXVECTOR3& D3DXVECTOR3::operator += ( CONST D3DXVECTOR3& add ) { x += add.x; y += add.y; z += add.z; return *this; }
 
-BYTE IQNetPlayer::GetSmallId() { return m_smallId; }
+BYTE IQNetPlayer::GetSmallId() { return 0; }
 void IQNetPlayer::SendData(IQNetPlayer *player, const void *pvData, DWORD dwDataSize, DWORD dwFlags)
 {
-	if (WinsockNetLayer::IsActive())
-	{
-		WinsockNetLayer::SendToSmallId(player->m_smallId, pvData, dwDataSize);
-	}
+	app.DebugPrintf("Sending from 0x%x to 0x%x %d bytes\n",this,player,dwDataSize);
 }
-bool IQNetPlayer::IsSameSystem(IQNetPlayer *player) { return (this == player) || (!m_isRemote && !player->m_isRemote); }
+bool IQNetPlayer::IsSameSystem(IQNetPlayer *player) { return true; }
 DWORD IQNetPlayer::GetSendQueueSize( IQNetPlayer *player, DWORD dwFlags ) { return 0; }
 DWORD IQNetPlayer::GetCurrentRtt() { return 0; }
-bool IQNetPlayer::IsHost() { return m_isHostPlayer; }
+bool IQNetPlayer::IsHost() { return this == &IQNet::m_player[0]; }
 bool IQNetPlayer::IsGuest() { return false; }
-bool IQNetPlayer::IsLocal() { return !m_isRemote; }
-PlayerUID IQNetPlayer::GetXuid() { return (PlayerUID)(0xe000d45248242f2e + m_smallId); }
-LPCWSTR IQNetPlayer::GetGamertag() { return m_gamertag; }
-int IQNetPlayer::GetSessionIndex() { return m_smallId; }
+bool IQNetPlayer::IsLocal() { return true; }
+PlayerUID IQNetPlayer::GetXuid() { return INVALID_XUID; }
+LPCWSTR IQNetPlayer::GetGamertag() { static const wchar_t *test = L"stub"; return test; }
+int IQNetPlayer::GetSessionIndex() { return 0; }
 bool IQNetPlayer::IsTalking() { return false; }
 bool IQNetPlayer::IsMutedByLocalUser(DWORD dwUserIndex) { return false; }
 bool IQNetPlayer::HasVoice() { return false; }
@@ -218,104 +211,23 @@ ULONG_PTR IQNetPlayer::GetCustomDataValue() {
 	return m_customData;
 }
 
-IQNetPlayer IQNet::m_player[MINECRAFT_NET_MAX_PLAYERS];
-DWORD IQNet::s_playerCount = 1;
-bool IQNet::s_isHosting = true;
+IQNetPlayer IQNet::m_player[4];
 
-QNET_STATE _iQNetStubState = QNET_STATE_IDLE;
-
-void Win64_SetupRemoteQNetPlayer(IQNetPlayer *player, BYTE smallId, bool isHost, bool isLocal)
-{
-	player->m_smallId = smallId;
-	player->m_isRemote = !isLocal;
-	player->m_isHostPlayer = isHost;
-	swprintf(player->m_gamertag, 32, L"Player%d", smallId);
-	if (smallId >= IQNet::s_playerCount)
-		IQNet::s_playerCount = smallId + 1;
-}
+bool _bQNetStubGameRunning = false;
 
 HRESULT IQNet::AddLocalPlayerByUserIndex(DWORD dwUserIndex){ return S_OK; }
 IQNetPlayer *IQNet::GetHostPlayer() { return &m_player[0]; }
-IQNetPlayer *IQNet::GetLocalPlayerByUserIndex(DWORD dwUserIndex)
-{
-	if (s_isHosting)
-	{
-		if (dwUserIndex < MINECRAFT_NET_MAX_PLAYERS && !m_player[dwUserIndex].m_isRemote)
-			return &m_player[dwUserIndex];
-		return NULL;
-	}
-	if (dwUserIndex != 0)
-		return NULL;
-	for (DWORD i = 0; i < s_playerCount; i++)
-	{
-		if (!m_player[i].m_isRemote)
-			return &m_player[i];
-	}
-	return NULL;
-}
-static bool Win64_IsActivePlayer(IQNetPlayer *p, DWORD index)
-{
-	if (index == 0) return true;
-	return (p->GetCustomDataValue() != 0);
-}
-
-IQNetPlayer *IQNet::GetPlayerByIndex(DWORD dwPlayerIndex)
-{
-	DWORD found = 0;
-	for (DWORD i = 0; i < s_playerCount; i++)
-	{
-		if (Win64_IsActivePlayer(&m_player[i], i))
-		{
-			if (found == dwPlayerIndex) return &m_player[i];
-			found++;
-		}
-	}
-	return &m_player[0];
-}
-IQNetPlayer *IQNet::GetPlayerBySmallId(BYTE SmallId)
-{
-	for (DWORD i = 0; i < s_playerCount; i++)
-	{
-		if (m_player[i].m_smallId == SmallId && Win64_IsActivePlayer(&m_player[i], i)) return &m_player[i];
-	}
-	return NULL;
-}
-IQNetPlayer *IQNet::GetPlayerByXuid(PlayerUID xuid)
-{
-	for (DWORD i = 0; i < s_playerCount; i++)
-	{
-		if (Win64_IsActivePlayer(&m_player[i], i) && m_player[i].GetXuid() == xuid) return &m_player[i];
-	}
-	return &m_player[0];
-}
-DWORD IQNet::GetPlayerCount()
-{
-	DWORD count = 0;
-	for (DWORD i = 0; i < s_playerCount; i++)
-	{
-		if (Win64_IsActivePlayer(&m_player[i], i)) count++;
-	}
-	return count;
-}
-QNET_STATE IQNet::GetState() { return _iQNetStubState; }
-bool IQNet::IsHost() { return s_isHosting; }
+IQNetPlayer *IQNet::GetLocalPlayerByUserIndex(DWORD dwUserIndex) { return &m_player[dwUserIndex]; } 
+IQNetPlayer *IQNet::GetPlayerByIndex(DWORD dwPlayerIndex) { return &m_player[0]; }
+IQNetPlayer *IQNet::GetPlayerBySmallId(BYTE SmallId){ return &m_player[0]; }
+IQNetPlayer *IQNet::GetPlayerByXuid(PlayerUID xuid){ return &m_player[0]; }
+DWORD IQNet::GetPlayerCount() { return 1; }
+QNET_STATE IQNet::GetState() { return _bQNetStubGameRunning ? QNET_STATE_GAME_PLAY : QNET_STATE_IDLE; }
+bool IQNet::IsHost() { return true; }
 HRESULT IQNet::JoinGameFromInviteInfo(DWORD dwUserIndex, DWORD dwUserMask, const INVITE_INFO *pInviteInfo) { return S_OK; }
-void IQNet::HostGame() { _iQNetStubState = QNET_STATE_SESSION_STARTING; s_isHosting = true; }
-void IQNet::ClientJoinGame() { _iQNetStubState = QNET_STATE_SESSION_STARTING; s_isHosting = false; }
-void IQNet::EndGame()
-{
-	_iQNetStubState = QNET_STATE_IDLE;
-	s_isHosting = false;
-	s_playerCount = 1;
-	for (int i = 1; i < MINECRAFT_NET_MAX_PLAYERS; i++)
-	{
-		m_player[i].m_smallId = 0;
-		m_player[i].m_isRemote = false;
-		m_player[i].m_isHostPlayer = false;
-		m_player[i].m_gamertag[0] = 0;
-		m_player[i].SetCustomDataValue(0);
-	}
-}
+void IQNet::HostGame() { _bQNetStubGameRunning = true; }
+void IQNet::EndGame() { _bQNetStubGameRunning = false; }
+
 DWORD MinecraftDynamicConfigurations::GetTrialTime() { return DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME; }
 
 void XSetThreadProcessor(HANDLE a, int b) {}
@@ -536,8 +448,6 @@ void				C_4JProfile::Initialise( DWORD dwTitleID,
 		pGameSettings->ucTutorialCompletion[28] |= 1<<0;
 	}
 }
-#endif
-#if defined _WINDOWS64 || (defined(__PS3__) && defined(DISABLE_PSN))
 void				C_4JProfile::SetTrialTextStringTable(CXuiStringTable *pStringTable,int iAccept,int iReject) {}
 void				C_4JProfile::SetTrialAwardText(eAwardType AwardType,int iTitle,int iText) {}
 int					C_4JProfile::GetLockedProfile() { return 0; }
@@ -550,24 +460,11 @@ UINT				C_4JProfile::DisplayOfflineProfile(int( *Func)(LPVOID,const bool, const
 UINT				C_4JProfile::RequestConvertOfflineToGuestUI(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant) { return 0; }
 void				C_4JProfile::SetPrimaryPlayerChanged(bool bVal) {}
 bool				C_4JProfile::QuerySigninStatus(void) { return true; }
-void				C_4JProfile::GetXUID(int iPad, PlayerUID *pXuid,bool bOnlineXuid)
-{
-	if (iPad != 0)
-	{
-		// previously INVALID_XUID
-		*pXuid = 0;
-		return;
-	}
-	if (IQNet::s_isHosting)
-		*pXuid = 0xe000d45248242f2e;
-	else
-		*pXuid = 0xe000d45248242f2e + WinsockNetLayer::GetLocalSmallId();
-}
-BOOL				C_4JProfile::AreXUIDSEqual(PlayerUID xuid1,PlayerUID xuid2) { return xuid1 == xuid2; }
+void				C_4JProfile::GetXUID(int iPad, PlayerUID *pXuid,bool bOnlineXuid) {*pXuid = 0xe000d45248242f2e; }
+BOOL				C_4JProfile::AreXUIDSEqual(PlayerUID xuid1,PlayerUID xuid2) { return false; }
 BOOL				C_4JProfile::XUIDIsGuest(PlayerUID xuid) { return false; }
 bool				C_4JProfile::AllowedToPlayMultiplayer(int iProf) { return true; }
-#endif
-#ifdef _WINDOWS64
+
 #if defined(__ORBIS__)
 bool				C_4JProfile::GetChatAndContentRestrictions(int iPad, bool thisQuadrantOnly, bool *pbChatRestricted,bool *pbContentRestricted,int *piAge)
 {
@@ -590,8 +487,8 @@ char fakeGamerTag[32] = "PlayerName";
 void				SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); }
 char*				C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
 #else
-char*				C_4JProfile::GetGamertag(int iPad){ extern char g_Win64Username[17]; return g_Win64Username; }
-wstring				C_4JProfile::GetDisplayName(int iPad){ extern wchar_t g_Win64UsernameW[17]; return g_Win64UsernameW; }
+char*				C_4JProfile::GetGamertag(int iPad){ return "PlayerName"; }
+wstring				C_4JProfile::GetDisplayName(int iPad){ return L"PlayerName"; }
 #endif
 bool				C_4JProfile::IsFullVersion() { return s_bProfileIsFullVersion; }
 void				C_4JProfile::SetSignInChangeCallback(void ( *Func)(LPVOID, bool, unsigned int),LPVOID lpParam) {}

Minecraft.Client/HorseRenderer.cpp

@@ -46,35 +46,9 @@ void HorseRenderer::renderModel(shared_ptr<LivingEntity> mob, float wp, float ws
     }
 	else
 	{
-		shared_ptr<EntityHorse> horse = dynamic_pointer_cast<EntityHorse>(mob);
-		ResourceLocation *location = getTextureLocation(mob);
-
-		// Pass 1: Bind only the coat texture (first valid layer) and render opaque
-		int coatTex = location->getTexture(0);
-		if( coatTex != -1 )
-		{
-			RenderManager.TextureBind(entityRenderDispatcher->textures->loadTexture(coatTex));
-		}
-		model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
-
-		// Pass 2: If horse has armor, find the armor texture in the layers and render with blending
-		int armorType = horse->getArmorType();
-		if( armorType > 0 )
-		{
-			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			for( int i = 1; i < location->getTextureCount(); i++ )
-			{
-				int texId = location->getTexture(i);
-				if( texId != -1 )
-				{
-					RenderManager.TextureBind(entityRenderDispatcher->textures->loadTexture(texId));
-					model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
-				}
-			}
-			glDisable(GL_BLEND);
-		}
-
+        EntityRenderer::bindTexture(mob);
+        model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
+		// Ensure that any extra layers of texturing are disabled after rendering this horse
 		RenderManager.TextureBind(-1);
     }
 }

Minecraft.Client/LivingEntityRenderer.cpp

@@ -491,7 +491,7 @@ void LivingEntityRenderer::renderNameTag(shared_ptr<LivingEntity> mob, const wst
 	float s = 1 / 60.0f * size;
 
 	glPushMatrix();
-	glTranslatef((float) x, (float) y + mob->bbHeight + 0.5f, (float) z);
+	glTranslatef((float) x, (float) y + 2.3f, (float) z);
 	glNormal3f(0, 1, 0);
 
 	glRotatef(-this->entityRenderDispatcher->playerRotY, 0, 1, 0);

Minecraft.Client/Minecraft.Client.vcxproj

@@ -630,6 +630,7 @@
     <ImageXexOutput>$(OutDir)$(ProjectName)_D.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\..\Minecraft.Client\PS3\Assert;$(SCE_PS3_ROOT)\target\ppu\include;$(SCE_PS3_ROOT)\target\common\include;$(SCE_PS3_ROOT)\host-win32\sn\ppu\include;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0\boost\tr1\tr1;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0;$(ProjectDir)..\Minecraft.World\x64headers</IncludePath>
     <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">
     <LinkIncremental>true</LinkIncremental>
@@ -641,6 +642,7 @@
     <LinkIncremental>true</LinkIncremental>
     <ImageXexOutput>$(OutDir)$(ProjectName)_D.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\..\Minecraft.Client\PS3\Assert;$(SCE_PS3_ROOT)\target\ppu\include;$(SCE_PS3_ROOT)\target\common\include;$(SCE_PS3_ROOT)\host-win32\sn\ppu\include;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0\boost\tr1\tr1;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0;$(ProjectDir)..\Minecraft.World\x64headers</IncludePath>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">
     <LinkIncremental>true</LinkIncremental>
@@ -1201,7 +1203,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>_DISABLE_PSN;_DEBUG_MENUS_ENABLED;_ITERATOR_DEBUG_LEVEL=0;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG_MENUS_ENABLED;_ITERATOR_DEBUG_LEVEL=0;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
       <AdditionalIncludeDirectories>PS3\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -1435,7 +1437,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
       <AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -1472,6 +1474,46 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
       <Message>Run Windows64 postbuild script</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CallAttributedProfiling>Disabled</CallAttributedProfiling>
+      <AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <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>
+      <ShowProgress>NotSet</ShowProgress>
+      <SuppressStartupBanner>false</SuppressStartupBanner>
+    </Link>
+    <ImageXex>
+      <ConfigurationFile>$(ProjectDir)xbox\xex-dev.xml</ConfigurationFile>
+    </ImageXex>
+    <ImageXex>
+      <TitleID>1480659447</TitleID>
+    </ImageXex>
+    <ImageXex>
+      <AdditionalSections>584111F7=$(ProjectDir)xbox\GameConfig\Minecraft.spa,RO;media=$(ProjectDir)xbox\XZP\Minecraft.xzp,RO</AdditionalSections>
+      <Pal50Incompatible>true</Pal50Incompatible>
+    </ImageXex>
+    <Deploy>
+      <DeploymentType>CopyToHardDrive</DeploymentType>
+      <DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\res=Xbox\res;$(RemoteRoot)=Xbox\AvatarAwards;$(RemoteRoot)\Tutorial=Xbox\Tutorial\Tutorial;$(RemoteRoot)=Xbox\584111F70AAAAAAA;$(RemoteRoot)=Xbox\kinect\speech;$(RemoteRoot)=Xbox\XZP\TMSFiles.xzp</DeploymentFiles>
+    </Deploy>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -1570,7 +1612,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>_DEBUG_MENUS_ENABLED;_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>
@@ -5102,7 +5144,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="Common\Network\GameNetworkManager.h" />
     <ClInclude Include="Common\Network\NetworkPlayerInterface.h" />
@@ -5125,7 +5166,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
@@ -5193,7 +5234,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="Common\Network\Sony\SonyCommerce.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
@@ -5335,9 +5375,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="Common\Network\WinsockNetLayer.h" />
     <ClInclude Include="Common\Potion_Macros.h" />
     <ClInclude Include="Common\Telemetry\TelemetryManager.h" />
     <ClInclude Include="Common\Trial\TrialMode.h" />
@@ -12918,6 +12956,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BaseRailTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BedTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -13458,6 +13497,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DaylightDetectorTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DetectorRailTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -13773,6 +13813,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DropperTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\EggTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -14358,6 +14399,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\HayBlockTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\HugeMushroomTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15078,7 +15120,8 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h">
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PoweredRailTile_SPU.h" />
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
@@ -15123,6 +15166,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PumpkinTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15168,51 +15212,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
-    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RecordPlayerTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15393,6 +15393,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RotatedPillarTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\SandStoneTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -16473,6 +16474,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\WeightedPressurePlateTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\WoodTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -20026,7 +20028,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <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'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
@@ -25266,7 +25268,6 @@ 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)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="Common\Network\GameNetworkManager.cpp" />
     <ClCompile Include="Common\Network\PlatformNetworkManagerStub.cpp">
@@ -25287,7 +25288,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
@@ -25354,7 +25355,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="Common\Network\Sony\SonyHttp.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
@@ -25495,9 +25495,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="Common\Network\WinsockNetLayer.cpp" />
     <ClCompile Include="Common\Telemetry\TelemetryManager.cpp" />
     <ClCompile Include="Common\Trial\TrialMode.cpp" />
     <ClCompile Include="Common\Tutorial\AreaConstraint.cpp" />
@@ -32345,7 +32343,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.cpp">
+    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
@@ -34016,7 +34014,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">false</ExcludedFromBuild>
@@ -34412,7 +34410,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <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'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>

Minecraft.Client/Minecraft.Client.vcxproj.filters

@@ -2665,15 +2665,9 @@
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PortalTile_SPU.h">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h">
-      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClInclude>
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PumpkinTile_SPU.h">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
-      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClInclude>
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RecordPlayerTile_SPU.h">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
@@ -3775,8 +3769,35 @@
     <ClInclude Include="PSVita\OldSdk.h">
       <Filter>PSVita</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Network\WinsockNetLayer.h">
-      <Filter>Common\Source Files\Network</Filter>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BaseRailTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PoweredRailTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DropperTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\HayBlockTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RotatedPillarTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\WeightedPressurePlateTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DaylightDetectorTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -5004,9 +5025,6 @@
     <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\LiquidTile_SPU.cpp">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClCompile>
-    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.cpp">
-      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClCompile>
     <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\StairTile_SPU.cpp">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClCompile>
@@ -5922,8 +5940,8 @@
     <ClCompile Include="PSVita\OldSdk.cpp">
       <Filter>PSVita</Filter>
     </ClCompile>
-    <ClCompile Include="Common\Network\WinsockNetLayer.cpp">
-      <Filter>Common\Source Files\Network</Filter>
+    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.cpp">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>

Minecraft.Client/Minecraft.cpp

@@ -1858,7 +1858,7 @@ void Minecraft::run_middle()
 			achievementPopup->render();
 
 			PIXBeginNamedEvent(0,"Sleeping");
-			//Sleep(0);	// 4J - was Thread.yield()
+			Sleep(0);	// 4J - was Thread.yield()
 			PIXEndNamedEvent();
 
 			//        if (Keyboard::isKeyDown(Keyboard::KEY_F7)) Display.update();	// 4J - removed condition
@@ -3966,7 +3966,6 @@ void Minecraft::releaseLevel(int message)
 // time when exiting from an online game
 void Minecraft::forceStatsSave(int idx)
 {
-#ifndef DISABLE_PSN
 	//4J Gordon: Force a stats save
 	stats[idx]->save(idx, true);
 
@@ -3978,7 +3977,6 @@ void Minecraft::forceStatsSave(int idx)
 		stats[idx]->saveLeaderboards();
 		ProfileManager.SetLockedProfile(tempLockedProfile);
 	}
-#endif
 }
 
 // 4J Added

Minecraft.Client/Options.cpp

@@ -116,11 +116,7 @@ void Options::init()
     bobView = true;
     anaglyph3d = false;
     advancedOpengl = false;
-#ifdef _WINDOWS64
-    framerateLimit = 0;
-#else
-	framerateLimit = 2;
-#endif
+    framerateLimit = 2;
     fancyGraphics = true;
     ambientOcclusion = true;
 	renderClouds = true;

Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h

@@ -1,32 +1,109 @@
 #pragma once
 
-#include "Common\Leaderboards\SonyLeaderboardManager.h"
 #include "Common\Leaderboards\LeaderboardManager.h"
 
-#include <np.h>
-
-class OrbisLeaderboardManager : public SonyLeaderboardManager
+class OrbisLeaderboardManager : public LeaderboardManager
 {
+protected:
+	enum EStatsState
+	{
+		eStatsState_Idle,
+		eStatsState_Getting,
+		eStatsState_Failed,
+		eStatsState_Ready,
+		eStatsState_Canceled,
+		//eStatsState_Writing,
+		eStatsState_Max
+	};
+
 public:
 	OrbisLeaderboardManager();
+	virtual ~OrbisLeaderboardManager();
 
-protected:
+private:
+	unsigned short m_openSessions;
 
-	virtual HRESULT initialiseScoreUtility();
+	C4JThread *m_threadScoreboard;
+	bool m_running;
 
-	virtual bool scoreUtilityAlreadyInitialised(HRESULT hr);
+	int		m_titleContext;
+	int32_t m_requestId;
 
-	virtual HRESULT createTitleContext(const SceNpId &npId);
+	//SceNpId m_myNpId;
 
-	virtual HRESULT destroyTitleContext(int titleContext);
+	static int scoreboardThreadEntry(LPVOID lpParam);
+	void scoreboardThreadInternal();
 
-	virtual HRESULT createTransactionContext(int titleContext);
+	bool getScoreByIds();
+	bool getScoreByRange();
 
-	virtual HRESULT abortTransactionContext(int transactionContext);
+	bool setScore();
+	queue<RegisterScore> m_views;
 
-	virtual HRESULT destroyTransactionContext(int transactionContext);
+	CRITICAL_SECTION m_csViewsLock;
 
-	virtual HRESULT getFriendsList(sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::FriendsList> &friendsList);
+	EStatsState		m_eStatsState;			//State of the stats read
+	//	EFilterMode		m_eFilterMode;
 
-	virtual char *	getComment(SceNpScoreComment *comment);
+	ReadScore *m_scores;
+	unsigned int m_maxRank;
+	//SceNpScoreRankData *m_stats;
+
+public:
+	virtual void Tick();// {}
+
+	//Open a session
+	virtual bool OpenSession();// { return true; }
+
+	//Close a session
+	virtual void CloseSession();// {}
+
+	//Delete a session
+	virtual void DeleteSession();// {}
+
+	//Write the given stats
+	//This is called synchronously and will not free any memory allocated for views when it is done
+
+	virtual bool WriteStats(unsigned int viewCount, ViewIn views);// { return false; }
+
+	virtual bool ReadStats_Friends(LeaderboardReadListener *callback, int difficulty, EStatsType type, PlayerUID myUID, unsigned int startIndex, unsigned int readCount);// { return false; }
+	virtual bool ReadStats_MyScore(LeaderboardReadListener *callback, int difficulty, EStatsType type, PlayerUID myUID, unsigned int readCount);// { return false; }
+	virtual bool ReadStats_TopRank(LeaderboardReadListener *callback, int difficulty, EStatsType type, unsigned int startIndex, unsigned int readCount);// { return false; }
+
+	//Perform a flush of the stats
+	virtual void FlushStats();// {}
+
+	//Cancel the current operation
+	virtual void CancelOperation();// {}
+
+	//Is the leaderboard manager idle.
+	virtual bool isIdle();// { return true; }
+
+
+private:
+	int getBoardId(int difficulty, EStatsType);
+
+	//LeaderboardManager::ReadScore *filterJustScorers(unsigned int &num, LeaderboardManager::ReadScore *friendsData);
+
+	SceNpScorePlayerRankData *addPadding(unsigned int num, SceNpScoreRankData *rankData);
+
+	void convertToOutput(unsigned int &num, ReadScore *out, SceNpScorePlayerRankData *rankData, SceNpScoreComment *comm);
+
+	void toBinary(void *out, SceNpScoreComment *in);
+	void fromBinary(SceNpScoreComment **out, void *in);
+
+	void toBase32(SceNpScoreComment *out, void *in);
+	void fromBase32(void *out, SceNpScoreComment *in);
+
+	void toSymbols(char *);
+	void fromSymbols(char *);
+
+	bool test_string(string);
+
+	void initReadScoreStruct(ReadScore &out, SceNpScoreRankData &);
+	void fillReadScoreStruct(ReadScore &out, SceNpScoreComment &comment);
+
+	static bool SortByRank(const ReadScore &lhs, const ReadScore &rhs);
+
+	//void NotifyAsyncPlusFeature();
 };

Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp

@@ -1,6 +1,4 @@
 #include "stdafx.h"
-
-#ifndef DISABLE_PSN
 #include "SQRNetworkManager_PS3.h"
 #include "Common/Network/Sony/SQRNetworkPlayer.h"
 #ifdef __PS3__
@@ -3623,5 +3621,4 @@ int SQRNetworkManager_PS3::GetJoiningReadyPercentage()
 	{
 		return 100;
 	}
-}
-#endif
+}

Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp

@@ -1,13 +1,5 @@
 #include "stdafx.h"
 
-#ifdef DISABLE_PSN
-// global func, so we can call from the profile lib
-void SonyCommerce_UpgradeTrial()
-{
-	// we're now calling the app function here, which manages pending requests
-	app.UpgradeTrial();
-}
-#else
 #include "SonyCommerce_PS3.h"
 #include "..\PS3Extras\ShutdownManager.h"
 #include <sys/event.h>
@@ -1519,4 +1511,3 @@ void SonyCommerce_PS3::DownloadAlreadyPurchased( CallbackFunc cb, LPVOID lpParam
 
 
 
-#endif

Minecraft.Client/PS3/Network/SonyVoiceChat.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#ifndef DISABLE_PSN
+
 
 
 
@@ -762,4 +762,3 @@ void SonyVoiceChat::setState( EAVCState state )
 	sm_state = state;
 	printStateAndEvent();
 }
-#endif

Minecraft.Client/PS3/Network/SonyVoiceChat.h

@@ -1,5 +1,5 @@
 #pragma once
-#ifndef _DISABLE_PSN
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -154,5 +154,4 @@ private:
 	static void printStateAndEvent();
 
 
-};
-#endif
+};

Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp

@@ -242,11 +242,10 @@ C4JSpursJob_ChunkUpdate::C4JSpursJob_ChunkUpdate(ChunkRebuildData* pDataIn, Chun
 	extern const CellSpursJobHeader JOBHEADER_SYMBOL(ChunkUpdate);
 	//E create job
 	m_job256.header   = JOBHEADER_SYMBOL(ChunkUpdate);
-	m_job256.header.sizeStack = (60*1024)>>4;
+	m_job256.header.sizeStack = (58*1024)>>4;
 	m_job256.workArea.userData[0] = (uintptr_t)pDataIn;
 	m_job256.workArea.userData[1] = (uintptr_t)pDataOut;
 	assert(cellSpursJobQueueCheckJob(&m_job256, 256, 256) == CELL_OK);
-
 }
 
 C4JSpursJob_LevelRenderer_cull::C4JSpursJob_LevelRenderer_cull(LevelRenderer_cull_DataIn* pDataIn) 

Minecraft.Client/PS3/PS3_App.cpp

@@ -10,9 +10,7 @@
 #include "..\..\Minecraft.World\LevelSettings.h"
 #include "..\..\Minecraft.World\BiomeSource.h"
 #include "..\..\Minecraft.World\LevelType.h"
-#ifndef DISABLE_PSN
 #include "..\..\PS3\Network\SonyCommerce_PS3.h"
-#endif
 #include "..\..\Minecraft.World\StringHelpers.h"
 #include "PS3Extras\ShutdownManager.h"
 #include "PS3\Network\SonyRemoteStorage_PS3.h"
@@ -562,7 +560,6 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart()
 
 void CConsoleMinecraftApp::CommerceInit()
 {
-#ifndef DISABLE_PSN
 	m_bCommerceCategoriesRetrieved=false;
 	m_bCommerceProductListRetrieved=false;
 	m_bCommerceInitialised=false;
@@ -575,12 +572,10 @@ void CConsoleMinecraftApp::CommerceInit()
 	m_iCurrentCategory=0;
 	m_iCurrentProduct=0;
 	memset(m_pchSkuID,0,48);
-#endif
 }
 
 void CConsoleMinecraftApp::CommerceTick()
 {
-#ifndef DISABLE_PSN
 	// only tick this if the primary user is signed in to the PSN
 	if(ProfileManager.IsSignedInLive(0))
 	{
@@ -700,7 +695,6 @@ void CConsoleMinecraftApp::CommerceTick()
 		}
 	}
 	else
-#endif
 	{
 		// was the primary player signed in and is now signed out?
 		if(m_eCommerce_State!=eCommerce_State_Offline)

Minecraft.Client/PS3/PS3_Minecraft.cpp

@@ -24,7 +24,6 @@ SYS_PROCESS_PARAM(1001, 0x10000);  // thread priority, and stack size
 #include <sysutil/sysutil_msgdialog.h>
 
 #include "PS3/Network/SonyRemoteStorage_PS3.h"
-#include "..\..\Minecraft.Client\Common\Network\WinsockNetLayer.h"
 
 // define to use spurs (otherwise SPU threads or raw will be used)
 #define USE_SPURS
@@ -36,9 +35,6 @@ SYS_PROCESS_PARAM(1001, 0x10000);  // thread priority, and stack size
 #include <sys/spu_image.h>
 #endif
 
-#ifdef DISABLE_PSN
-#include "../Passphrase/ps3__np_conf.h"
-#endif
 /* Encrypted ID for protected data file (*) You must edit these binaries!! */
 char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] = 
 {
@@ -523,9 +519,7 @@ void RegisterAwardsWithProfileManager()
 	// Rich Presence init - number of presences, number of contexts
 	//printf("Rich presence strings are hard coded on PS3 for now, must change this!\n");
 	ProfileManager.RichPresenceInit(-1,-1); // 4J-JEV - Presence and Context count not used.
-#ifndef DISABLE_PSN
 	ProfileManager.SetRichPresenceSettingFn(SQRNetworkManager_PS3::SetRichPresence);
-#endif
 	char *pchRichPresenceString;
 
 	pchRichPresenceString=(char *)AddRichPresenceString(IDS_RICHPRESENCE_GAMESTATE);
@@ -861,9 +855,7 @@ int main()
 
 	app.CommerceInit(); //  MGH - moved this here so GetCommerce isn't NULL
 	// 4J-PB - Kick of the check for trial or full version - requires ui to be initialised
-#ifndef DISABLE_PSN
 	app.GetCommerce()->CheckForTrialUpgradeKey();
-#endif
 
 	static bool bTrialTimerDisplayed=true;
 
@@ -896,13 +888,8 @@ int main()
 
 
 	// Initialise the profile manager with the game Title ID, Offer ID, a profile version number, and the number of profile values and settings
-#ifndef DISABLE_PSN	
 	ProfileManager.Initialise(SQRNetworkManager_PS3::GetSceNpCommsId(),
 		SQRNetworkManager_PS3::GetSceNpCommsSig(),
-#else
-	ProfileManager.Initialise(&s_npCommunicationId,
-		&s_npCommunicationSignature,
-#endif
 		PROFILE_VERSION_10,
 		NUM_PROFILE_VALUES,
 		NUM_PROFILE_SETTINGS,
@@ -1129,7 +1116,6 @@ int main()
 	if(ShutdownManager::ShouldRun(ShutdownManager::eMainThread))
 	{
 		g_NetworkManager.Initialise();
-		WinsockNetLayer::Initialize();
 		g_NetworkManager.SetLocalGame(true);
 	}
 

Minecraft.Client/PS3/PS3_PlayerUID.h

@@ -2,7 +2,6 @@
 
 
 #pragma once
-//#include "stdafx.h"
 
 
 // Note - there are now 3 types of PlayerUID
@@ -20,7 +19,6 @@ class PlayerUID
 	CellSysutilUserId	m_userID;		// user logged on to the XMB
 
 public:
-	ULONGLONG XUID;
 
 	class Hash 
 	{
@@ -31,8 +29,6 @@ public:
 	PlayerUID();
 	PlayerUID(CellSysutilUserId userID, SceNpOnlineId& onlineID, bool bSignedInPSN, int quadrant);
 	PlayerUID(std::wstring fromString);
-	PlayerUID(ULONGLONG xuid) { XUID = xuid; }
-	operator ULONGLONG() const { return XUID; }
 
 	bool operator==(const PlayerUID& rhs) const;
 	bool operator!=(const PlayerUID& rhs);

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ActivatorRailTile_SPU.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "BaseRailTile_SPU.h"
+
+class ActivatorRailTile_SPU : public BaseRailTile_SPU
+{
+public:
+	ActivatorRailTile_SPU(int id) : BaseRailTile_SPU(id) {}
+
+	Icon_SPU *getTexture(int face, int data)
+	{
+		if ((data & RAIL_DATA_BIT) == 0)
+		{
+			return &ms_pTileData->activatorRailTile_icon;
+		}
+		else
+		{
+			return &ms_pTileData->activatorRailTile_iconPowered;
+		}
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BasePressurePlateTile_SPU.cpp

@@ -0,0 +1,41 @@
+#include "stdafx.h"
+#include "BasePressurePlateTile_SPU.h"
+#include "ChunkRebuildData.h"
+
+
+bool BasePressurePlateTile_SPU::isSolidRender(bool isServerLevel)
+{
+	return false;
+}
+
+bool BasePressurePlateTile_SPU::blocksLight()
+{
+	return false;
+}
+
+
+void BasePressurePlateTile_SPU::updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData, TileEntity* forceEntity) // 4J added forceData, forceEntity param
+{
+	int data = level->getData(x, y, z);
+    bool pressed = getSignalForData(data) > 0; // 0 is Redstone::SIGNAL_NONE
+	float o = 1 / 16.0f;
+
+	if (pressed)
+	{
+		setShape(o, 0, o, 1 - o, 0.5f / 16.0f, 1 - o);
+	}
+	else
+	{
+		setShape(o, 0, o, 1 - o, 1 / 16.0f, 1 - o);
+	}
+}
+
+
+void BasePressurePlateTile_SPU::updateDefaultShape()
+{
+    float x = 8 / 16.0f;
+	float y = 2 / 16.0f;
+	float z = 8 / 16.0f;
+	setShape(0.5f - x, 0.5f - y, 0.5f - z, 0.5f + x, 0.5f + y, 0.5f + z);
+}
+

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BasePressurePlateTile_SPU.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "Tile_SPU.h"
+
+
+class BasePressurePlateTile_SPU : public Tile_SPU
+{
+public:
+	BasePressurePlateTile_SPU(int id) : Tile_SPU(id) {}
+    virtual bool isSolidRender(bool isServerLevel = false);
+	virtual bool blocksLight();
+
+	virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL);	// 4J added forceData, forceEntity param
+    virtual void updateDefaultShape();
+protected:
+	virtual int getSignalForData(int data) = 0;
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BaseRailTile_SPU.h

@@ -0,0 +1,31 @@
+#pragma once
+#include "Tile_SPU.h"
+
+class BaseRailTile_SPU : public Tile_SPU
+{
+
+public:
+	static const int RAIL_DATA_BIT = 8;
+	static const int RAIL_DIRECTION_MASK = 7;
+
+	BaseRailTile_SPU(int id) : Tile_SPU(id) {}
+    virtual bool isSolidRender(bool isServerLevel = false) { return false; }
+    virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL)	// 4J added forceData, forceEntity param
+	{
+		int data = level->getData(x, y, z);
+		if (data >= 2 && data <= 5)
+		{
+			setShape(0, 0, 0, 1, 2 / 16.0f + 0.5f, 1);
+		} else
+		{
+			setShape(0, 0, 0, 1, 2 / 16.0f, 1);
+		}
+	}
+    virtual int getRenderShape() { return Tile_SPU::SHAPE_RAIL; }
+	bool isUsesDataBit()
+	{
+		if(id == goldenRail_Id || id == detectorRail_Id || id == activatorRail_Id)
+			return true;
+		return false;
+	}
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ButtonTile_SPU.h

@@ -13,7 +13,7 @@ public:
 		if(id == Tile_SPU::button_wood_Id) 
 			return TileRef_SPU(wood_Id)->getTexture(Facing::UP);
 		else 
-			return TileRef_SPU(rock_Id)->getTexture(Facing::UP);
+			return TileRef_SPU(stone_Id)->getTexture(Facing::UP);
 	}
     virtual bool blocksLight() { return false; }
     virtual bool isSolidRender(bool isServerLevel = false) { return false; }

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp

@@ -39,7 +39,7 @@ static const int Level_MAX_BRIGHTNESS = 15;
 #include "TileRenderer_SPU.h"
 #include "Tile_SPU.h"
 #include "ChunkRebuildData.h"
-TileData_SPU g_tileSPUData;
+//TileData_SPU g_tileSPUData;
 
 static const int MAX_LEVEL_SIZE = 30000000;
 static const int MAX_BRIGHTNESS = 15;
@@ -89,30 +89,30 @@ void ChunkRebuildData::disableUnseenTiles()
 
 				// Establish whether this tile and its neighbours are all made of rock, dirt, unbreakable tiles, or have already
 				// been determined to meet this criteria themselves and have a tile of 255 set.
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX-1, iY, iZ);
 				flags = getFlags(iX-1, iY, iZ);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX+1, iY, iZ);
 				flags = getFlags(iX+1, iY, iZ);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX, iY, iZ-1);
 				flags = getFlags(iX, iY, iZ-1);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX, iY, iZ+1);
 				flags = getFlags(iX, iY, iZ+1);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				// Treat the bottom of the world differently - we shouldn't ever be able to look up at this, so consider tiles as invisible
 				// if they are surrounded on sides other than the bottom
 				if( iY > 0 )
 				{
 					tileID = getTile(iX, iY-1, iZ);
 					flags = getFlags(iX, iY-1, iZ);
-					if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+					if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				}
 				tileID = getTile(iX, iY+1, iZ);
 				flags = getFlags(iX, iY+1, iZ);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 
 				// This tile is surrounded. Flag it as not requiring to be rendered by setting its id to 255.
 				setFlag(iX, iY, iZ, e_flag_NoRender);
@@ -157,7 +157,7 @@ void ChunkRebuildData::buildMaterials()
 	buildMaterial(Material_SPU::plant_Id,				Material::plant);				
 	buildMaterial(Material_SPU::replaceable_plant_Id,	Material::replaceable_plant);	
 	buildMaterial(Material_SPU::sponge_Id,				Material::sponge);				
-	buildMaterial(Material_SPU::cloth_Id,				Material::cloth);				
+	buildMaterial(Material_SPU::wool_Id,				Material::cloth);				
 	buildMaterial(Material_SPU::fire_Id,				Material::fire);				
 	buildMaterial(Material_SPU::sand_Id,				Material::sand);				
 	buildMaterial(Material_SPU::decoration_Id,			Material::decoration);		
@@ -195,7 +195,7 @@ int ChunkRebuildData::getMaterialID(Tile* pTile)
 	if(m == Material::plant)  			return Material_SPU::plant_Id;					
 	if(m == Material::replaceable_plant)return Material_SPU::replaceable_plant_Id;		
 	if(m == Material::sponge)  			return Material_SPU::sponge_Id;					
-	if(m == Material::cloth)  			return Material_SPU::cloth_Id;					
+	if(m == Material::cloth)  			return Material_SPU::wool_Id;					
 	if(m == Material::fire)  			return Material_SPU::fire_Id;				
 	if(m == Material::sand)  			return Material_SPU::sand_Id;				
 	if(m == Material::decoration)  		return Material_SPU::decoration_Id;			
@@ -341,9 +341,17 @@ void ChunkRebuildData::createTileData()
 	setIconSPUFromIcon(&m_tileData.dispenserTile_iconFront, ((DispenserTile*)Tile::dispenser)->iconFront);
 	setIconSPUFromIcon(&m_tileData.dispenserTile_iconFrontVertical, ((DispenserTile*)Tile::dispenser)->iconFrontVertical);
 
+	setIconSPUFromIcon(&m_tileData.dropperTile_iconFront, ((DropperTile*)Tile::dropper)->iconFront);
+	setIconSPUFromIcon(&m_tileData.dropperTile_iconFrontVertical, ((DropperTile*)Tile::dropper)->iconFrontVertical);
+
 	// RailTile
 	setIconSPUFromIcon(&m_tileData.railTile_iconTurn, ((RailTile*)Tile::rail)->iconTurn);
-	setIconSPUFromIcon(&m_tileData.railTile_iconTurnGolden, ((RailTile*)Tile::goldenRail)->iconTurn);
+
+	setIconSPUFromIcon(&m_tileData.poweredRailTile_icon, ((PoweredRailTile*)Tile::goldenRail)->icon);
+	setIconSPUFromIcon(&m_tileData.poweredRailTile_iconPowered, ((PoweredRailTile*)Tile::goldenRail)->iconPowered);
+
+	setIconSPUFromIcon(&m_tileData.activatorRailTile_icon, ((PoweredRailTile*)Tile::activatorRail)->icon);
+	setIconSPUFromIcon(&m_tileData.activatorRailTile_iconPowered, ((PoweredRailTile*)Tile::activatorRail)->iconPowered);
 
 	for(int i=0;i<2;i++)
 		setIconSPUFromIcon(&m_tileData.detectorRailTile_icons[i], ((DetectorRailTile*)Tile::detectorRail)->icons[i]);
@@ -413,8 +421,12 @@ void ChunkRebuildData::createTileData()
 
 	setIconSPUFromIcon(&m_tileData.stoneSlab_iconSide, ((StoneSlabTile*)(Tile::stoneSlab))->iconSide);
 
+	//ColoredTile
 	for(int i=0;i<16;i++)
-		setIconSPUFromIcon(&m_tileData.clothTile_icons[i], ((ColoredTile*)Tile::wool)->icons[i]);
+		setIconSPUFromIcon(&m_tileData.woolTile_icons[i], ((ColoredTile*)Tile::wool)->icons[i]);
+
+	for(int i=0;i<16;i++)
+		setIconSPUFromIcon(&m_tileData.clayHardened_colored_icons[i], ((ColoredTile*)Tile::clayHardened_colored)->icons[i]);
 
 	// CarrotTile
 	for(int i=0;i<4;i++)
@@ -438,6 +450,13 @@ void ChunkRebuildData::createTileData()
 	setIconSPUFromIcon(&m_tileData.quartzBlock_iconTop, ((QuartzBlockTile*)Tile::quartzBlock)->iconTop);
 	setIconSPUFromIcon(&m_tileData.quartzBlock_iconBottom, ((QuartzBlockTile*)Tile::quartzBlock)->iconBottom);
 
+	// HayBlockTile
+	setIconSPUFromIcon(&m_tileData.hayBlockTile_iconTop, ((HayBlockTile*)Tile::hayBlock)->iconTop);
+	setIconSPUFromIcon(&m_tileData.hayBlockTile_icon, ((HayBlockTile*)Tile::hayBlock)->icon);
+
+	// DaylightDetectorTile
+	for(int i=0;i<1;i++)
+		setIconSPUFromIcon(&m_tileData.daylightDetector_icons[i], ((DaylightDetectorTile*)Tile::daylightDetector)->icons[i]);
 }
 
 // extern int g_lastHitBlockX;

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h

@@ -59,7 +59,7 @@ public:
 	int m_lastHitBlockX;
 	int m_lastHitBlockY;
 	int m_lastHitBlockZ;
- 	unsigned int	m_pad[5];// padding to 16 byte alignment
+ 	unsigned int	m_pad[3];// padding to 16 byte alignment
 
 
 	int getTileIdx(int x, int y, int z) 	{	return (( x - m_x0 )*sc_size*sc_size) + (( y - m_y0 )*sc_size) + ( z - m_z0 );	}

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

@@ -115,6 +115,7 @@
     <ClInclude Include="WorkbenchTile_SPU.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="BasePressurePlateTile_SPU.cpp" />
     <ClCompile Include="ChunkRebuildData.cpp" />
     <ClCompile Include="DiodeTile_SPU.cpp" />
     <ClCompile Include="Direction_SPU.cpp" />
@@ -126,7 +127,6 @@
     <ClCompile Include="Icon_SPU.cpp" />
     <ClCompile Include="LeafTile_SPU.cpp" />
     <ClCompile Include="LiquidTile_SPU.cpp" />
-    <ClCompile Include="PressurePlateTile_SPU.cpp" />
     <ClCompile Include="StairTile_SPU.cpp" />
     <ClCompile Include="TallGrass_SPU.cpp" />
     <ClCompile Include="task.cpp" />

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

@@ -142,9 +142,6 @@
     <ClCompile Include="LiquidTile_SPU.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PressurePlateTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="StairTile_SPU.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -166,5 +163,8 @@
     <ClCompile Include="TileRenderer_SPU.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="BasePressurePlateTile_SPU.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ClothTile_SPU.h

@@ -1,11 +0,0 @@
-#pragma once
-#include "Tile_SPU.h"
-
-class ClothTile_SPU : public Tile_SPU
-{
-public:
-	ClothTile_SPU(int id) : Tile_SPU(id) {}
-	virtual Icon_SPU *getTexture(int face, int data) {	return &ms_pTileData->clothTile_icons[data]; }
-
-
-};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ColoredClay_SPU.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "Tile_SPU.h"
+
+class ColoredClay_SPU : public Tile_SPU
+{
+public:
+	ColoredClay_SPU(int id) : Tile_SPU(id) {}
+	virtual Icon_SPU *getTexture(int face, int data) {	return &ms_pTileData->clayHardened_colored_icons[data]; }
+
+
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DaylightDetectorTile_SPU.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "EntityTile_SPU.h"
+
+class DaylightDetectorTile_SPU : public EntityTile_SPU
+{
+public:
+	DaylightDetectorTile_SPU(int id) : EntityTile_SPU(id) {}
+
+	Icon_SPU *getTexture(int face, int data) {
+		if (face == Facing::UP)
+		{
+			return &ms_pTileData->daylightDetector_icons[0];
+		}
+		return &ms_pTileData->daylightDetector_icons[1];
+	};
+
+	virtual bool isSolidRender(bool isServerLevel = false) { return false; }
+
+	virtual void updateDefaultShape() { setShape(0, 0, 0, 1, 6.0f / 16.0f, 1); };
+	virtual void updateShape() { setShape(0, 0, 0, 1, 6.0f / 16.0f, 1); };
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DetectorRailTile_SPU.h

@@ -2,10 +2,10 @@
 #include "RailTile_SPU.h"
 
 
-class DetectorRailTile_SPU : public RailTile_SPU
+class DetectorRailTile_SPU : public BaseRailTile_SPU
 {
 public:
-	DetectorRailTile_SPU(int id) : RailTile_SPU(id) {}
+	DetectorRailTile_SPU(int id) : BaseRailTile_SPU(id) {}
 	Icon_SPU *getTexture(int face, int data)
 	{
 		if ((data & RAIL_DATA_BIT) != 0)

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DiodeTile_SPU.h

@@ -21,9 +21,9 @@ public:
 		{
 			if (id==diode_on_Id)
 			{
-				return TileRef_SPU(notGate_on_Id)->getTexture(face);
+				return TileRef_SPU(redstoneTorch_on_Id)->getTexture(face);
 			}
-			return TileRef_SPU(notGate_off_Id)->getTexture(face);
+			return TileRef_SPU(redstoneTorch_off_Id)->getTexture(face);
 		}
 		if (face == Facing::UP)
 		{

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DropperTile_SPU.h

@@ -0,0 +1,37 @@
+#pragma once
+#include "DispenserTile_SPU.h"
+#include "Facing_SPU.h"
+
+
+class DropperTile_SPU : public DispenserTile_SPU
+{
+public:
+	DropperTile_SPU(int id) : DispenserTile_SPU(id) {}
+
+public:
+	virtual Icon_SPU *getTexture(int face, int data)
+	{
+		int dir = data & FACING_MASK;
+		if (face == dir)
+		{
+			if (dir == Facing::UP || dir == Facing::DOWN)
+			{
+				return &ms_pTileData->dropperTile_iconFrontVertical;
+			}
+			else
+			{
+				return &ms_pTileData->dropperTile_iconFront;
+			}
+		}
+
+		if (dir == Facing::UP || dir == Facing::DOWN)
+		{
+			return &ms_pTileData->dispenserTile_iconTop;
+		}
+		else if (face == Facing::UP || face == Facing::DOWN)
+		{
+			return &ms_pTileData->dispenserTile_iconTop;
+		}
+		return icon();
+	}
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FireTile_SPU.h

@@ -33,7 +33,7 @@ public:
 		case Tile_SPU::bookshelf_Id:
 		case Tile_SPU::tnt_Id:
 		case Tile_SPU::tallgrass_Id:
-		case Tile_SPU::cloth_Id:
+		case Tile_SPU::wool_Id:
 		case Tile_SPU::vine_Id:
 			return true;
 		default:

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HayBlockTile_SPU.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "RotatedPillarTile_SPU.h"
+
+class HayBlockTile_SPU : public RotatedPillarTile_SPU
+{
+	friend class ChunkRebuildData;
+public:
+	HayBlockTile_SPU(int id) : RotatedPillarTile_SPU(id) {}
+
+protected:
+	Icon_SPU *getTopTexture(int type) {
+		return &ms_pTileData->hayBlockTile_iconTop;
+	};
+
+	Icon_SPU *getTypeTexture(int type) {
+		return &ms_pTileData->hayBlockTile_icon;
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HugeMushroomTile_SPU.h

@@ -14,8 +14,8 @@ public:
     Icon_SPU *getTexture(int face, int data)
 	{
 		Icon_SPU* icons = ms_pTileData->hugeMushroom_icons;
-		int type = 0; // hugeMushroom1_Id
-		if(id == hugeMushroom2_Id)
+		int type = 0; // hugemushroom_brown_Id
+		if(id == hugeMushroom_red_Id)
 			type = 1;
 		// 123
 		// 456 10

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Material_SPU.h

@@ -19,7 +19,7 @@ public:
 	static const int plant_Id = 9;
 	static const int replaceable_plant_Id = 10;
 	static const int sponge_Id = 11;
-	static const int cloth_Id = 12;
+	static const int wool_Id = 12;
 	static const int fire_Id = 13;
 	static const int sand_Id = 14;
 	static const int decoration_Id = 15;

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PoweredRailTile_SPU.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "BaseRailTile_SPU.h"
+
+class PoweredRailTile_SPU : public BaseRailTile_SPU
+{
+public:
+	PoweredRailTile_SPU(int id) : BaseRailTile_SPU(id) {}
+
+	Icon_SPU *getTexture(int face, int data)
+	{
+		if ((data & RAIL_DATA_BIT) == 0)
+		{
+			return &ms_pTileData->poweredRailTile_icon;
+		}
+		else
+		{
+			return &ms_pTileData->poweredRailTile_iconPowered;
+		}
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PressurePlateTile_SPU.cpp

@@ -1,41 +0,0 @@
-#include "stdafx.h"
-#include "PressurePlateTile_SPU.h"
-#include "ChunkRebuildData.h"
-
-
-bool PressurePlateTile_SPU::isSolidRender(bool isServerLevel)
-{
-	return false;
-}
-
-bool PressurePlateTile_SPU::blocksLight()
-{
-	return false;
-}
-
-
-void PressurePlateTile_SPU::updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData, TileEntity* forceEntity) // 4J added forceData, forceEntity param
-{
-    bool pressed = level->getData(x, y, z) == 1;
-
-    float o = 1 / 16.0f;
-    if (pressed)
-	{
-        this->setShape(o, 0, o, 1 - o, 0.5f / 16.0f, 1 - o);
-    }
-	else
-	{
-        setShape(o, 0, o, 1 - o, 1 / 16.0f, 1 - o);
-    }
-}
-
-
-void PressurePlateTile_SPU::updateDefaultShape()
-{
-    float x = 8 / 16.0f;
-    float y = 2 / 16.0f;
-    float z = 8 / 16.0f;
-    setShape(0.5f - x, 0.5f - y, 0.5f - z, 0.5f + x, 0.5f + y, 0.5f + z);
-
-}
-

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PressurePlateTile_SPU.h

@@ -1,21 +1,23 @@
 #pragma once
-#include "Tile_SPU.h"
+#include "BasePressurePlateTile_SPU.h"
 
-
-class PressurePlateTile_SPU : public Tile_SPU
+class PressurePlateTile_SPU : public BasePressurePlateTile_SPU
 {
 public:
-    enum Sensitivity
+	enum Sensitivity
 	{
-        everything,
-		mobs,
-		players
-    };
+		everything, mobs, players
+	};
 
-	PressurePlateTile_SPU(int id) : Tile_SPU(id) {}
-    virtual bool isSolidRender(bool isServerLevel = false);
-    virtual bool blocksLight();
+private:
+	Sensitivity sensitivity;
 
-	virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL);	// 4J added forceData, forceEntity param
-    virtual void updateDefaultShape();
-};
+public:
+	PressurePlateTile_SPU(int id) : BasePressurePlateTile_SPU(id) {}
+
+protected:
+	virtual int getSignalForData(int data) {
+		// 15 is Redstone::SIGNAL_MAX
+		return data == 1 ? 15 : 0;
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RailTile_SPU.h

@@ -1,58 +1,21 @@
 #pragma once
-#include "Tile_SPU.h"
 
-class RailTile_SPU : public Tile_SPU
+#include "BaseRailTile_SPU.h"
+
+class RailTile_SPU : public BaseRailTile_SPU
 {
-
 public:
-	static const int RAIL_DATA_BIT = 8;
-	static const int RAIL_DIRECTION_MASK = 7;
+	RailTile_SPU(int id) : BaseRailTile_SPU(id) {}
 
-	RailTile_SPU(int id) : Tile_SPU(id) {}
-    virtual bool isSolidRender(bool isServerLevel = false) { return false; }
-    virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL)	// 4J added forceData, forceEntity param
+	Icon_SPU *getTexture(int face, int data)
 	{
-		int data = level->getData(x, y, z);
-		if (data >= 2 && data <= 5)
+		if (data >= 6)
 		{
-			setShape(0, 0, 0, 1, 2 / 16.0f + 0.5f, 1);
-		} else
-		{
-			setShape(0, 0, 0, 1, 2 / 16.0f, 1);
+			return &ms_pTileData->railTile_iconTurn;
 		}
-	}
-    virtual Icon_SPU *getTexture(int face, int data)
-	{
-		bool usesDataBit = false;
-		Icon_SPU* iconTurn = &ms_pTileData->railTile_iconTurn;
-		if(id == goldenRail_Id)
+		else
 		{
-			usesDataBit = true;
-			iconTurn = &ms_pTileData->railTile_iconTurnGolden;
+			return icon();
 		}
-
-		if (usesDataBit)
-		{
-// 			if (id == Tile::goldenRail_Id)
-// 			{
-				if ((data & RAIL_DATA_BIT) == 0)
-				{
-					return icon();
-				}
-				else
-				{
-					return iconTurn; // Actually the powered rail on version
-				}
-// 			}
-		} else if (data >= 6) return iconTurn;
-		return icon();
-
-	}
-    virtual int getRenderShape() { return Tile_SPU::SHAPE_RAIL; }
-	bool isUsesDataBit()
-	{
-		if(id == goldenRail_Id || id == detectorRail_Id)
-			return true;
-		return false;
-	}
+	};
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RotatedPillarTile_SPU.h

@@ -0,0 +1,45 @@
+#pragma once
+
+#include "Tile_SPU.h"
+#include "Facing_SPU.h"
+
+class RotatedPillarTile_SPU : public Tile_SPU
+{
+public:
+	static const int MASK_TYPE = 0x3;
+	static const int MASK_FACING = 0xC;
+	static const int FACING_Y = 0 << 2;
+	static const int FACING_X = 1 << 2;
+	static const int FACING_Z = 2 << 2;
+
+protected:
+	RotatedPillarTile_SPU(int id) : Tile_SPU(id) {}
+
+public:
+	virtual int getRenderShape() { return Tile_SPU::SHAPE_TREE; };
+
+	virtual Icon_SPU *getTexture(int face, int data) {
+		int dir = data & MASK_FACING;
+		int type = data & MASK_TYPE;
+
+		if (dir == FACING_Y && (face == Facing::UP || face == Facing::DOWN))
+		{
+			return getTopTexture(type);
+		}
+		else if (dir == FACING_X && (face == Facing::EAST || face == Facing::WEST))
+		{
+			return getTopTexture(type);
+		}
+		else if (dir == FACING_Z && (face == Facing::NORTH || face == Facing::SOUTH))
+		{
+			return getTopTexture(type);
+		}
+
+		return getTypeTexture(type);
+	};
+
+protected:
+	virtual Icon_SPU *getTypeTexture(int type) = 0;
+
+	virtual Icon_SPU *getTopTexture(int type) = 0;
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/SkullTile_SPU.h

@@ -43,5 +43,5 @@ public:
 		}
 	}
 
-	Icon_SPU *getTexture(int face, int data) { 	return TileRef_SPU(hellSand_Id)->getTexture(face); }
+	Icon_SPU *getTexture(int face, int data) { 	return TileRef_SPU(netherRack_Id)->getTexture(face); }
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StairTile_SPU.cpp

@@ -39,7 +39,7 @@ bool StairTile_SPU::isStairs(int id)
 	case Tile_SPU::stairs_wood_Id:
 	case Tile_SPU::stairs_stone_Id:
 	case Tile_SPU::stairs_bricks_Id:	
-	case Tile_SPU::stairs_stoneBrickSmooth_Id:
+	case Tile_SPU::stairs_stoneBrick_Id:
 	case Tile_SPU::stairs_netherBricks_Id:
 	case Tile_SPU::stairs_sandstone_Id:
 	case Tile_SPU::stairs_sprucewood_Id:

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneMonsterTile_SPU.h

@@ -21,12 +21,12 @@ public:
 	{
 		if (data == HOST_COBBLE)
 		{
-			return TileRef_SPU(stoneBrick_Id)->getTexture(face);
+			return TileRef_SPU(cobblestone_Id)->getTexture(face);
 		}
 		if (data == HOST_STONEBRICK)
 		{
-			return TileRef_SPU(stoneBrickSmooth_Id)->getTexture(face);
+			return TileRef_SPU(stoneBrick_Id)->getTexture(face);
 		}
-		return TileRef_SPU(rock_Id)->getTexture(face);
+		return TileRef_SPU(stone_Id)->getTexture(face);
 	}
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneSlabTile_SPU.h

@@ -41,11 +41,11 @@ public:
 		case WOOD_SLAB:
 			return TileRef_SPU(wood_Id)->getTexture(face); //Tile::wood->getTexture(face);
 		case COBBLESTONE_SLAB:
-			return TileRef_SPU(stoneBrick_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face);
+			return TileRef_SPU(cobblestone_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face);
 		case BRICK_SLAB:
 			return TileRef_SPU(redBrick_Id)->getTexture(face); //Tile::redBrick->getTexture(face);
  		case SMOOTHBRICK_SLAB:
- 			return TileRef_SPU(stoneBrickSmooth_Id)->getTexture(face); //Tile::stoneBrickSmooth->getTexture(face, SmoothStoneBrickTile::TYPE_DEFAULT);
+ 			return TileRef_SPU(stoneBrick_Id)->getTexture(face); //Tile::stoneBrickSmooth->getTexture(face, SmoothStoneBrickTile::TYPE_DEFAULT);
  		case NETHERBRICK_SLAB:
  			return TileRef_SPU(netherBrick_Id)->getTexture(Facing::UP); //Tile::netherBrick->getTexture(Facing::UP);
 		case QUARTZ_SLAB:

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp

@@ -12,6 +12,7 @@
 #include "DirtTile_SPU.h"
 #include "DoorTile_SPU.h"
 #include "PressurePlateTile_SPU.h"
+#include "WeightedPressurePlateTile_SPU.h"
 #include "FarmTile_SPU.h"
 #include "Bush_SPU.h"
 #include "TallGrass_SPU.h"
@@ -32,7 +33,10 @@
 #include "IceTile_SPU.h"
 #include "PortalTile_SPU.h"
 #include "DispenserTile_SPU.h"
+#include "DropperTile_SPU.h"
 #include "RailTile_SPU.h"
+#include "PoweredRailTile_SPU.h"
+#include "ActivatorRailTile_SPU.h"
 #include "DetectorRailTile_SPU.h"
 #include "TntTile_SPU.h"
 #include "BookshelfTile_SPU.h"
@@ -71,7 +75,7 @@
 #include "EggTile_SPU.h"
 #include "CocoaTile_SPU.h"
 #include "RedlightTile_SPU.h"
-#include "ClothTile_SPU.h"
+#include "WoolTile_SPU.h"
 #include "SkullTile_SPU.h"
 #include "MobSpawnerTile_SPU.h"
 #include "EnderChestTile_SPU.h"
@@ -83,6 +87,9 @@
 #include "PotatoTile_SPU.h"
 #include "QuartzBlockTile_SPU.h"
 #include "WoolCarpetTile_SPU.h"
+#include "ColoredClay_SPU.h"
+#include "HayBlockTile_SPU.h"
+#include "DaylightDetectorTile_SPU.h"
 
 #ifdef SN_TARGET_PS3_SPU
 #include "..\Common\spu_assert.h"
@@ -514,7 +521,7 @@ void Tile_SPU::updateDefaultShape()
 // void Tile_SPU::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y, int z, int data)
 // {
 // 	// 4J Stu - Special case - only record a crop destroy if is fully grown
-// 	if(id==Tile_SPU::crops_Id)
+// 	if(id==Tile_SPU::wheat_Id)
 // 	{
 // 		if( Tile_SPU::crops->getResource(data, NULL, 0) > 0 )
 // 			player->awardStat(Stats::blocksMined[id], 1);
@@ -681,6 +688,7 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(woodSlabHalf_Id, WoodSlabTile_SPU);
 
 	CREATE_TILE_TYPE(chest_Id, ChestTile_SPU);
+	CREATE_TILE_TYPE(chest_trap_Id, ChestTile_SPU);
 
 	CREATE_TILE_TYPE(ironFence_Id, ThinFenceTile_SPU);
 	CREATE_TILE_TYPE(thinGlass_Id, ThinFenceTile_SPU);
@@ -691,7 +699,7 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(stairs_wood_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_stone_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_bricks_Id, StairTile_SPU);	
-	CREATE_TILE_TYPE(stairs_stoneBrickSmooth_Id, StairTile_SPU);
+	CREATE_TILE_TYPE(stairs_stoneBrick_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_netherBricks_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_sandstone_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_sprucewood_Id, StairTile_SPU);
@@ -706,6 +714,9 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(pressurePlate_stone_Id, PressurePlateTile_SPU);
 	CREATE_TILE_TYPE(pressurePlate_wood_Id, PressurePlateTile_SPU);
 
+	CREATE_TILE_TYPE(weightedPlate_light_Id, WeightedPressurePlateTile_SPU);
+	CREATE_TILE_TYPE(weightedPlate_heavy_Id, WeightedPressurePlateTile_SPU);
+
 	CREATE_TILE_TYPE(farmland_Id, FarmTile_SPU);
 
 	CREATE_TILE_TYPE(flower_Id, Bush_SPU);
@@ -722,19 +733,19 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(leaves_Id, LeafTile_SPU);
 
-	CREATE_TILE_TYPE(crops_Id, CropTile_SPU);
+	CREATE_TILE_TYPE(wheat_Id, CropTile_SPU);
 
 	CREATE_TILE_TYPE(reeds_Id, ReedTile_SPU);
 
 	CREATE_TILE_TYPE(torch_Id, TorchTile_SPU);
-	CREATE_TILE_TYPE(notGate_off_Id, TorchTile_SPU); // TorchTile->NotGateTile
-	CREATE_TILE_TYPE(notGate_on_Id, TorchTile_SPU);	// TorchTile->NotGateTile
+	CREATE_TILE_TYPE(redstoneTorch_off_Id, TorchTile_SPU); // TorchTile->NotGateTile
+	CREATE_TILE_TYPE(redstoneTorch_on_Id, TorchTile_SPU);	// TorchTile->NotGateTile
 
-	CREATE_TILE_TYPE(mushroom1_Id, Mushroom_SPU);
-	CREATE_TILE_TYPE(mushroom2_Id, Mushroom_SPU);
+	CREATE_TILE_TYPE(mushroom_brown_Id, Mushroom_SPU);
+	CREATE_TILE_TYPE(mushroom_red_Id, Mushroom_SPU);
 
 	CREATE_TILE_TYPE(mobSpawner_Id, MobSpawnerTile_SPU);
-	CREATE_TILE_TYPE(musicBlock_Id, EntityTile_SPU);	// MusicTile->EntityTile
+	CREATE_TILE_TYPE(noteblock_Id, EntityTile_SPU);	// MusicTile->EntityTile
 
 	CREATE_TILE_TYPE(furnace_Id, FurnaceTile_SPU);
 	CREATE_TILE_TYPE(furnace_lit_Id, FurnaceTile_SPU);
@@ -757,9 +768,12 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(portalTile_Id, PortalTile_SPU);
 
 	CREATE_TILE_TYPE(dispenser_Id, DispenserTile_SPU);
+	CREATE_TILE_TYPE(dropper_Id, DropperTile_SPU);
 
 	CREATE_TILE_TYPE(rail_Id, RailTile_SPU);
-	CREATE_TILE_TYPE(goldenRail_Id, RailTile_SPU);
+
+	CREATE_TILE_TYPE(goldenRail_Id, PoweredRailTile_SPU);
+	CREATE_TILE_TYPE(activatorRail_Id, ActivatorRailTile_SPU);
 
 	CREATE_TILE_TYPE(detectorRail_Id, DetectorRailTile_SPU);
 
@@ -781,7 +795,7 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(cactus_Id, CactusTile_SPU);
 
-	CREATE_TILE_TYPE(recordPlayer_Id, RecordPlayerTile_SPU);
+	CREATE_TILE_TYPE(jukebox_Id, RecordPlayerTile_SPU);
 
 	CREATE_TILE_TYPE(pumpkin_Id, PumpkinTile_SPU);
 	CREATE_TILE_TYPE(litPumpkin_Id, PumpkinTile_SPU);
@@ -792,10 +806,10 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(monsterStoneEgg_Id, StoneMonsterTile_SPU);
 
-	CREATE_TILE_TYPE(stoneBrickSmooth_Id, SmoothStoneBrickTile_SPU);
+	CREATE_TILE_TYPE(stoneBrick_Id, SmoothStoneBrickTile_SPU);
 
-	CREATE_TILE_TYPE(hugeMushroom1_Id, HugeMushroomTile_SPU);
-	CREATE_TILE_TYPE(hugeMushroom2_Id, HugeMushroomTile_SPU);
+	CREATE_TILE_TYPE(hugeMushroom_brown_Id, HugeMushroomTile_SPU);
+	CREATE_TILE_TYPE(hugeMushroom_red_Id, HugeMushroomTile_SPU);
 
 	CREATE_TILE_TYPE(melon_Id, MelonTile_SPU);
 
@@ -847,16 +861,18 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(skull_Id, SkullTile_SPU);
 
-		// these tile types don't have any additional code that we need.
-	CREATE_TILE_TYPE(stoneBrick_Id, Tile_SPU);		// Tile
+	// these tile types don't have any additional code that we need.
+	CREATE_TILE_TYPE(cobblestone_Id, Tile_SPU);		// Tile
 	CREATE_TILE_TYPE(lapisBlock_Id, Tile_SPU);
 	CREATE_TILE_TYPE(redBrick_Id, Tile_SPU);
-	CREATE_TILE_TYPE(mossStone_Id, Tile_SPU);
+	CREATE_TILE_TYPE(mossyCobblestone_Id, Tile_SPU);
 	CREATE_TILE_TYPE(netherBrick_Id, Tile_SPU);
-	CREATE_TILE_TYPE(whiteStone_Id, Tile_SPU);
+	CREATE_TILE_TYPE(endStone_Id, Tile_SPU);
 	CREATE_TILE_TYPE(unbreakable_Id, Tile_SPU);
 	CREATE_TILE_TYPE(sponge_Id, Tile_SPU);
-	CREATE_TILE_TYPE(rock_Id, Tile_SPU);			// StoneTile
+	CREATE_TILE_TYPE(coalBlock_Id, Tile_SPU);
+	CREATE_TILE_TYPE(redstoneBlock_Id, Tile_SPU);
+	CREATE_TILE_TYPE(stone_Id, Tile_SPU);			// StoneTile
 	CREATE_TILE_TYPE(obsidian_Id, Tile_SPU);		// StoneTile->ObsidianTile
 	CREATE_TILE_TYPE(sand_Id, Tile_SPU);			// HeavyTile
 	CREATE_TILE_TYPE(gravel_Id, Tile_SPU);			// GravelTile
@@ -872,12 +888,15 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(ironBlock_Id, Tile_SPU);		// MetalTile
 	CREATE_TILE_TYPE(diamondBlock_Id, Tile_SPU);	// MetalTile
 	CREATE_TILE_TYPE(snow_Id, Tile_SPU);			// SnowTile
-	CREATE_TILE_TYPE(hellRock_Id, Tile_SPU);		// HellStoneTile
-	CREATE_TILE_TYPE(hellSand_Id, Tile_SPU);		// HellSandTile
-	CREATE_TILE_TYPE(lightGem_Id, Tile_SPU);		// LightGemTile
-	CREATE_TILE_TYPE(aprilFoolsJoke_Id, Tile_SPU); // LockedChestTile
+	CREATE_TILE_TYPE(netherRack_Id, Tile_SPU);		// NetherrackTile
+	CREATE_TILE_TYPE(soulsand_Id, Tile_SPU);		// SoulSandTile
+	CREATE_TILE_TYPE(glowstone_Id, Tile_SPU);		// Glowstonetile
+	// got replaced by stained_glass_Id, rest in peace locked chest
+	//CREATE_TILE_TYPE(aprilFoolsJoke_Id , Tile_SPU); // LockedChestTile
+	CREATE_TILE_TYPE(clayHardened_Id, Tile_SPU); // ColoredTile
 
-	CREATE_TILE_TYPE(cloth_Id, ClothTile_SPU); // wool
+	CREATE_TILE_TYPE(wool_Id, WoolTile_SPU); // wool
+	CREATE_TILE_TYPE(clayHardened_colored_Id, ColoredClay_SPU); // wool
 
 
 	CREATE_TILE_TYPE(emeraldOre_Id, Tile_SPU);		// OreTile
@@ -895,5 +914,6 @@ void Tile_SPU::initTilePointers()
  	CREATE_TILE_TYPE(quartzBlock_Id, QuartzBlockTile_SPU);
 	CREATE_TILE_TYPE(stairs_quartz_Id, StairTile_SPU);
  	CREATE_TILE_TYPE(woolCarpet_Id, WoolCarpetTile_SPU);
-
+	CREATE_TILE_TYPE(hayBlock_Id, HayBlockTile_SPU);
+	CREATE_TILE_TYPE(daylightDetector_Id, DaylightDetectorTile_SPU);
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h

@@ -129,8 +129,14 @@ public:
 	Icon_SPU dispenserTile_iconFront;
 	Icon_SPU dispenserTile_iconFrontVertical;
 
+	Icon_SPU dropperTile_iconFront;
+	Icon_SPU dropperTile_iconFrontVertical;
+
 	Icon_SPU railTile_iconTurn;
-	Icon_SPU railTile_iconTurnGolden;
+	Icon_SPU poweredRailTile_icon;
+	Icon_SPU poweredRailTile_iconPowered;
+	Icon_SPU activatorRailTile_icon;
+	Icon_SPU activatorRailTile_iconPowered;
 
 	Icon_SPU detectorRailTile_icons[2];
 
@@ -178,7 +184,7 @@ public:
 	Icon_SPU redStoneDust_iconCrossOver;
 	Icon_SPU redStoneDust_iconLineOver;
 
-	Icon_SPU clothTile_icons[16];	
+	Icon_SPU woolTile_icons[16];	
 
 	Icon_SPU stoneSlab_iconSide;
 
@@ -193,6 +199,12 @@ public:
 	Icon_SPU quartzBlock_iconTop;
 	Icon_SPU quartzBlock_iconBottom;
 
+	Icon_SPU clayHardened_colored_icons[16];	
+	Icon_SPU hayBlockTile_icon;
+	Icon_SPU hayBlockTile_iconTop;
+
+	Icon_SPU daylightDetector_icons[2];
+
 
 	int anvilPart; // normally part of the AnvilTile class
 
@@ -296,19 +308,24 @@ public:
 	static const int SHAPE_FLOWER_POT = 33;
 	static const int SHAPE_BEACON = 34;
 	static const int SHAPE_ANVIL = 35;
+	static const int SHAPE_HOPPER = 38;
 	static const int SHAPE_QUARTZ = 39;
+	static const int SHAPE_THIN_PANE = 40;
+
+	static const int SHAPE_COUNT = 41;
 
 	// 4J - this array of simple constants made so the compiler can optimise references to Ids that were previous of the form Tile_SPU::<whatever>->id, and are now simply Tile_SPU::whatever_Id
-	static const int rock_Id = 1;
+	static const int stone_Id = 1;
 	static const int grass_Id = 2;
 	static const int dirt_Id = 3;
-	static const int stoneBrick_Id = 4;
+	static const int cobblestone_Id = 4;
 	static const int wood_Id = 5;
 	static const int sapling_Id = 6;
 	static const int unbreakable_Id = 7;
 	static const int water_Id = 8;
 	static const int calmWater_Id = 9;
 	static const int lava_Id = 10;
+
 	static const int calmLava_Id = 11;
 	static const int sand_Id = 12;
 	static const int gravel_Id = 13;
@@ -319,26 +336,29 @@ public:
 	static const int leaves_Id = 18;
 	static const int sponge_Id = 19;
 	static const int glass_Id = 20;
+
 	static const int lapisOre_Id = 21;
 	static const int lapisBlock_Id = 22;
 	static const int dispenser_Id = 23;
 	static const int sandStone_Id = 24;
-	static const int musicBlock_Id = 25;
+	static const int noteblock_Id = 25;
 	static const int bed_Id = 26;
 	static const int goldenRail_Id = 27;
 	static const int detectorRail_Id = 28;
 	static const int pistonStickyBase_Id = 29;
 	static const int web_Id = 30;
+
 	static const int tallgrass_Id = 31;
 	static const int deadBush_Id = 32;
 	static const int pistonBase_Id = 33;
 	static const int pistonExtensionPiece_Id = 34;
-	static const int cloth_Id = 35;
+	static const int wool_Id = 35;
 	static const int pistonMovingPiece_Id = 36;
 	static const int flower_Id = 37;
 	static const int rose_Id = 38;
-	static const int mushroom1_Id = 39;
-	static const int mushroom2_Id = 40;
+	static const int mushroom_brown_Id = 39;
+	static const int mushroom_red_Id = 40;
+
 	static const int goldBlock_Id = 41;
 	static const int ironBlock_Id = 42;
 	static const int stoneSlab_Id = 43;
@@ -346,9 +366,10 @@ public:
 	static const int redBrick_Id = 45;
 	static const int tnt_Id = 46;
 	static const int bookshelf_Id = 47;
-	static const int mossStone_Id = 48;
+	static const int mossyCobblestone_Id = 48;
 	static const int obsidian_Id = 49;
 	static const int torch_Id = 50;
+
 	static const int fire_Id = 51;
 	static const int mobSpawner_Id = 52;
 	static const int stairs_wood_Id = 53;
@@ -357,8 +378,9 @@ public:
 	static const int diamondOre_Id = 56;
 	static const int diamondBlock_Id = 57;
 	static const int workBench_Id = 58;
-	static const int crops_Id = 59;
+	static const int wheat_Id = 59;
 	static const int farmland_Id = 60;
+
 	static const int furnace_Id = 61;
 	static const int furnace_lit_Id = 62;
 	static const int sign_Id = 63;
@@ -369,37 +391,40 @@ public:
 	static const int wallSign_Id = 68;
 	static const int lever_Id = 69;
 	static const int pressurePlate_stone_Id = 70;
+
 	static const int door_iron_Id = 71;
 	static const int pressurePlate_wood_Id = 72;
 	static const int redStoneOre_Id = 73;
 	static const int redStoneOre_lit_Id = 74;
-	static const int notGate_off_Id = 75;
-	static const int notGate_on_Id = 76;
+	static const int redstoneTorch_off_Id = 75;
+	static const int redstoneTorch_on_Id = 76;
 	static const int button_stone_Id = 77;
 	static const int topSnow_Id = 78;
 	static const int ice_Id = 79;
 	static const int snow_Id = 80;
+
 	static const int cactus_Id = 81;
 	static const int clay_Id = 82;
 	static const int reeds_Id = 83;
-	static const int recordPlayer_Id = 84;
+	static const int jukebox_Id = 84;
 	static const int fence_Id = 85;
 	static const int pumpkin_Id = 86;
-	static const int hellRock_Id = 87;
-	static const int hellSand_Id = 88;
-	static const int lightGem_Id = 89;
+	static const int netherRack_Id = 87;
+	static const int soulsand_Id = 88;
+	static const int glowstone_Id = 89;
 	static const int portalTile_Id = 90;
+
 	static const int litPumpkin_Id = 91;
 	static const int cake_Id = 92;
 	static const int diode_off_Id = 93;
 	static const int diode_on_Id = 94;
-	static const int aprilFoolsJoke_Id = 95;
+	static const int stained_glass_Id = 95;
 	static const int trapdoor_Id = 96;
-
 	static const int monsterStoneEgg_Id = 97;
-	static const int stoneBrickSmooth_Id = 98;
-	static const int hugeMushroom1_Id = 99;
-	static const int hugeMushroom2_Id = 100;
+	static const int stoneBrick_Id = 98;
+	static const int hugeMushroom_brown_Id = 99;
+	static const int hugeMushroom_red_Id = 100;
+
 	static const int ironFence_Id = 101;
 	static const int thinGlass_Id = 102;
 	static const int melon_Id = 103;
@@ -408,9 +433,9 @@ public:
 	static const int vine_Id = 106;
 	static const int fenceGate_Id = 107;
 	static const int stairs_bricks_Id = 108;
-	static const int stairs_stoneBrickSmooth_Id = 109;
-
+	static const int stairs_stoneBrick_Id = 109;
 	static const int mycel_Id = 110;
+
 	static const int waterLily_Id = 111;
 	static const int netherBrick_Id = 112;
 	static const int netherFence_Id = 113;
@@ -421,36 +446,55 @@ public:
 	static const int cauldron_Id = 118;
 	static const int endPortalTile_Id = 119;
 	static const int endPortalFrameTile_Id = 120;
-	static const int whiteStone_Id = 121;
+
+	static const int endStone_Id = 121;
 	static const int dragonEgg_Id = 122;
 	static const int redstoneLight_Id = 123;
 	static const int redstoneLight_lit_Id = 124;
-
-
 	static const int woodSlab_Id = 125;
 	static const int woodSlabHalf_Id = 126;
 	static const int cocoa_Id = 127;
 	static const int stairs_sandstone_Id = 128;
-	static const int stairs_sprucewood_Id = 134;
-	static const int stairs_birchwood_Id = 135;
-	static const int stairs_junglewood_Id = 136;
 	static const int emeraldOre_Id = 129;
 	static const int enderChest_Id = 130;
+
 	static const int tripWireSource_Id = 131;
 	static const int tripWire_Id = 132;
 	static const int emeraldBlock_Id = 133;
-
+	static const int stairs_sprucewood_Id = 134;
+	static const int stairs_birchwood_Id = 135;
+	static const int stairs_junglewood_Id = 136;
+	static const int commandBlock_Id = 137;
+	static const int beacon_Id = 138;
 	static const int cobbleWall_Id = 139;
 	static const int flowerPot_Id = 140;
+
 	static const int carrots_Id = 141;
 	static const int potatoes_Id = 142;
-	static const int anvil_Id = 145;
 	static const int button_wood_Id = 143;
 	static const int skull_Id = 144;
+	static const int anvil_Id = 145;
+	static const int chest_trap_Id = 146;
+	static const int weightedPlate_light_Id = 147;
+	static const int weightedPlate_heavy_Id = 148;
+	static const int comparator_off_Id = 149;
+	static const int comparator_on_Id = 150;
+
+	static const int daylightDetector_Id = 151;
+	static const int redstoneBlock_Id = 152;
 	static const int netherQuartz_Id = 153;
+	static const int hopper_Id = 154;
 	static const int quartzBlock_Id = 155;
 	static const int stairs_quartz_Id = 156;
+	static const int activatorRail_Id = 157;
+	static const int dropper_Id = 158;
+	static const int clayHardened_colored_Id = 159;
+	static const int stained_glass_pane_Id = 160;
+
+	static const int hayBlock_Id = 170;
 	static const int woolCarpet_Id = 171;
+	static const int clayHardened_Id = 172;
+	static const int coalBlock_Id = 173;
 
 	static Tile_SPU m_tiles[256];
 

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TreeTile_SPU.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Tile_SPU.h"
+#include "RotatedPillarTile_SPU.h"
 
 class Player;
 
-class TreeTile_SPU : public Tile_SPU
+class TreeTile_SPU : public RotatedPillarTile_SPU
 {	
 public:
 	static const int DARK_TRUNK = 1;
@@ -19,29 +19,14 @@ public:
 
 	static const int TREE_NAMES_LENGTH = 4;
 
-	TreeTile_SPU(int id) : Tile_SPU(id) {}
-	int getRenderShape() {	return Tile_SPU::SHAPE_TREE; }
-
+	TreeTile_SPU(int id) : RotatedPillarTile_SPU(id) {}
 
 public:
-	Icon_SPU *getTexture(int face, int data)
-	{
-		int dir = data & MASK_FACING;
-		int type = data & MASK_TYPE;
-
-		if (dir == FACING_Y && (face == Facing::UP || face == Facing::DOWN))
-		{
-			return &ms_pTileData->treeTile_icons_top[type];
-		}
-		else if (dir == FACING_X && (face == Facing::EAST || face == Facing::WEST))
-		{
-			return &ms_pTileData->treeTile_icons_top[type];
-		}
-		else if (dir == FACING_Z && (face == Facing::NORTH || face == Facing::SOUTH))
-		{
-			return &ms_pTileData->treeTile_icons_top[type];
-		}
-
+	Icon_SPU *getTypeTexture(int type) {
 		return &ms_pTileData->treeTile_icons_side[type];
-	}
+	};
+
+	Icon_SPU *getTopTexture(int type) {
+		return &ms_pTileData->treeTile_icons_top[type];
+	};
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WallTile_SPU.h

@@ -22,7 +22,7 @@ public:
 	{
 		if (data == TYPE_MOSSY)
 		{
-			return TileRef_SPU(mossStone_Id)->getTexture(face);
+			return TileRef_SPU(mossyCobblestone_Id)->getTexture(face);
 		}
 		return TileRef_SPU(stoneBrick_Id)->getTexture(face);
 

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WeightedPressurePlateTile_SPU.h

@@ -0,0 +1,22 @@
+#pragma once
+#include "BasePressurePlateTile_SPU.h"
+
+class WeightedPressurePlateTile_SPU : public BasePressurePlateTile_SPU
+{
+public:
+	enum Sensitivity
+	{
+		everything, mobs, players
+	};
+
+private:
+	Sensitivity sensitivity;
+
+public:
+	WeightedPressurePlateTile_SPU(int id) : BasePressurePlateTile_SPU(id) {}
+
+protected:
+	virtual int getSignalForData(int data) {
+		return data;
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WoolCarpetTile_SPU.h

@@ -7,7 +7,7 @@ class WoolCarpetTile_SPU : public Tile_SPU
 public:
 	WoolCarpetTile_SPU(int id) : Tile_SPU(id) {}
 
-	Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(cloth_Id)->getTexture(face, data); }
+	Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(wool_Id)->getTexture(face, data); }
 	bool isSolidRender(bool isServerLevel = false) { return false; }
 	void updateDefaultShape() { updateShape(0); }
 	void updateShape(ChunkRebuildData *level, int x, int y, int z) { updateShape(level->getData(x, y, z)); }

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WoolTile_SPU.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "Tile_SPU.h"
+
+class WoolTile_SPU : public Tile_SPU
+{
+public:
+	WoolTile_SPU(int id) : Tile_SPU(id) {}
+	virtual Icon_SPU *getTexture(int face, int data) {	return &ms_pTileData->woolTile_icons[data]; }
+
+
+};

Minecraft.Client/PSVita/OldSdk.cpp

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "OldSdk.h"
 #ifdef __PSVITA__
 

Minecraft.Client/PendingConnection.cpp

@@ -157,7 +157,6 @@ void PendingConnection::handleLogin(shared_ptr<LoginPacket> packet)
 
 	//if (true)// 4J removed !server->onlineMode)
 	bool sentDisconnect = false;
-	bool nameTaken = false;
 
 	if( sentDisconnect )
 	{
@@ -169,29 +168,7 @@ void PendingConnection::handleLogin(shared_ptr<LoginPacket> packet)
 	}
 	else
 	{
-		vector<shared_ptr<ServerPlayer> > &pl = server->getPlayers()->players;
-
-		for (unsigned int i = 0; i < pl.size(); i++)
-		{
-			if (pl[i] != NULL && pl[i]->name == name)
-			{
-				nameTaken = true;
-				break;
-			}
-		}
-
-		if (nameTaken)
-		{
-			app.DebugPrintf("Rejecting duplicate name: %ls\n", name.c_str());
-
-			// to do: replace this with a dedicated duplicate name
-			// message
-			disconnect(DisconnectPacket::eDisconnect_Banned);
-		}
-		else
-		{
-			handleAcceptedLogin(packet);
-		}
+		handleAcceptedLogin(packet);
 	}
 	//else
 	{

Minecraft.Client/PlayerList.cpp

@@ -25,9 +25,9 @@
 #include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
 #include "..\Minecraft.World\JavaMath.h"
 #include "..\Minecraft.World\EntityIO.h"
-#if defined(_XBOX) || defined(_WINDOWS64) || defined(DISABLE_PSN)
+#ifdef _XBOX
 #include "Xbox\Network\NetworkPlayerXbox.h"
-#elif !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__)
+#elif defined(__PS3__) || defined(__ORBIS__)
 #include "Common\Network\Sony\NetworkPlayerSony.h"
 #endif
 
@@ -53,11 +53,7 @@ PlayerList::PlayerList(MinecraftServer *server)
 
 	//int viewDistance = server->settings->getInt(L"view-distance", 10);
 
-#ifdef _WINDOWS64
-    maxPlayers = MINECRAFT_NET_MAX_PLAYERS;
-#else
 	maxPlayers = server->settings->getInt(L"max-players", 20);
-#endif
 	doWhiteList = false;
 
 	InitializeCriticalSection(&m_kickPlayersCS);
@@ -94,7 +90,7 @@ void PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
 		player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_HOST,1);
 	}
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__)
+#if defined(__PS3__) || defined(__ORBIS__)
 	// PS3 networking library doesn't automatically assign PlayerUIDs to the network players for anything remote, so need to tell it what to set from the data in this packet now
 	if( !g_NetworkManager.IsLocalGame() )
 	{
@@ -103,13 +99,6 @@ void PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
 			((NetworkPlayerSony *)networkPlayer)->SetUID( packet->m_onlineXuid );
 		}
 	}
-#elif defined(_WINDOWS64) || defined(DISABLE_PSN)
-	if (networkPlayer != NULL && !networkPlayer->IsLocal())
-	{
-		NetworkPlayerXbox *nxp = (NetworkPlayerXbox *)networkPlayer;
-		IQNetPlayer *qnp = nxp->GetQNetPlayer();
-		wcsncpy(qnp->m_gamertag, player->name.c_str(), 32);
-	}
 #endif
 
 	// 4J Stu - TU-1 hotfix
@@ -480,7 +469,6 @@ void PlayerList::remove(shared_ptr<ServerPlayer> player)
 	//4J Stu - We don't want to save the map data for guests, so when we are sure that the player is gone delete the map
 	if(player->isGuest()) playerIo->deleteMapFilesForPlayer(player);
 	ServerLevel *level = player->getLevel();
-	level->getTracker()->removeEntity(player);
 	if (player->riding != NULL)
 	{
 		// remove mount first because the player unmounts when being
@@ -509,7 +497,7 @@ void PlayerList::remove(shared_ptr<ServerPlayer> player)
 
 shared_ptr<ServerPlayer> PlayerList::getPlayerForLogin(PendingConnection *pendingConnection, const wstring& userName, PlayerUID xuid, PlayerUID onlineXuid)
 {
-	if (players.size() >= (unsigned int)MINECRAFT_NET_MAX_PLAYERS)
+	if (players.size() >= maxPlayers)
 	{
 		pendingConnection->disconnect(DisconnectPacket::eDisconnect_ServerFull);
 		return shared_ptr<ServerPlayer>();
@@ -522,14 +510,9 @@ shared_ptr<ServerPlayer> PlayerList::getPlayerForLogin(PendingConnection *pendin
 
 	// Work out the base server player settings
 	INetworkPlayer *networkPlayer = pendingConnection->connection->getSocket()->getPlayer();
-	if (networkPlayer != NULL)
+	if(networkPlayer != NULL && !networkPlayer->IsHost())
 	{
-		if (!networkPlayer->IsHost())
-			player->enableAllPlayerPrivileges( app.GetGameHostOption(eGameHostOption_TrustPlayers)>0 );
-
-		PlayerUID realXuid = networkPlayer->GetUID();
-		player->setXuid(realXuid);
-		player->setOnlineXuid(realXuid);
+		player->enableAllPlayerPrivileges( app.GetGameHostOption(eGameHostOption_TrustPlayers)>0 );
 	}
 
 	// 4J Added

Minecraft.Client/Tesselator.cpp

@@ -832,7 +832,7 @@ void Tesselator::vertex(float x, float y, float z)
 		pShortData[5] = (((int)(v * 8192.0f))&0xffff);
 		int16_t u2 = ((int16_t*)&_tex2)[0];
 		int16_t v2 = ((int16_t*)&_tex2)[1];
-#if defined _XBOX_ONE || defined __ORBIS__
+#if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64
 		// Optimisation - pack the second UVs into a single short (they could actually go in a byte), which frees up a short to store the x offset for this chunk in the vertex itself.
 		// This means that when rendering chunks, we don't need to update the vertex constants that specify the location for a chunk, when only the x offset has changed.
 		pShortData[6] = ( u2 << 8 ) | v2;

Minecraft.Client/Textures.cpp

@@ -434,11 +434,7 @@ void Textures::bindTextureLayers(ResourceLocation *resource)
 
 	for( int i = 0; i < layers; i++ )
 	{
-		int texId = resource->getTexture(i);
-		if( texId != -1 )
-		{
-			RenderManager.TextureBind(loadTexture(texId));
-		}
+		RenderManager.TextureBind(loadTexture(resource->getTexture(i)));
 	}
 }
 

Minecraft.Client/Windows64/Windows64_App.cpp

@@ -55,8 +55,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 	app.ReleaseSaveThumbnail();
 	ProfileManager.SetLockedProfile(0);
-	extern wchar_t g_Win64UsernameW[17];
-	pMinecraft->user->name = g_Win64UsernameW;
+	pMinecraft->user->name = L"Windows";
 	app.ApplyGameSettingsChanged(0);
 
 	////////////////////////////////////////////////////////////////////////////////////////////// From CScene_MultiGameJoinLoad::OnInit

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -36,7 +36,6 @@
 #include "Resource.h"
 #include "..\..\Minecraft.World\compression.h"
 #include "..\..\Minecraft.World\OldChunkStorage.h"
-#include "..\..\Minecraft.Client\Common\Network\WinsockNetLayer.h"
 
 #include "Xbox/resource.h"
 
@@ -69,9 +68,6 @@ DWORD dwProfileSettingsA[NUM_PROFILE_VALUES]=
 #endif
 };
 
-char g_Win64Username[17] = {0};
-wchar_t g_Win64UsernameW[17] = {0};
-
 //-------------------------------------------------------------------------------------
 // Time             Since fAppTime is a float, we need to keep the quadword app time
 //                  as a LARGE_INTEGER so that we don't lose precision after running
@@ -80,8 +76,8 @@ wchar_t g_Win64UsernameW[17] = {0};
 
 BOOL g_bWidescreen = TRUE;
 
-int g_iScreenWidth = 1280;
-int g_iScreenHeight = 720;
+int g_iScreenWidth = 1920;
+int g_iScreenHeight = 1080;
 
 void DefineActions(void)
 {
@@ -502,7 +498,7 @@ app.DebugPrintf("width: %d, height: %d\n", width, height);
 
 	DXGI_SWAP_CHAIN_DESC sd;
 	ZeroMemory( &sd, sizeof( sd ) );
-	sd.BufferCount = 2;
+	sd.BufferCount = 1;
 	sd.BufferDesc.Width = width;
 	sd.BufferDesc.Height = height;
 	sd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
@@ -633,58 +629,8 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 			//g_iScreenWidth = 960;
 			//g_iScreenHeight = 544;
 		}
-
-		char cmdLineA[1024];
-		strncpy_s(cmdLineA, sizeof(cmdLineA), lpCmdLine, _TRUNCATE);
-
-		char *nameArg = strstr(cmdLineA, "-name ");
-		if (nameArg)
-		{
-			nameArg += 6;
-			while (*nameArg == ' ') nameArg++;
-			char nameBuf[17];
-			int n = 0;
-			while (nameArg[n] && nameArg[n] != ' ' && n < 16) { nameBuf[n] = nameArg[n]; n++; }
-			nameBuf[n] = 0;
-			strncpy_s(g_Win64Username, 17, nameBuf, _TRUNCATE);
-		}
-
-		char *ipArg = strstr(cmdLineA, "-ip ");
-		if (ipArg)
-		{
-			ipArg += 4;
-			while (*ipArg == ' ') ipArg++;
-			char ipBuf[256];
-			int n = 0;
-			while (ipArg[n] && ipArg[n] != ' ' && n < 255) { ipBuf[n] = ipArg[n]; n++; }
-			ipBuf[n] = 0;
-			strncpy_s(g_Win64MultiplayerIP, 256, ipBuf, _TRUNCATE);
-			g_Win64MultiplayerJoin = true;
-		}
-
-		char *portArg = strstr(cmdLineA, "-port ");
-		if (portArg)
-		{
-			portArg += 6;
-			while (*portArg == ' ') portArg++;
-			char portBuf[16];
-			int n = 0;
-			while (portArg[n] && portArg[n] != ' ' && n < 15) { portBuf[n] = portArg[n]; n++; }
-			portBuf[n] = 0;
-			g_Win64MultiplayerPort = atoi(portBuf);
-			if (g_Win64MultiplayerPort <= 0) g_Win64MultiplayerPort = WIN64_NET_DEFAULT_PORT;
-		}
 	}
 
-	if (g_Win64Username[0] == 0)
-	{
-		DWORD sz = 17;
-		if (!GetUserNameA(g_Win64Username, &sz))
-			strncpy_s(g_Win64Username, 17, "Player", _TRUNCATE);
-		g_Win64Username[16] = 0;
-	}
-
-	MultiByteToWideChar(CP_ACP, 0, g_Win64Username, -1, g_Win64UsernameW, 17);
 
 	// Initialize global strings
 	MyRegisterClass(hInstance);
@@ -847,17 +793,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	// ProfileManager for XN_LIVE_INVITE_ACCEPTED for QNet.
 	g_NetworkManager.Initialise();
 
-	for (int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++)
-	{
-		IQNet::m_player[i].m_smallId = (BYTE)i;
-		IQNet::m_player[i].m_isRemote = false;
-		IQNet::m_player[i].m_isHostPlayer = (i == 0);
-		swprintf_s(IQNet::m_player[i].m_gamertag, 32, L"Player%d", i);
-	}
-	extern wchar_t g_Win64UsernameW[17];
-	wcscpy_s(IQNet::m_player[0].m_gamertag, 32, g_Win64UsernameW);
 
-	WinsockNetLayer::Initialize();
 
 	// 4J-PB moved further down
 	//app.InitGameSettings();
@@ -1001,9 +937,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		// 			app.audio.PlaySound();
 		// 		}
 
-		bool isActive = (GetForegroundWindow() == g_hWnd) &&
-                !IsIconic(g_hWnd);
-
 		app.UpdateTime();
 		PIXBeginNamedEvent(0,"Input manager tick");
 		InputManager.Tick();
@@ -1031,7 +964,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		PIXEndNamedEvent();
 
 		PIXBeginNamedEvent(0,"Network manager do work #1");
-		g_NetworkManager.DoWork();
+		//		g_NetworkManager.DoWork();
 		PIXEndNamedEvent();
 
 		//		LeaderboardManager::Instance()->Tick();

Minecraft.World/AttackDamageMobEffect.cpp

@@ -1,19 +1,19 @@
-#include "stdafx.h"
-
-#include "AttackDamageMobEffect.h"
-
-AttackDamageMobEffect::AttackDamageMobEffect(int id, bool isHarmful, eMinecraftColour color) : MobEffect(id, isHarmful, color)
-{
-}
-
-double AttackDamageMobEffect::getAttributeModifierValue(int amplifier, AttributeModifier *original)
-{
-	if (id == MobEffect::weakness->id)
-	{
-		return -0.5f * (amplifier + 1);
-	}
-	else
-	{
-		return 1.3 * (amplifier + 1);
-	}
+#include "stdafx.h"
+
+#include "AttackDamageMobEffect.h"
+
+AttackDamageMobEffect::AttackDamageMobEffect(int id, bool isHarmful, eMinecraftColour color) : MobEffect(id, isHarmful, color)
+{
+}
+
+double AttackDamageMobEffect::getAttributeModifierValue(int amplifier, AttributeModifier *original)
+{
+	if (id == MobEffect::weakness->id)
+	{
+		return -0.5f * (amplifier + 1);
+	}
+	else
+	{
+		return 1.3 * (amplifier + 1);
+	}
 }

Minecraft.World/Boat.cpp

@@ -48,35 +48,6 @@ bool Boat::makeStepSound()
 	return false;
 }
 
-void Boat::checkFallDamage(int result, int onGround, double ya)
-{
-	if (fallDistance <= 3.0) return;
-
-	if ( !onGround )
-	{
-		int t = level->getTile(x, (floor(y) - 1.0), z);
-		if ((!t || Tile::tiles[t]->material != Material::water) && ya < 0.0 )
-			fallDistance -= ya;
-
-		return;
-	}
-	causeFallDamage(fallDistance);
-	if (!level->isClientSide && !removed)
-	{
-		remove();
-		for (int i = 0; i < 3; i++)
-		{
-			spawnAtLocation(Tile::wood_Id, 1, 0);
-		}
-		for (int i = 0; i < 2; i++)
-		{
-			spawnAtLocation(Item::stick->id, 1, 0);
-		}
-	}
-
-	fallDistance = 0.0;
-}
-
 void Boat::defineSynchedData()
 {
 	entityData->define(DATA_ID_HURT, 0);

Minecraft.World/Boat.h

@@ -36,7 +36,6 @@ public:
 	Boat(Level *level);
 
 protected:
-	virtual void checkFallDamage(int result, int onGround, double ya);
 	virtual bool makeStepSound();
 	virtual void defineSynchedData();
 

Minecraft.World/ConsoleSaveFile.h

@@ -30,7 +30,7 @@ public:
 	virtual vector<FileEntry *> *getFilesWithPrefix(const wstring &prefix) = 0;
 	virtual vector<FileEntry *> *getRegionFilesByDimension(unsigned int dimensionIndex) = 0;
 
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 	virtual wstring getPlayerDataFilenameForLoad(const PlayerUID& pUID) = 0;
 	virtual wstring getPlayerDataFilenameForSave(const PlayerUID& pUID) = 0;
 	virtual vector<FileEntry *> *getValidPlayerDatFiles() = 0;

Minecraft.World/ConsoleSaveFileConverter.cpp

@@ -78,7 +78,7 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile *sourceSave, ConsoleS
 	}
 
 	// MGH added - find any player data files and copy them across
-#if !defined(DISABLE_PSN) && defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 	vector<FileEntry *>* playerFiles = sourceSave->getValidPlayerDatFiles();
 #else
 	vector<FileEntry *> *playerFiles = sourceSave->getFilesWithPrefix( DirectoryLevelStorage::getPlayerDir() );