fix: windows64 copy paths

https://github.com/CyB1K/PS4-Fake-PKG-Tools-3.87

Minecraft.Client/ClientConnection.cpp

@@ -50,16 +50,11 @@
 #else
 #include "Common\UI\UI.h"
 #endif
-#if defined __PS3__ && !defined DISABLE_PSN
+#ifdef __PS3__
 #include "PS3/Network/SonyVoiceChat.h"
 #endif
 #include "DLCTexturePack.h"
 
-#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
-#include "Xbox\Network\NetworkPlayerXbox.h"
-#include "Common\Network\PlatformNetworkManagerStub.h"
-#endif
-
 #ifdef _DURANGO
 #include "..\Minecraft.World\DurangoStats.h"
 #include "..\Minecraft.World\GenericStats.h"
@@ -786,32 +781,6 @@ void ClientConnection::handleAddPlayer(shared_ptr<AddPlayerPacket> packet)
 	player->m_displayName = player->name;
 #endif
 
-#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
-	{
-		PlayerUID pktXuid = player->getXuid();
-		const PlayerUID WIN64_XUID_BASE = (PlayerUID)0xe000d45248242f2e;
-		if (pktXuid >= WIN64_XUID_BASE && pktXuid < WIN64_XUID_BASE + MINECRAFT_NET_MAX_PLAYERS)
-		{
-			BYTE smallId = (BYTE)(pktXuid - WIN64_XUID_BASE);
-			INetworkPlayer *np = g_NetworkManager.GetPlayerBySmallId(smallId);
-			if (np != NULL)
-			{
-				NetworkPlayerXbox *npx = (NetworkPlayerXbox *)np;
-				IQNetPlayer *qp = npx->GetQNetPlayer();
-				if (qp != NULL)
-				{
-					wcsncpy(qp->m_gamertag, packet->name.c_str(), 31);
-					qp->m_gamertag[31] = L'\0';
-					if (g_NetworkManager.IsHost())
-					{
-						g_NetworkManager.UpdateAndSetGameSessionData();
-					}
-				}
-			}
-		}
-	}
-#endif
-
 	//	printf("\t\t\t\t%d: Add player\n",packet->id,packet->yRot);
 
 	int item = packet->carriedItem;
@@ -954,39 +923,6 @@ void ClientConnection::handleMoveEntitySmall(shared_ptr<MoveEntityPacketSmall> p
 
 void ClientConnection::handleRemoveEntity(shared_ptr<RemoveEntitiesPacket> packet)
 {
-#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
-	if (!g_NetworkManager.IsHost())
-	{
-		for (int i = 0; i < packet->ids.length; i++)
-		{
-			shared_ptr<Entity> entity = getEntity(packet->ids[i]);
-			if (entity != NULL && entity->GetType() == eTYPE_PLAYER)
-			{
-				shared_ptr<Player> player = dynamic_pointer_cast<Player>(entity);
-				if (player != NULL)
-				{
-					PlayerUID xuid = player->getXuid();
-					INetworkPlayer *np = g_NetworkManager.GetPlayerByXuid(xuid);
-					if (np != NULL)
-					{
-						NetworkPlayerXbox *npx = (NetworkPlayerXbox *)np;
-						IQNetPlayer *qp = npx->GetQNetPlayer();
-						if (qp != NULL)
-						{
-							extern CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
-							g_pPlatformNetworkManager->NotifyPlayerLeaving(qp);
-							qp->m_smallId = 0;
-							qp->m_isRemote = false;
-							qp->m_isHostPlayer = false;
-							qp->m_gamertag[0] = 0;
-							qp->SetCustomDataValue(0);
-						}
-					}
-				}
-			}
-		}
-	}
-#endif
 	for (int i = 0; i < packet->ids.length; i++)
 	{
 		level->removeEntity(packet->ids[i]);
@@ -2005,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)
-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)
-	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/Network/GameNetworkManager.cpp

@@ -66,9 +66,9 @@ void CGameNetworkManager::Initialise()
 	ServerStoppedCreate( false );
 	ServerReadyCreate( false );
 	int flagIndexSize = LevelRenderer::getGlobalChunkCount() / (Level::maxBuildHeight / 16);		// dividing here by number of renderer chunks in one column
-#if !defined(_DISABLE_XBLIVE) && defined _XBOX
+#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());
 			}
 		}
 	}
@@ -1502,10 +1479,7 @@ void CGameNetworkManager::CreateSocket( INetworkPlayer *pNetworkPlayer, bool loc
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 	Socket *socket = NULL;
-	shared_ptr<MultiplayerLocalPlayer> mpPlayer = nullptr;
+	shared_ptr<MultiplayerLocalPlayer> mpPlayer = pMinecraft->localplayers[pNetworkPlayer->GetUserIndex()];
-	int userIdx = pNetworkPlayer->GetUserIndex();
-	if (userIdx >= 0 && userIdx < XUSER_MAX_COUNT)
-		mpPlayer = pMinecraft->localplayers[userIdx];
 	if( localPlayer && mpPlayer != NULL && mpPlayer->connection != NULL)
 	{
 		// If we already have a MultiplayerLocalPlayer here then we are doing a session type change
@@ -1815,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"
@@ -1965,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

@@ -1,14 +1,12 @@
 #pragma once
 using namespace std;
 #include <vector>
-#ifndef _DISABLE_XBLIVE
 #include <qnet.h>
-#endif
 #include "..\..\..\Minecraft.World\C4JThread.h"
 #include "NetworkPlayerInterface.h"
-#if defined _XBOX && !defined _DISABLE_XBLIVE
+#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,9 +30,9 @@ const int NON_QNET_SENDDATA_ACK_REQUIRED = 1;
 
 class CGameNetworkManager
 {
-#if defined _XBOX && !defined _DISABLE_XBLIVE
+#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/IQNet.h

@@ -1,94 +0,0 @@
-
-#pragma once
-
-const int QNET_GETSENDQUEUESIZE_SECONDARY_TYPE = 0;
-const int QNET_GETSENDQUEUESIZE_MESSAGES = 0;
-const int QNET_GETSENDQUEUESIZE_BYTES = 0;
-
-const int QNET_SENDDATA_LOW_PRIORITY = 0;
-const int QNET_SENDDATA_SECONDARY = 0;
-
-const int QNET_SENDDATA_RELIABLE = 0;
-const int QNET_SENDDATA_SEQUENTIAL = 0;
-
-#define QNET_E_SESSION_FULL 0
-#define QNET_USER_MASK_USER0 1
-#define QNET_USER_MASK_USER1 2
-#define QNET_USER_MASK_USER2 4
-#define QNET_USER_MASK_USER3 8
-
-typedef enum _QNET_STATE
-{
-    QNET_STATE_IDLE,
-    QNET_STATE_SESSION_HOSTING,
-    QNET_STATE_SESSION_JOINING,
-    QNET_STATE_GAME_LOBBY,
-    QNET_STATE_SESSION_REGISTERING,
-    QNET_STATE_SESSION_STARTING,
-    QNET_STATE_GAME_PLAY,
-    QNET_STATE_SESSION_ENDING,
-    QNET_STATE_SESSION_LEAVING,
-    QNET_STATE_SESSION_DELETING
-} QNET_STATE, * PQNET_STATE;
-
-class IQNetPlayer
-{
-public:
-	BYTE GetSmallId();
-	void SendData(IQNetPlayer *player, const void *pvData, DWORD dwDataSize, DWORD dwFlags);
-	bool IsSameSystem(IQNetPlayer *player);
-	DWORD GetSendQueueSize( IQNetPlayer *player, DWORD dwFlags );
-	DWORD GetCurrentRtt();
-	bool IsHost();
-	bool IsGuest();
-	bool IsLocal();
-	PlayerUID GetXuid();	
-	LPCWSTR GetGamertag();
-	int GetSessionIndex();
-	bool IsTalking();
-	bool IsMutedByLocalUser(DWORD dwUserIndex);
-	bool HasVoice();
-	bool HasCamera();
-	int GetUserIndex();
-	void SetCustomDataValue(ULONG_PTR ulpCustomDataValue);
-	ULONG_PTR GetCustomDataValue();
-
-	BYTE m_smallId;
-	bool m_isRemote;
-	bool m_isHostPlayer;
-	wchar_t m_gamertag[32];
-private:
-	ULONG_PTR m_customData;
-};
-
-void Win64_SetupRemoteQNetPlayer(IQNetPlayer *player, BYTE smallId, bool isHost, bool isLocal);
-
-class IQNetCallbacks
-{
-};
-
-class IQNetGameSearch
-{
-};
-
-class IQNet
-{
-public:
-	HRESULT AddLocalPlayerByUserIndex(DWORD dwUserIndex);
-	IQNetPlayer *GetHostPlayer();
-	IQNetPlayer *GetLocalPlayerByUserIndex(DWORD dwUserIndex);
-	IQNetPlayer *GetPlayerByIndex(DWORD dwPlayerIndex);
-	IQNetPlayer *GetPlayerBySmallId(BYTE SmallId);
-	IQNetPlayer *GetPlayerByXuid(PlayerUID xuid);
-	DWORD GetPlayerCount();
-	QNET_STATE GetState();
-	bool IsHost();
-	HRESULT JoinGameFromInviteInfo(DWORD dwUserIndex, DWORD dwUserMask, const INVITE_INFO *pInviteInfo);
-	void HostGame();
-	void ClientJoinGame();
-	void EndGame();
-
-	static IQNetPlayer m_player[MINECRAFT_NET_MAX_PLAYERS];
-	static DWORD s_playerCount;
-	static bool s_isHosting;
-};

Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h

@@ -1,11 +1,7 @@
 #pragma once
 using namespace std;
 #include <vector>
-#ifndef _DISABLE_XBLIVE
 #include <qnet.h>
-#else
-#include "IQNet.h"
-#endif
 #include "..\..\..\Minecraft.World\C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"
@@ -88,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,9 +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"
-#include "..\..\Common\Network\WinsockNetLayer.h"
 
 CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
 
@@ -92,7 +89,7 @@ void CPlatformNetworkManagerStub::NotifyPlayerJoined(IQNetPlayer *pQNetPlayer	)
 	if( m_pIQNet->IsHost() )
 	{
 		// 4J-PB - only the host should do this
-		g_NetworkManager.UpdateAndSetGameSessionData();
+//		g_NetworkManager.UpdateAndSetGameSessionData();
 		SystemFlagAddPlayer( networkPlayer );
 	}
 	
@@ -117,47 +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);
-
-	if (m_pIQNet->IsHost())
-	{
-		g_NetworkManager.UpdateAndSetGameSessionData(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++ )
 	{
@@ -214,57 +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--;
-			}
-		}
-
-		for (int i = 1; i < MINECRAFT_NET_MAX_PLAYERS; i++)
-		{
-			IQNetPlayer *qp = &IQNet::m_player[i];
-			if (qp->GetCustomDataValue() == 0)
-				continue;
-			INetworkPlayer *np = (INetworkPlayer *)qp->GetCustomDataValue();
-			Socket *sock = np->GetSocket();
-			if (sock != NULL && sock->isClosing())
-			{
-				WinsockNetLayer::CloseConnectionBySmallId((BYTE)i);
-			}
-		}
-	}
-	if (_iQNetStubState == QNET_STATE_GAME_PLAY && !m_pIQNet->IsHost())
-	{
-		if (!WinsockNetLayer::IsConnected() && !g_NetworkManager.IsLeavingGame())
-		{
-			if (app.GetDisconnectReason() == DisconnectPacket::eDisconnect_None)
-				app.SetDisconnectReason(DisconnectPacket::eDisconnect_Quitting);
-			app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ExitWorld, (void *)TRUE);
-		}
-	}
 }
 
 int CPlatformNetworkManagerStub::GetPlayerCount()
@@ -322,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())
@@ -331,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;
 }
 
@@ -368,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
 }
 
@@ -396,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;
 }
 
@@ -475,68 +315,49 @@ 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;
 }
 
 void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving /*= NULL*/)
 {
-	if (this->m_bLeavingGame)
+// 	DWORD playerCount = m_pIQNet->GetPlayerCount();
-		return;
+// 
-
+// 	if( this->m_bLeavingGame )
-	if (!m_pIQNet->IsHost())
+// 		return;
-		return;
+// 
-
+// 	if( GetHostPlayer() == NULL )
-	DWORD playerCount = m_pIQNet->GetPlayerCount();
+// 		return;
-
+// 
-	m_hostGameSessionData.m_uiGameHostSettings = app.GetGameHostOption(eGameHostOption_All);
+// 	for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
-	m_hostGameSessionData.playerCount = (unsigned char)playerCount;
+// 	{
-
+// 		if( i < playerCount )
-	for (unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
+// 		{
-	{
+// 			INetworkPlayer *pNetworkPlayer = GetPlayerByIndex(i);
-		if (i < playerCount)
+// 
-		{
+// 			// We can call this from NotifyPlayerLeaving but at that point the player is still considered in the session
-			INetworkPlayer *pNetworkPlayer = GetPlayerByIndex(i);
+// 			if( pNetworkPlayer != pNetworkPlayerLeaving )
-
+// 			{
-			if (pNetworkPlayer != NULL && pNetworkPlayer != pNetworkPlayerLeaving)
+// 				m_hostGameSessionData.players[i] = ((NetworkPlayerXbox *)pNetworkPlayer)->GetUID();
-			{
+// 
-				m_hostGameSessionData.players[i] = (GameSessionUID)(i + 1);
+// 				char *temp;
-
+// 				temp = (char *)wstringtofilename( pNetworkPlayer->GetOnlineName() );
-				const wchar_t *name = pNetworkPlayer->GetOnlineName();
+// 				memcpy(m_hostGameSessionData.szPlayers[i],temp,XUSER_NAME_SIZE);
-				char nameBuf[XUSER_NAME_SIZE];
+// 			}
-				memset(nameBuf, 0, sizeof(nameBuf));
+// 			else
-				wcstombs(nameBuf, name, XUSER_NAME_SIZE - 1);
+// 			{
-				memcpy(m_hostGameSessionData.szPlayers[i], nameBuf, XUSER_NAME_SIZE);
+// 				m_hostGameSessionData.players[i] = NULL;
-			}
+// 				memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE);
-			else
+// 			}
-			{
+// 		}
-				m_hostGameSessionData.players[i] = 0;
+// 		else
-				memset(m_hostGameSessionData.szPlayers[i], 0, XUSER_NAME_SIZE);
+// 		{
-			}
+// 			m_hostGameSessionData.players[i] = NULL;
-		}
+// 			memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE);
-		else
+// 		}
-		{
+// 	}
-			m_hostGameSessionData.players[i] = 0;
+// 
-			memset(m_hostGameSessionData.szPlayers[i], 0, XUSER_NAME_SIZE);
+// 	m_hostGameSessionData.hostPlayerUID = ((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetXuid();
-		}
+// 	m_hostGameSessionData.m_uiGameHostSettings = app.GetGameHostOption(eGameHostOption_All);
-	}
-
-	// update the LAN advertiser with current player names and count
-	WinsockNetLayer::UpdateAdvertisePlayerNames(m_hostGameSessionData.playerCount, m_hostGameSessionData.szPlayers);
 }
 
 int CPlatformNetworkManagerStub::RemovePlayerOnSocketClosedThreadProc( void* lpParam )
@@ -682,106 +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;
-
-		memset(info->data.players, 0, sizeof(info->data.players));
-		memset(info->data.szPlayers, 0, sizeof(info->data.szPlayers));
-		for (int p = 0; p < MINECRAFT_NET_MAX_PLAYERS && p < lanSessions[i].playerCount; p++)
-		{
-			if (lanSessions[i].playerNames[p][0] != 0)
-			{
-				info->data.players[p] = (GameSessionUID)(p + 1); 
-				memcpy(info->data.szPlayers[p], lanSessions[i].playerNames[p], XUSER_NAME_SIZE);
-			}
-		}
-
-#ifdef __ORBIS__
-		SceNetInAddr ip_addr = {};
-		sceNetInetPton(SCE_NET_AF_INET, lanSessions[i].hostIP, &ip_addr);
-		info->sessionId = (ULONGLONG)((uint64_t)ip_addr.s_addr | ((uint64_t)lanSessions[i].hostPort << 32));
-#else
-		info->sessionId = (ULONGLONG)((unsigned __int64)inet_addr(lanSessions[i].hostIP) | ((unsigned __int64)lanSessions[i].hostPort << 32));
-#endif
-		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 )
@@ -797,27 +522,13 @@ void CPlatformNetworkManagerStub::SetSearchResultsReady(int resultCount)
 
 vector<FriendSessionInfo *> *CPlatformNetworkManagerStub::GetSessionList(int iPad, int localPlayers, bool partyOnly)
 {
-	vector<FriendSessionInfo *> *filteredList = new vector<FriendSessionInfo *>();
+	vector<FriendSessionInfo *> *filteredList = new vector<FriendSessionInfo *>();;
-	for (size_t i = 0; i < friendsSessions[0].size(); i++)
-		filteredList->push_back(friendsSessions[0][i]);
 	return filteredList;
 }
 
 bool CPlatformNetworkManagerStub::GetGameSessionInfo(int iPad, SessionID sessionId, FriendSessionInfo *foundSessionInfo)
 {
-	for (size_t i = 0; i < friendsSessions[0].size(); i++)
+	return false;
-	{
-		if (friendsSessions[0][i]->sessionId == sessionId)
-		{
-			if (foundSessionInfo != NULL)
-			{
-				foundSessionInfo->sessionId = friendsSessions[0][i]->sessionId;
-				foundSessionInfo->data = friendsSessions[0][i]->data;
-				foundSessionInfo->hasPartyMember = friendsSessions[0][i]->hasPartyMember;
-			}
-			return true;
-		}
-	}
 }
 
 void CPlatformNetworkManagerStub::SetSessionsUpdatedCallback( void (*SessionsUpdatedCallback)(LPVOID pParam), LPVOID pSearchParam )
@@ -887,19 +598,7 @@ INetworkPlayer * CPlatformNetworkManagerStub::GetPlayerByXuid(PlayerUID xuid)
 
 INetworkPlayer * CPlatformNetworkManagerStub::GetPlayerBySmallId(unsigned char smallId)
 {
-	IQNetPlayer *qnetPlayer = m_pIQNet->GetPlayerBySmallId(smallId);
+	return getNetworkPlayer(m_pIQNet->GetPlayerBySmallId(smallId));
-	if (qnetPlayer == NULL)
-		return NULL;
-
-	INetworkPlayer *networkPlayer = getNetworkPlayer(qnetPlayer);
-	if (networkPlayer == NULL && smallId != 0 && !m_pIQNet->IsHost())
-	{
-		qnetPlayer->m_isRemote = true;
-		qnetPlayer->m_isHostPlayer = false;
-		NotifyPlayerJoined(qnetPlayer);
-		networkPlayer = getNetworkPlayer(qnetPlayer);
-	}
-	return networkPlayer;
 }
 
 INetworkPlayer *CPlatformNetworkManagerStub::GetHostPlayer()

Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h

@@ -161,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

@@ -6,7 +6,7 @@
 
 
 // A struct that we store in the QoS data when we are hosting the session. Max size 1020 bytes.
-#if defined _XBOX && !defined _DISABLE_XBLIVE
+#ifdef _XBOX
 typedef struct _GameSessionData
 {
 	unsigned short netVersion;										//   2 bytes
@@ -32,7 +32,7 @@ typedef struct _GameSessionData
 		subTexturePackId = 0;
 	}
 } GameSessionData;
-#elif !defined DISABLE_PSN && (defined __PS3__ || 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,16 +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
-
-	GameSessionUID players[MINECRAFT_NET_MAX_PLAYERS];
-	char szPlayers[MINECRAFT_NET_MAX_PLAYERS][XUSER_NAME_SIZE];
 
 	_GameSessionData()
 	{
@@ -95,15 +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;
-		memset(players, 0, sizeof(players));
-		memset(szPlayers, 0, sizeof(szPlayers));
 	}
 } GameSessionData;
 #endif
@@ -114,7 +86,7 @@ public:
 	SessionID sessionId;
 #ifdef _XBOX
 	XSESSION_SEARCHRESULT searchResult;
-#elif !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
+#elif defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 	SQRNetworkManager::SessionSearchResult searchResult;
 #elif defined(_DURANGO)
 	DQRNetworkManager::SessionSearchResult searchResult;
@@ -136,6 +108,6 @@ public:
 	~FriendSessionInfo()
 	{
 		if(displayLabel!=NULL)
-			delete[] displayLabel;
+			delete displayLabel;
 	}
 };

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,176 +0,0 @@
-#pragma once
-
-#if defined _WINDOWS64
-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#elif defined _XBOX
-#include <stdint.h>
-#include <winsockx.h>
-#include <xtl.h>
-#elif defined __PS3__ || defined __ORBIS__
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <sys/select.h>
-#endif
-
-#ifdef __PS3__
-#include <netex/net.h>
-#include <netex/errno.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_NET_MAX_PACKET_SIZE (4 * 1024 * 1024)
-#define WIN64_LAN_DISCOVERY_PORT 25566
-#define WIN64_LAN_BROADCAST_MAGIC 0x4D434C4E
-
-#if defined __PS3__ || defined  __ORBIS__
-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;
-	char playerNames[8][XUSER_NAME_SIZE];
-};
-#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;
-	char playerNames[8][XUSER_NAME_SIZE];
-};
-
-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 void CloseConnectionBySmallId(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 void UpdateAdvertisePlayerNames(BYTE count, const char playerNames[][XUSER_NAME_SIZE]);
-
-	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/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_CreateWorldMenu.cpp

@@ -1392,21 +1392,17 @@ int UIScene_CreateWorldMenu::ConfirmCreateReturned(void *pParam,int iPad,C4JStor
 	return 0;
 }
 
-#if defined(__ORBIS__)
+#ifdef __ORBIS__
 int UIScene_CreateWorldMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
     UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu *)pParam;
 	pClass->m_bIgnoreInput = false;
-#ifdef DISABLE_PSN
-	UIScene_CreateWorldMenu::StartGame_SignInReturned(pClass, true, iPad);
-#else
 
     if(result==C4JStorage::EMessage_ResultAccept) 
     {
         SQRNetworkManager_Orbis::AttemptPSNSignIn(&UIScene_CreateWorldMenu::StartGame_SignInReturned, pClass, false, iPad);
     }
 
-#endif
     return 0;
 }
 

Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp

@@ -253,7 +253,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
 		}
 		break;
 	case ACTION_MENU_Y:
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__))
+#if defined(__PS3__) || defined(__ORBIS__)
 		if(pressed && iPad == ProfileManager.GetPrimaryPad())
 		{
 #ifdef __PS3__
@@ -290,7 +290,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
 				{
 #ifdef __PSVITA__
 					PSVITA_STUBBED;
-#elif !defined(DISABLE_PSN)
+#else
 					ProfileManager.ShowProfileCard(iPad,uid);
 #endif
 				}
@@ -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 )
@@ -105,21 +105,6 @@ void UIScene_JoinMenu::tick()
 				break;
 			}
 		}
-#elif defined(_WINDOWS64) || defined(DISABLE_PSN)
-		for( int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++ )
-		{
-			if( m_selectedSession->data.players[i] != 0 && m_selectedSession->data.szPlayers[i][0] != 0 )
-			{
-				string playerName(m_selectedSession->data.szPlayers[i], XUSER_NAME_SIZE);
-				size_t end = playerName.find('\0');
-				if (end != string::npos) playerName.resize(end);
-				m_buttonListPlayers.addItem(playerName);
-			}
-			else
-			{
-				break;
-			}
-		}
 #endif
 
 		m_labelLabels[eLabel_Difficulty].init(app.GetString(IDS_LABEL_DIFFICULTY));
@@ -368,9 +353,6 @@ void UIScene_JoinMenu::checkPrivilegeCallback(LPVOID lpParam, bool hasPrivilege,
 
 void UIScene_JoinMenu::StartSharedLaunchFlow()
 {
-#if defined DISABLE_PSN
-	JoinGame(this);
-#else
 	if(!app.IsLocalMultiplayerAvailable())
 	{
 		JoinGame(this);
@@ -384,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
-	JoinGame(pClass);
-	return 0;
-#else
 	if(pClass)
 	{
 		if(bContinue==true)
@@ -415,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
@@ -455,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;
@@ -496,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);
@@ -616,30 +590,6 @@ void UIScene_JoinMenu::handleTimerComplete(int id)
 				playersList.SetCurSel(selectedIndex);
 			}
 #endif
-#if defined(_WINDOWS64) || defined(DISABLE_PSN)
-			{
-				bool success = g_NetworkManager.GetGameSessionInfo(m_iPad, m_selectedSession->sessionId, m_selectedSession);
-				if (success)
-				{
-					m_buttonListPlayers.clearList();
-					for (unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
-					{
-						if (m_selectedSession->data.players[i] != 0 && m_selectedSession->data.szPlayers[i][0] != 0)
-						{
-							string playerName(m_selectedSession->data.szPlayers[i], XUSER_NAME_SIZE);
-							size_t end = playerName.find('\0');
-							if (end != string::npos) playerName.resize(end);
-							m_buttonListPlayers.addItem(playerName);
-						}
-						else
-						{
-							break;
-						}
-					}
-				}
-			}
-#endif
-			addTimer(UPDATE_PLAYERS_TIMER_ID, UPDATE_PLAYERS_TIMER_TIME);
 		}
 		break;
 	};

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_LoadMenu.cpp

@@ -1784,20 +1784,17 @@ void UIScene_LoadMenu::handleGainFocus(bool navBack)
 	}
 }
 
-#if defined __ORBIS__
+#ifdef __ORBIS__
 int UIScene_LoadMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
     UIScene_LoadMenu* pClass = (UIScene_LoadMenu *)pParam;
 	pClass->m_bIgnoreInput = false;
 
-#ifdef DISABLE_PSN
-	UIScene_LoadMenu::StartGame_SignInReturned(pParam, true, iPad);
-#else
     if(result==C4JStorage::EMessage_ResultAccept) 
     {
         SQRNetworkManager_Orbis::AttemptPSNSignIn(&UIScene_LoadMenu::StartGame_SignInReturned, pClass, false, iPad);
     }
-#endif
+
     return 0;
 }
 

Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp

@@ -290,7 +290,13 @@ UIScene_LoadOrJoinMenu::~UIScene_LoadOrJoinMenu()
     g_NetworkManager.SetSessionsUpdatedCallback( NULL, NULL );
     app.SetLiveLinkRequired( false );
 
-	delete m_currentSessions;
+    if(m_currentSessions)
+    {
+        for(AUTO_VAR(it, m_currentSessions->begin()); it < m_currentSessions->end(); ++it)
+        {
+            delete (*it);
+        }
+    }
 
 #if TO_BE_IMPLEMENTED
     // Reset the background downloading, in case we changed it by attempting to download a texture pack
@@ -1013,7 +1019,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
 #endif
         break;
     case ACTION_MENU_Y:
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__))
+#if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__)
 		m_eAction = eAction_ViewInvites;
         if(pressed && iPad == ProfileManager.GetPrimaryPad())
         {
@@ -2379,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) 
@@ -2400,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)
@@ -2414,7 +2416,6 @@ int UIScene_LoadOrJoinMenu::PSN_SignInReturned(void *pParam,bool bContinue, int
 			// Check if we're signed in to LIVE
 			if(ProfileManager.IsSignedInLive(iPad))
 			{
-#ifndef DISABLE_PSN
 #if defined(__PS3__)
 				int ret = sceNpBasicRecvMessageCustom(SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE, SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_INCLUDE_BOOTABLE, SYS_MEMORY_CONTAINER_ID_INVALID);
 				app.DebugPrintf("sceNpBasicRecvMessageCustom return %d ( %08x )\n", ret, ret);
@@ -2422,7 +2423,6 @@ int UIScene_LoadOrJoinMenu::PSN_SignInReturned(void *pParam,bool bContinue, int
 				SQRNetworkManager_Vita::RecvInviteGUI();
 #else
 				SQRNetworkManager_Orbis::RecvInviteGUI();
-#endif
 #endif
 			}
 			break;

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

@@ -409,7 +409,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 	case ACTION_MENU_Y:
 		{
 			
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__))
+#if defined(__PS3__) || defined(__ORBIS__)
 		if(pressed && iPad == ProfileManager.GetPrimaryPad())
 		{
 #ifdef __ORBIS__
@@ -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;
 }
 
@@ -1340,7 +1333,6 @@ int UIScene_PauseMenu::ViewInvites_SignInReturned(void *pParam,bool bContinue, i
 		// Check if we're signed in to LIVE
 		if(ProfileManager.IsSignedInLive(iPad))
 		{
-#ifndef DISABLE_PSN
 #ifdef __ORBIS__
 			SQRNetworkManager_Orbis::RecvInviteGUI();
 #elif defined __PS3__
@@ -1348,7 +1340,6 @@ int UIScene_PauseMenu::ViewInvites_SignInReturned(void *pParam,bool bContinue, i
 			app.DebugPrintf("sceNpBasicRecvMessageCustom return %d ( %08x )\n", ret, ret);
 #else // __PSVITA__
 			PSVITA_STUBBED;
-#endif
 #endif
 		}
 	}

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
@@ -141,17 +141,13 @@ void UIScene_SaveMessage::handleTimerComplete(int id)
 				// set defaults - which has already been done				
 				killTimer(PROFILE_LOADED_TIMER_ID);
 				ui.NavigateToHomeMenu();
-#ifndef DISABLE_PSN
 				SQRNetworkManager::SafeToRespondToGameBootInvite();
-#endif
 				app.SetOptionsCallbackStatus(0,C4JStorage::eOptions_Callback_Idle);
 				break;
 			case C4JStorage::eOptions_Callback_Read_CorruptDeleted:
 				killTimer(PROFILE_LOADED_TIMER_ID);
 				ui.NavigateToHomeMenu();
-#ifndef DISABLE_PSN
 				SQRNetworkManager::SafeToRespondToGameBootInvite();
-#endif
 				app.SetOptionsCallbackStatus(0,C4JStorage::eOptions_Callback_Idle);
 				break;
 			case C4JStorage::eOptions_Callback_Read_Corrupt:

Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp

@@ -46,7 +46,6 @@ UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer
 		m_signRows[i].SetTitleAndText(IDS_SIGN_TITLE,IDS_SIGN_TITLE_TEXT);
 #endif
 		m_textInputLines[i].init(m_sign->GetMessage(i).c_str(), i);
-		m_textInputLines[i].SetCharLimit(15);
 	}
 
 	parentLayer->addComponent(iPad,eUIComponent_MenuBackground);
@@ -151,7 +150,6 @@ int UIScene_SignEntryMenu::KeyboardCompleteCallback(LPVOID lpParam,bool bRes)
 		uint16_t pchText[128];
 		ZeroMemory(pchText, 128 * sizeof(uint16_t) );
 		InputManager.GetText(pchText);
-		pchText[15] = 0;
 		pClass->m_textInputLines[pClass->m_iEditingLine].setLabel((wchar_t *)pchText);
 	}
 	return 0;

Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp

@@ -1518,7 +1518,6 @@ void UIScene_SkinSelectMenu::HandleDLCMountingComplete()
 void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad)
 {
 	// need to be signed in to live. get them to sign in to online
-#ifndef DISABLE_PSN
 #if defined(__PS3__)
 	SQRNetworkManager_PS3::AttemptPSNSignIn(NULL, this);		
 
@@ -1544,7 +1543,6 @@ void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad)
 	UINT uiIDA[1] = { IDS_CONFIRM_OK };
 	ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad );
 
-#endif
 #endif
 }
 

Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp

@@ -1105,7 +1105,6 @@ void CScene_Leaderboards::CopyLeaderboardEntry(PXUSER_STATS_ROW statsRow, Leader
 	}
 
 	//Is the player
-#ifndef _DISABLE_XBLIVE
 	if( statsRow->xuid == ((XboxLeaderboardManager*)LeaderboardManager::Instance())->GetMyXUID() )
 	{
 		leaderboardEntry->m_bPlayer = true;
@@ -1144,7 +1143,6 @@ void CScene_Leaderboards::CopyLeaderboardEntry(PXUSER_STATS_ROW statsRow, Leader
 			}
 		}
 	}
-#endif
 }
 
 void CScene_Leaderboards::SetLeaderboardHeader()

Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp

@@ -37,7 +37,6 @@ HRESULT CScene_MultiGameInfo::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 	// 4J-PB - don't delete this - it's part of the joinload structure
 	//delete initData;
 
-#ifndef _DISABLE_XBLIVE
 	for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
 	{
 		if( m_selectedSession->data.players[i] != NULL )
@@ -60,7 +59,6 @@ HRESULT CScene_MultiGameInfo::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
 			break;
 		}
 	}
-#endif
 
 	unsigned int uiGameHostSettings = m_selectedSession->data.m_uiGameHostSettings;
 	switch(app.GetGameHostOption(uiGameHostSettings,eGameHostOption_Difficulty))
@@ -187,14 +185,12 @@ HRESULT CScene_MultiGameInfo::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHan
 		rfHandled = TRUE;
 		break;
 	case VK_PAD_Y:
-#ifndef _DISABLE_XBLIVE
 		if(m_selectedSession != NULL && playersList.TreeHasFocus() && playersList.GetItemCount() > 0)
 		{
 			PlayerUID xuid = m_selectedSession->data.players[playersList.GetCurSel()];
 			if( xuid != INVALID_XUID )
 				hr = XShowGamerCardUI(ProfileManager.GetLockedProfile(), xuid);
 		}
-#endif
 		break;
 	}
 	
@@ -355,7 +351,6 @@ HRESULT CScene_MultiGameInfo::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled )
 {
 	if ( pTimer->nId == UPDATE_PLAYERS_TIMER_ID)
 	{
-#ifndef _DISABLE_XBLIVE
 		PlayerUID selectedPlayerXUID = m_selectedSession->data.players[playersList.GetCurSel()];
 
 		bool success = g_NetworkManager.GetGameSessionInfo(m_iPad, m_selectedSession->sessionId,m_selectedSession);
@@ -389,7 +384,6 @@ HRESULT CScene_MultiGameInfo::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled )
 			}
 			playersList.SetCurSel(selectedIndex);
 		}
-#endif
 	}
 
 	return S_OK;

Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h

@@ -1,9 +1,7 @@
 #pragma once
 using namespace std;
 #include <vector>
-#ifndef _DISABLE_XBLIVE
 #include <qnet.h>
-#endif
 #include "..\Media\xuiscene_multi_gameinfo.h"
 
 class FriendSessionInfo;

Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp

@@ -648,11 +648,9 @@ HRESULT CScene_MultiGameJoinLoad::OnKeyDown(XUIMessageInput* pInputData, BOOL& r
 			DWORD nIndex = m_pGamesList->GetCurSel();
 			FriendSessionInfo *pSelectedSession = currentSessions.at( nIndex );
 
-#ifndef _DISABLE_XBLIVE
 			PlayerUID xuid = pSelectedSession->data.hostPlayerUID;
 			if( xuid != INVALID_XUID )
 				hr = XShowGamerCardUI(ProfileManager.GetLockedProfile(), xuid);
-#endif
 			CXuiSceneBase::PlayUISFX(eSFX_Press);
 		}
 		else if(DoesSavesListHaveFocus())

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"
@@ -28,12 +26,6 @@
 #include "PSVita\Social\SocialManager.h"
 #include "PSVita\Sentient\DynamicConfigurations.h"
 #include <libperf.h>
-#elif defined _XBOX
-#include "Xbox\Sentient\SentientManager.h"
-#include "StatsCounter.h"
-#include "Xbox\Social\SocialManager.h"
-#include "Xbox\Sentient\DynamicConfigurations.h"x
-#include "Common\Network\IQNet.h"
 #else
 #include "Orbis\Sentient\SentientManager.h"
 #include "StatsCounter.h"
@@ -42,11 +34,6 @@
 #include <perf.h>
 #endif
 
-#if defined(DISABLE_PSN) || defined(_DISABLE_XBLIVE)
-#include "Common\Network\WinsockNetLayer.h"
-#endif
-
-#ifndef _DISABLE_XBLIVE
 #if !defined(__PS3__) && !defined(__ORBIS__) && !defined(__PSVITA__)
 #ifdef _WINDOWS64
 //C4JStorage StorageManager;
@@ -181,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) || defined(_WINDOWS64) || defined(_XBOX))
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__) || defined(_DURANGO)
 	return (a == b);
-#elif defined(DISABLE_PSN)
-	return (a.XUID == b.XUID);
 #else
 	return false;
 #endif
@@ -200,6 +185,49 @@ 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 0; }
+void IQNetPlayer::SendData(IQNetPlayer *player, const void *pvData, DWORD dwDataSize, DWORD dwFlags)
+{
+	app.DebugPrintf("Sending from 0x%x to 0x%x %d bytes\n",this,player,dwDataSize);
+}
+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 this == &IQNet::m_player[0]; }
+bool IQNetPlayer::IsGuest() { return false; }
+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; }
+bool IQNetPlayer::HasCamera() { return false; }
+int IQNetPlayer::GetUserIndex() { return this - &IQNet::m_player[0]; }
+void IQNetPlayer::SetCustomDataValue(ULONG_PTR ulpCustomDataValue) {
+	m_customData = ulpCustomDataValue;
+}
+ULONG_PTR IQNetPlayer::GetCustomDataValue() {
+	return m_customData;
+}
+
+IQNetPlayer IQNet::m_player[4];
+
+bool _bQNetStubGameRunning = false;
+
+HRESULT IQNet::AddLocalPlayerByUserIndex(DWORD dwUserIndex){ return S_OK; }
+IQNetPlayer *IQNet::GetHostPlayer() { return &m_player[0]; }
+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() { _bQNetStubGameRunning = true; }
+void IQNet::EndGame() { _bQNetStubGameRunning = false; }
+
 DWORD MinecraftDynamicConfigurations::GetTrialTime() { return DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME; }
 
 void XSetThreadProcessor(HANDLE a, int b) {}
@@ -420,156 +448,6 @@ void				C_4JProfile::Initialise( DWORD dwTitleID,
 		pGameSettings->ucTutorialCompletion[28] |= 1<<0;
 	}
 }
-#endif
-#endif // DISABLE_XBLIVE
-BYTE IQNetPlayer::GetSmallId() { return m_smallId; }
-void IQNetPlayer::SendData(IQNetPlayer *player, const void *pvData, DWORD dwDataSize, DWORD dwFlags)
-{
-	if (WinsockNetLayer::IsActive())
-	{
-		WinsockNetLayer::SendToSmallId(player->m_smallId, pvData, dwDataSize);
-	}
-}
-bool IQNetPlayer::IsSameSystem(IQNetPlayer *player) { return (this == player) || (!m_isRemote && !player->m_isRemote); }
-DWORD IQNetPlayer::GetSendQueueSize( IQNetPlayer *player, DWORD dwFlags ) { return 0; }
-DWORD IQNetPlayer::GetCurrentRtt() { return 0; }
-bool IQNetPlayer::IsHost() { return m_isHostPlayer; }
-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::IsTalking() { return false; }
-bool IQNetPlayer::IsMutedByLocalUser(DWORD dwUserIndex) { return false; }
-bool IQNetPlayer::HasVoice() { return false; }
-bool IQNetPlayer::HasCamera() { return false; }
-int IQNetPlayer::GetUserIndex() { return this - &IQNet::m_player[0]; }
-void IQNetPlayer::SetCustomDataValue(ULONG_PTR ulpCustomDataValue) {
-	m_customData = ulpCustomDataValue;
-}
-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;
-
-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;
-}
-
-static bool Win64_IsActivePlayer(IQNetPlayer *p, DWORD index);
-
-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 &&
-			Win64_IsActivePlayer(&m_player[dwUserIndex], dwUserIndex))
-			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 && Win64_IsActivePlayer(&m_player[i], i))
-			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)
-{
-	if (SmallId >= MINECRAFT_NET_MAX_PLAYERS)
-		return NULL;
-
-	m_player[SmallId].m_smallId = SmallId;
-	if (SmallId >= s_playerCount)
-		s_playerCount = SmallId + 1;
-	return &m_player[SmallId];
-}
-IQNetPlayer *IQNet::GetPlayerByXuid(PlayerUID xuid)
-{
-	for (DWORD i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++)
-	{
-		if (Win64_IsActivePlayer(&m_player[i], i) && m_player[i].GetXuid() == xuid) return &m_player[i];
-	}
-	return NULL;
-}
-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; }
-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;
-
-	for (int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++)
-	{
-		m_player[i].m_smallId = (BYTE)i;
-		m_player[i].m_isRemote = true;
-		m_player[i].m_isHostPlayer = false;
-		m_player[i].m_gamertag[0] = 0;
-		m_player[i].SetCustomDataValue(0);
-	}
-}
-void IQNet::EndGame()
-{
-	_iQNetStubState = QNET_STATE_IDLE;
-	s_isHosting = false;
-	s_playerCount = 1;
-	for (int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++)
-	{
-		m_player[i].m_smallId = (BYTE)i;
-		m_player[i].m_isRemote = false;
-		m_player[i].m_isHostPlayer = false;
-		m_player[i].m_gamertag[0] = 0;
-		m_player[i].SetCustomDataValue(0);
-	}
-}
-#ifndef _DISABLE_XBLIVE
-#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; }
@@ -582,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)
+void				C_4JProfile::GetXUID(int iPad, PlayerUID *pXuid,bool bOnlineXuid) {*pXuid = 0xe000d45248242f2e; }
-{
+BOOL				C_4JProfile::AreXUIDSEqual(PlayerUID xuid1,PlayerUID xuid2) { return false; }
-	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; }
 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)
 {
@@ -622,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; }
+char*				C_4JProfile::GetGamertag(int iPad){ return "PlayerName"; }
-wstring				C_4JProfile::GetDisplayName(int iPad){ extern wchar_t g_Win64UsernameW[17]; return g_Win64UsernameW; }
+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) {}
@@ -789,5 +654,4 @@ void StatsCounter::WipeLeaderboards() {}
 
 #ifdef __PS3__
 bool				C_4JProfile::IsFullVersion() { return true; }
-#endif
 #endif

Minecraft.Client/Minecraft.Client.vcxproj

@@ -717,7 +717,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>_DISABLE_XBLIVE;_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -852,7 +852,7 @@
       <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>
@@ -1004,7 +1004,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>_FINAL_BUILD;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_FINAL_BUILD;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
       <AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -2044,7 +2044,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <OptimizationLevel>Level2</OptimizationLevel>
       <AdditionalIncludeDirectories>Orbis\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;DEBUG_MENUS_ENABLED</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>..\Minecraft.World\ORBIS_Release\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render.a;Orbis\4JLibs\libs\4j_Input_r.a;Orbis\4JLibs\libs\4J_Storage_r.a;Orbis\4JLibs\libs\4J_Profile_r.a;Orbis\Iggy\lib\libiggy_orbis.a;Orbis\Miles\lib\mssorbis.a;Orbis\Miles\lib\binkaorbis.a;Common\Network\Sony\sceRemoteStorage\ps4\lib\sceRemoteStorage.a;-lSceGnmDriver_stub_weak;-lSceGnmx;-lSceGnm;-lSceGpuAddress;-lSceCes;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lScePngDec_stub_weak;-lScePngEnc_stub_weak;-lSceFios2_stub_weak;-lSceUlt_stub_weak;-lSceShaderBinary;-lSceUserService_stub_weak;-lSceSysmodule_stub_weak;-lSceImeDialog_stub_weak;-lScePosix_stub_weak;-lSceAudioOut_stub_weak;-lSceSaveData_stub_weak;-lSceRtc_stub_weak;-lSceSystemService_stub_weak;-lSceNetCtl_stub_weak;-lSceNpCommon_stub_weak;-lSceNpManager_stub_weak;-lSceNpToolkit;-lSceNpToolkitUtils;-lSceNpWebApi_stub_weak;-lSceNpAuth_stub_weak;-lSceNpTrophy_stub_weak;-lSceInvitationDialog_stub_weak;-lSceGameCustomDataDialog_stub_weak;-lSceNpCommerce_stub_weak;-lSceNet_stub_weak;-lSceHttp_stub_weak;-lSceSsl_stub_weak;-lSceNpMatching2_stub_weak;-lSceNpTus_stub_weak;-lSceNpUtility_stub_weak;-lSceNpScore_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpSns_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceRemoteplay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak;%(AdditionalDependencies)</AdditionalDependencies>
@@ -2237,7 +2237,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <FileType>XML</FileType>
       <SubType>Designer</SubType>
     </Xml>
-    <None Include="ClassDiagram1.cd" />
     <None Include="Common\Postbuilds\Durango-postbuild.ps1" />
     <None Include="Common\Postbuilds\Orbis-postbuild.ps1" />
     <None Include="Common\Postbuilds\PS3-postbuild.ps1" />
@@ -3822,11 +3821,8 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="Common\Network\GameNetworkManager.h" />
-    <ClInclude Include="Common\Network\IQNet.h" />
     <ClInclude Include="Common\Network\NetworkPlayerInterface.h" />
     <ClInclude Include="Common\Network\PlatformNetworkManagerInterface.h" />
     <ClInclude Include="Common\Network\PlatformNetworkManagerStub.h">
@@ -3835,7 +3831,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">false</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_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
@@ -3847,14 +3843,14 @@ 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|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
@@ -3905,8 +3901,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="Common\Network\Sony\SonyCommerce.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
@@ -4022,15 +4016,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</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" />
@@ -8390,12 +8376,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="Orbis\Network\SonyHttp_Orbis.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
@@ -8471,13 +8451,13 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
@@ -8534,12 +8514,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="Orbis\Network\Orbis_NPToolkit.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
@@ -8573,12 +8547,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="Orbis\ps4__np_conf.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
@@ -15576,7 +15544,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <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)'=='Release|Xbox 360'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">false</ExcludedFromBuild>
@@ -16425,8 +16393,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
@@ -16454,17 +16421,17 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">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>
@@ -16517,7 +16484,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)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="Xbox\Resource.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -20915,7 +20881,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">
@@ -20924,7 +20889,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">false</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_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
@@ -20936,14 +20901,14 @@ 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|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -20994,8 +20959,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="Common\Network\Sony\SonyHttp.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
@@ -21112,15 +21075,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|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>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</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" />
@@ -25068,7 +25023,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ClCompile Include="ExplodeParticle.cpp" />
     <ClCompile Include="Extrax64Stubs.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">false</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|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
@@ -25508,13 +25463,13 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
@@ -25571,12 +25526,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="Orbis\Network\Orbis_NPToolkit.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
@@ -25610,12 +25559,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)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="Orbis\OrbisExtras\OrbisStubs.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -28514,7 +28457,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <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'">false</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>
@@ -28812,8 +28755,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
@@ -28840,17 +28782,17 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">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>
@@ -28903,7 +28845,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)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="Xbox\Sentient\DynamicConfigurations.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

Minecraft.Client/Minecraft.Client.vcxproj.filters

@@ -726,9 +726,6 @@
     <Filter Include="net\minecraft\client\resources">
       <UniqueIdentifier>{889a84db-3009-4a7c-8234-4bf93d412690}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Windows64\Network">
-      <UniqueIdentifier>{a86cfe95-eafc-414e-8ba4-190ff049fde4}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
@@ -893,7 +890,6 @@
     <None Include="Common\Postbuilds\Windows64-postbuild.ps1" />
     <None Include="Common\Postbuilds\Xbox-postbuild.ps1" />
     <None Include="Common\Postbuilds\PSVita-postbuild.ps1" />
-    <None Include="ClassDiagram1.cd" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -3779,12 +3775,6 @@
     <ClInclude Include="PSVita\OldSdk.h">
       <Filter>PSVita</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Network\WinsockNetLayer.h">
-      <Filter>Common\Source Files\Network</Filter>
-    </ClInclude>
-    <ClInclude Include="Common\Network\IQNet.h">
-      <Filter>Common\Source Files\Network</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -5929,9 +5919,6 @@
     <ClCompile Include="PSVita\OldSdk.cpp">
       <Filter>PSVita</Filter>
     </ClCompile>
-    <ClCompile Include="Common\Network\WinsockNetLayer.cpp">
-      <Filter>Common\Source Files\Network</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Library Include="Xbox\4JLibs\libs\4J_Render_d.lib">

Minecraft.Client/Minecraft.cpp

@@ -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
@@ -4984,16 +4982,12 @@ ColourTable *Minecraft::getColourTable()
 int Minecraft::MustSignInReturnedPSN(void *pParam, int iPad, C4JStorage::EMessageResult result)
 {
 	Minecraft* pMinecraft = (Minecraft *)pParam;
-#ifdef DISABLE_PSN
-	Minecraft::InGame_SignInReturned(pMinecraft, true, iPad);
-#else
 
 	if(result == C4JStorage::EMessage_ResultAccept) 
 	{        
 		SQRNetworkManager_Orbis::AttemptPSNSignIn(&Minecraft::InGame_SignInReturned, pMinecraft, false, iPad);
 	}
 
-#endif
 	return 0;
 }
 #endif

Minecraft.Client/Orbis/Orbis_App.cpp

@@ -550,9 +550,7 @@ void CConsoleMinecraftApp::CommerceTick()
 					{
 						SonyCommerce::ProductInfo *pProductInfo=&(pvProductList->at(j));
 						// just want the final 16 characters of the product id
-#ifndef DISABLE_PSN
 						RegisterDLCData(&pProductInfo->productId[20],0,pProductInfo->imageUrl);
-#endif
 					}
 					iter++;
 				}
@@ -1070,9 +1068,7 @@ void CConsoleMinecraftApp::SystemServiceTick()
 				{
 				case SCE_SYSTEM_SERVICE_EVENT_GAME_CUSTOM_DATA:
 				{
-#ifndef DISABLE_PSN
 					OrbisNPToolkit::getMessageData((SceNpGameCustomDataEventParam*)event.data.param);
-#endif
 					// Processing after invitation
 					//SceNpSessionInvitationEventParam* pInvite = (SceNpSessionInvitationEventParam*)event.data.param;
 					//SQRNetworkManager_Orbis::GetInviteDataAndProcess(pInvite);

Minecraft.Client/Orbis/Orbis_Minecraft.cpp

@@ -39,12 +39,8 @@
 #include "..\..\Minecraft.World\OldChunkStorage.h"
 #include "Leaderboards\OrbisLeaderboardManager.h"
 
-#ifndef DISABLE_PSN
 #include "Network/Orbis_NPToolkit.h"
 #include "Orbis\Network\SonyVoiceChat_Orbis.h"
-#else
-#include "..\..\Minecraft.Client\Common\Network\WinsockNetLayer.h"
-#endif
 
 #define THEME_NAME		"584111F70AAAAAAA"
 #define THEME_FILESIZE	2797568
@@ -706,9 +702,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(4,1);
-#ifndef DISABLE_PSN
 	ProfileManager.SetRichPresenceSettingFn(SQRNetworkManager_Orbis::SetRichPresence);
-#endif
 	char *pchRichPresenceString;
 
 	pchRichPresenceString=(char *)AddRichPresenceString(IDS_RICHPRESENCE_GAMESTATE);
@@ -955,9 +949,7 @@ int main(int argc, const char *argv[] )
 
 #endif
 	app.InitTime();
-#ifndef DISABLE_PSN
 	NPToolkit.init();
-#endif
 
 	// Set the number of possible joypad layouts that the user can switch between, and the number of actions
 	InputManager.Initialise(1,5,MINECRAFT_ACTION_MAX, ACTION_MAX_MENU);
@@ -1206,9 +1198,7 @@ int main(int argc, const char *argv[] )
 
 	while (TRUE)
 	{
-#ifndef DISABLE_PSN
 		SonyVoiceChat_Orbis::tick();
-#endif
 		RenderManager.StartFrame();
 #if 0
 		if(pMinecraft->soundEngine->isStreamingWavebankReady() &&

Minecraft.Client/Orbis/Orbis_PlayerUID.cpp

@@ -74,10 +74,12 @@ PlayerUID::PlayerUID(wstring fromString)
 	wstring onlineID = fromString.substr(15 + userIdLen + 1);
 	if(onlineID.size() > 0)
 	{
+		wcstombs(m_onlineID, onlineID.c_str(), 16);
 		m_bSignedIntoPSN = true;
 	}
 	else
 	{
+		m_onlineID[0] = 0;
 		m_bSignedIntoPSN = false;
 	}
 }
@@ -85,8 +87,13 @@ PlayerUID::PlayerUID(wstring fromString)
 
 bool PlayerUID::operator==(const PlayerUID& rhs) const
 {
+	// comparing online IDs	
+	if(isSignedIntoPSN() && rhs.isSignedIntoPSN())
+	{
+		return (strcmp(m_onlineID, rhs.m_onlineID) == 0);
+	}
 	// comparing offline IDs	
-	if(XUID != rhs.XUID)
+	if(m_userID != rhs.m_userID)
 		return false;
 	for(int i=0; i<SCE_NET_ETHER_ADDR_LEN;i++)
 		if(m_macAddress[i] != rhs.m_macAddress[i])return false;
@@ -140,13 +147,13 @@ std::wstring PlayerUID::toString() const
 	sprintf(macAddr, "%02x%02x%02x%02x%02x%02x", m[0],m[1],m[2],m[3],m[4],m[5]);
 	sprintf(finalString, "%s_%s_%08d_%s",	isPrimaryUser() ? "P" : "N", 
 		macAddr, m_userID, 
-		"");
+		isSignedIntoPSN() ? m_onlineID : "");
 	mbstowcs(finalStringW, finalString, 64);
 	return std::wstring(finalStringW);
 }
 void PlayerUID::setOnlineID(SceNpOnlineId& id, bool bSignedIntoPSN)
 {
-	//memcpy(m_onlineID, id.data, SCE_NP_ONLINEID_MAX_LENGTH);
+	memcpy(m_onlineID, id.data, SCE_NP_ONLINEID_MAX_LENGTH);
 	term = id.term;
 	m_bSignedIntoPSN = bSignedIntoPSN;
 }
@@ -173,7 +180,7 @@ bool PlayerUID::isPrimaryUser() const /* only true if we're on the local machine
 
 
 
-#ifndef DISABLE_PSN
+
 GameSessionUID::GameSessionUID()
 {
 	memset(this,0,sizeof(GameSessionUID));
@@ -207,4 +214,4 @@ GameSessionUID& GameSessionUID::operator=(const PlayerUID& rhs)
 	m_bSignedIntoPSN = rhs.isSignedIntoPSN();
 	return *this;
 }
-#endif
+

Minecraft.Client/Orbis/Orbis_PlayerUID.h

@@ -9,19 +9,17 @@
 // (2) An offline ID, where there is also a primary login on the system. This has m_onlineID set up to copy the primary SceNpOnlineId, except with dummy[0] set to the controller ID of this other player
 // (3) An offline ID, where there isn't a primary PSN login on the system. This has SceNpOnlineId fully zeroed.
 
-#pragma pack(push, 4)
+
 class PlayerUID
 {
-	// PS4 4JLibs needs exactly 28 bytes for playerUID, 
+	char m_onlineID[SCE_NP_ONLINEID_MAX_LENGTH];
-	//char m_onlineID[SCE_NP_ONLINEID_MAX_LENGTH];
 	char term;
 	bool m_bSignedIntoPSN : 1;
 	unsigned char m_quadrant : 2;
 	uint8_t m_macAddress[SCE_NET_ETHER_ADDR_LEN];
 	SceUserServiceUserId m_userID;
-	char m_padding[8];
+
 public:
-	ULONGLONG XUID;
 
 	class Hash 
 	{
@@ -32,8 +30,6 @@ public:
 	PlayerUID();
 	PlayerUID(SceUserServiceUserId 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);
@@ -44,7 +40,8 @@ public:
 	void setOnlineID(SceNpOnlineId& id, bool bSignedIntoPSN);
 	void setUserID(unsigned int id);
 
-	const char*			getOnlineID() const		{ return ""; }
+
+	const char*			getOnlineID() const		{ return m_onlineID; }
 	SceUserServiceUserId getUserID() const		{ return m_userID; }
 	int					getQuadrant() const		{ return m_quadrant;  }
 	bool				isPrimaryUser() const;	// only true if we're on the local machine and signed into the first quadrant;
@@ -64,10 +61,10 @@ namespace std
 		}
 	};
 }
-#pragma pack(pop)
 
 
-#ifndef DISABLE_PSN
+
+
 class GameSessionUID
 {
 	char m_onlineID[SCE_NP_ONLINEID_MAX_LENGTH];
@@ -86,4 +83,3 @@ public:
 	int					getQuadrant() const		{ return m_quadrant;  }
 	bool				isSignedIntoPSN() const	{ return m_bSignedIntoPSN; }
 };
-#endif

Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp

@@ -53,16 +53,16 @@ HRESULT PS3LeaderboardManager::destroyTransactionContext(int transactionContext)
 	return sceNpScoreDestroyTransactionCtx(transactionContext);
 }
 
-HRESULT PS3LeaderboardManager::getFriendsList(const SceNpId &myNpId, SceNpId* &npIds, uint32_t &len)
+HRESULT PS3LeaderboardManager::getFriendsList(const SceNpId &myNpId, SceNpId* &npIds, uint32_t &len)
-{
+{
-	EFilterMode filterMode = m_eFilterMode;
+	EFilterMode filterMode = m_eFilterMode;
-	m_eFilterMode = eFM_Friends;
+	m_eFilterMode = eFM_Friends;
-
+
-	HRESULT ret = fillByIdsQuery(myNpId, npIds, len);
+	HRESULT ret = fillByIdsQuery(myNpId, npIds, len);
-
+
-	m_eFilterMode = filterMode;
+	m_eFilterMode = filterMode;
-
+
-	return ret;
+	return ret;
 }
 
 char *PS3LeaderboardManager::getComment(SceNpScoreComment *comment)

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

@@ -160,7 +160,7 @@ bool PlayerUID::isPrimaryUser() const /* only true if we're on the local machine
 
 
 
-#ifndef DISABLE_PSN
+
 GameSessionUID::GameSessionUID()
 {
 	memset(this,0,sizeof(GameSessionUID));
@@ -194,4 +194,4 @@ GameSessionUID& GameSessionUID::operator=(const PlayerUID& rhs)
 	m_bSignedIntoPSN = rhs.isSignedIntoPSN();
 	return *this;
 }
-#endif
+

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);
@@ -55,7 +51,7 @@ private:
 
 
 
-#ifndef DISABLE_PSN
+
 class GameSessionUID
 {
 	char m_onlineID[SCE_NET_NP_ONLINEID_MAX_LENGTH];
@@ -74,5 +70,3 @@ public:
 	int					getQuadrant() const		{ return m_quadrant;  }
 	bool				isSignedIntoPSN() const	{ return m_bSignedIntoPSN; }
 };
-#endif
-

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;
+		handleAcceptedLogin(packet);
-
-		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);
-		}
 	}
 	//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);
 
-#if defined(_WINDOWS64) || defined(DISABLE_PSN) || defined(_DISABLE_XBLIVE)
-    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,15 +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(), 31);
-		qnp->m_gamertag[31] = L'\0';
-		g_NetworkManager.UpdateAndSetGameSessionData();
-	}
 #endif
 
 	// 4J Stu - TU-1 hotfix
@@ -482,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
@@ -511,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>();
@@ -524,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 );
-			player->enableAllPlayerPrivileges( app.GetGameHostOption(eGameHostOption_TrustPlayers)>0 );
-
-		PlayerUID realXuid = networkPlayer->GetUID();
-		player->setXuid(realXuid);
-		player->setOnlineXuid(realXuid);
 	}
 
 	// 4J Added

Minecraft.Client/TrackedEntity.cpp

@@ -19,9 +19,7 @@
 #include "PlayerList.h"
 #include "EntityTracker.h"
 #include "PlayerChunkMap.h"
-#ifndef _DISABLE_XBLIVE
 #include <qnet.h>
-#endif
 
 TrackedEntity::TrackedEntity(shared_ptr<Entity> e, int range, int updateInterval, bool trackDelta)
 {

Minecraft.Client/Windows64/Windows64_App.cpp

@@ -26,8 +26,6 @@ void CConsoleMinecraftApp::StoreLaunchData()
 }
 void CConsoleMinecraftApp::ExitGame()
 {
-	extern HWND g_hWnd;
-	PostMessage(g_hWnd, WM_CLOSE, 0, 0);
 }
 void CConsoleMinecraftApp::FatalLoadError()
 {
@@ -57,8 +55,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 	app.ReleaseSaveThumbnail();
 	ProfileManager.SetLockedProfile(0);
-	extern wchar_t g_Win64UsernameW[17];
+	pMinecraft->user->name = L"Windows";
-	pMinecraft->user->name = g_Win64UsernameW;
 	app.ApplyGameSettingsChanged(0);
 
 	////////////////////////////////////////////////////////////////////////////////////////////// From CScene_MultiGameJoinLoad::OnInit

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -17,7 +17,6 @@
 #include "..\..\Minecraft.World\Vec3.h"
 #include "..\..\Minecraft.World\Level.h"
 #include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\MultiplayerLocalPlayer.h"
 
 #include "..\ClientConnection.h"
 #include "..\User.h"
@@ -37,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"
 
@@ -70,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
@@ -81,8 +76,8 @@ wchar_t g_Win64UsernameW[17] = {0};
 
 BOOL g_bWidescreen = TRUE;
 
-int g_iScreenWidth = 1280;
+int g_iScreenWidth = 1920;
-int g_iScreenHeight = 720;
+int g_iScreenHeight = 1080;
 
 void DefineActions(void)
 {
@@ -262,7 +257,7 @@ HRESULT InitD3D( IDirect3DDevice9 **ppDevice,
 	pd3dPP->EnableAutoDepthStencil = TRUE;
 	pd3dPP->AutoDepthStencilFormat = D3DFMT_D24S8;
 	pd3dPP->SwapEffect             = D3DSWAPEFFECT_DISCARD;
-	pd3dPP->PresentationInterval   = D3DPRESENT_INTERVAL_IMMEDIATE;
+	pd3dPP->PresentationInterval   = D3DPRESENT_INTERVAL_ONE;
 	//pd3dPP->Flags				   = D3DPRESENTFLAG_NO_LETTERBOX;
 	//ERR[D3D]: Can't set D3DPRESENTFLAG_NO_LETTERBOX when wide-screen is enabled
 	//	in the launcher/dashboard.
@@ -552,8 +547,6 @@ app.DebugPrintf("width: %d, height: %d\n", width, height);
 	descDSView.Format = DXGI_FORMAT_D24_UNORM_S8_UINT;
 	descDSView.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
 	descDSView.Texture2D.MipSlice = 0;
-	// when would this ever be a non-garbage value?
-	descDSView.Flags = 0;
 
 	hr = g_pd3dDevice->CreateDepthStencilView(g_pDepthStencilBuffer, &descDSView, &g_pDepthStencilView);
 
@@ -636,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);
@@ -850,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();
@@ -1004,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();
@@ -1034,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.Client/Xbox/Network/PlatformNetworkManagerXbox.h

@@ -1,9 +1,7 @@
 #pragma once
 using namespace std;
 #include <vector>
-#ifndef _DISABLE_XBLIVE
 #include <qnet.h>
-#endif
 #include "..\..\..\Minecraft.World\C4JThread.h"
 #include "..\..\Common\Network\NetworkPlayerInterface.h"
 #include "..\..\Common\Network\PlatformNetworkManagerInterface.h"

Minecraft.Client/Xbox/Xbox_Minecraft.cpp

@@ -24,11 +24,7 @@
 #include "..\..\Minecraft.Client\StatsCounter.h"
 #include "..\ConnectScreen.h"
 #include "Social\SocialManager.h"
-#ifndef _DISABLE_XBLIVE
+#include "Leaderboards\XboxLeaderboardManager.h"
-	#include "Leaderboards\XboxLeaderboardManager.h"
-#else
-	#include "..\Windows64\Leaderboards\WindowsLeaderboardManager.h"
-#endif
 #include "..\Common\XUI\XUI_Scene_Container.h"
 #include "..\..\Minecraft.Client\Tesselator.h"
 #include "..\..\Minecraft.Client\Options.h"

Minecraft.Client/stdafx.h

@@ -101,17 +101,10 @@ using namespace DirectX;
 #include <xuiapp.h>
 #include <xact3.h>
 #include <xact3d3.h>
-#ifdef _DISABLE_XBLIVE
-typedef ULONGLONG PlayerUID;
-typedef ULONGLONG SessionID;
-typedef PlayerUID GameSessionUID;
-class INVITE_INFO;
-#else
 typedef XINVITE_INFO INVITE_INFO;
 typedef XUID PlayerUID;
 typedef XNKID SessionID;
 typedef XUID GameSessionUID;
-#endif // _DISABLE_XBLIVE
 #define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
 
 #include "..\Minecraft.Client\xbox\network\extra.h"
@@ -238,11 +231,7 @@ typedef XUID GameSessionUID;
 	#include "Xbox\GameConfig\Minecraft.spa.h"
 	#include "XboxMedia\4J_strings.h"
 	#include "Xbox\XML\ATGXmlParser.h"
-#ifndef _DISABLE_XBLIVE
 	#include "Xbox\Leaderboards\XboxLeaderboardManager.h"
-#else
-	#include "Windows64\Leaderboards\WindowsLeaderboardManager.h"
-#endif
 	#include "Xbox\Social\SocialManager.h"
 	#include "Xbox\Audio\SoundEngine.h"
 	#include "Xbox\Xbox_UIController.h"
@@ -303,7 +292,7 @@ typedef XUID GameSessionUID;
 	#include "PSVita\Iggy\include\iggy.h"
 	#include "PSVita\Iggy\gdraw\gdraw_psp2.h"
 	#include "PSVita\PSVita_UIController.h"
-#elif !defined _XBOX
+#else
 	#include "Orbis\Sentient\MinecraftTelemetry.h"
 	#include "OrbisMedia\strings.h"
 	#include "Orbis\Orbis_App.h"
@@ -360,4 +349,4 @@ typedef XUID GameSessionUID;
 #define OutputDebugStringW BREAKTHECOMPILE
 #endif
 
-void MemSect(int sect);
+void MemSect(int sect);

Minecraft.World/Connection.cpp

@@ -255,7 +255,7 @@ bool Connection::writeTick()
 			// 4J Stu - Changed this so that rather than writing to the network stream through a buffered stream we want to:
 			// a) Only push whole "game" packets to QNet, rather than amalgamated chunks of data that may include many packets, and partial packets
 			// b) To be able to change the priority and queue of a packet if required
-#if defined _XBOX && !defined _DISABLE_XBLIVE
+#ifdef _XBOX
 			int flags = QNET_SENDDATA_LOW_PRIORITY | QNET_SENDDATA_SECONDARY;
 #else
 			int flags = NON_QNET_SENDDATA_ACK_REQUIRED;

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() );

Minecraft.World/ConsoleSaveFileOriginal.cpp

@@ -920,7 +920,7 @@ vector<FileEntry *> *ConsoleSaveFileOriginal::getRegionFilesByDimension(unsigned
 	return NULL;
 }
 
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 wstring ConsoleSaveFileOriginal::getPlayerDataFilenameForLoad(const PlayerUID& pUID)
 {
 	return header.getPlayerDataFilenameForLoad( pUID );

Minecraft.World/ConsoleSaveFileOriginal.h

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

Minecraft.World/DataInputStream.cpp

@@ -519,7 +519,7 @@ int DataInputStream::readUTFChar()
 PlayerUID DataInputStream::readPlayerUID()
 {
 	PlayerUID returnValue;
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 	for(int idPos=0;idPos<sizeof(PlayerUID); idPos++)
 		((char*)&returnValue)[idPos] = readByte();
 #elif defined(_DURANGO)

Minecraft.World/DataOutputStream.cpp

@@ -265,13 +265,11 @@ void DataOutputStream::writeUTF(const wstring& str)
 // 4J Added
 void DataOutputStream::writePlayerUID(PlayerUID player)
 {
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 	for(int idPos=0;idPos<sizeof(PlayerUID); idPos++)
 		writeByte(((char*)&player)[idPos]);
 #elif defined(_DURANGO)
 	writeUTF(player.toString());
-#elif defined(DISABLE_PSN)
-	writeLong(player.XUID);
 #else
 	writeLong(player);
 #endif // PS3

Minecraft.World/DirectoryLevelStorage.cpp

@@ -393,7 +393,7 @@ void DirectoryLevelStorage::save(shared_ptr<Player> player)
 	{
 		CompoundTag *tag = new CompoundTag();
 		player->saveWithoutId(tag);
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 		ConsoleSavePath realFile = ConsoleSavePath( m_saveFile->getPlayerDataFilenameForSave(playerXuid).c_str() );
 #elif defined(_DURANGO)
 		ConsoleSavePath realFile = ConsoleSavePath( playerDir.getName() + player->getXuid().toString() + L".dat" );
@@ -442,7 +442,7 @@ CompoundTag *DirectoryLevelStorage::load(shared_ptr<Player> player)
 CompoundTag *DirectoryLevelStorage::loadPlayerDataTag(PlayerUID xuid)
 {
 	// 4J Jev, removed try/catch.
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 	ConsoleSavePath realFile = ConsoleSavePath( m_saveFile->getPlayerDataFilenameForLoad(xuid).c_str() );
 #elif defined(_DURANGO)
 	ConsoleSavePath realFile = ConsoleSavePath( playerDir.getName() + xuid.toString() + L".dat" );
@@ -472,7 +472,7 @@ void DirectoryLevelStorage::clearOldPlayerFiles()
 {
 	if(StorageManager.GetSaveDisabled() ) return;
 
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 	vector<FileEntry *> *playerFiles = m_saveFile->getValidPlayerDatFiles();
 #else
 	vector<FileEntry *> *playerFiles = m_saveFile->getFilesWithPrefix( playerDir.getName() );
@@ -561,7 +561,7 @@ void DirectoryLevelStorage::resetNetherPlayerPositions()
 {
 	if(app.GetResetNether())
 	{
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 		vector<FileEntry *> *playerFiles = m_saveFile->getValidPlayerDatFiles();
 #else
 		vector<FileEntry *> *playerFiles = m_saveFile->getFilesWithPrefix( playerDir.getName() );

Minecraft.World/Minecraft.World.vcxproj

@@ -436,7 +436,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-    <IncludePath>$(Xbox360TechPreviewInclude);$(XDKInstallDir)\include\xbox;</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
     <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
@@ -660,7 +659,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>_DISABLE_XBLIVE;_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ShowIncludes>false</ShowIncludes>
       <UseFullPaths>false</UseFullPaths>
@@ -858,7 +857,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>_FINAL_BUILD;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_FINAL_BUILD;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ShowIncludes>false</ShowIncludes>
@@ -1446,7 +1445,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <CppExceptions>true</CppExceptions>
       <OptimizationLevel>Level2</OptimizationLevel>
-      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;DEBUG_MENUS_ENABLED</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;_DEBUG_MENUS_ENABLED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">
@@ -2032,9 +2031,7 @@
     <ClInclude Include="WoolCarpetTile.h" />
     <ClInclude Include="WorldlyContainer.h" />
     <ClInclude Include="WrittenBookItem.h" />
-    <ClInclude Include="x64headers\extraX64.h">
+    <ClInclude Include="x64headers\extraX64.h" />
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">false</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="x64headers\qnet.h" />
     <ClInclude Include="x64headers\xmcore.h" />
     <ClInclude Include="x64headers\xrnm.h" />

Minecraft.World/PlayerInfoPacket.cpp

@@ -2,9 +2,7 @@
 #include "net.minecraft.world.entity.player.h"
 #include "..\Minecraft.Client\ServerPlayer.h"
 #include "..\Minecraft.Client\PlayerConnection.h"
-#ifndef _DISABLE_XBLIVE
 #include <qnet.h>
-#endif
 #include "PacketListener.h"
 #include "InputOutputStream.h"
 #include "PlayerInfoPacket.h"

Minecraft.World/Socket.cpp

@@ -500,7 +500,7 @@ void Socket::SocketOutputStreamNetwork::writeWithFlags(byteArray b, unsigned int
 			return;
 		}
 
-#if defined _XBOX && !defined _DISABLE_XBLIVE
+#ifdef _XBOX
 		bool lowPriority = ( ( flags & QNET_SENDDATA_LOW_PRIORITY )		== QNET_SENDDATA_LOW_PRIORITY );
 		bool requireAck = lowPriority;
 #else

Minecraft.World/Socket.h

@@ -1,9 +1,7 @@
 #pragma once
 #include <xrnm.h>
 #include <queue>
-#ifndef _DISABLE_XBLIVE
 #include <qnet.h>
-#endif
 #include "InputStream.h"
 #include "OutputStream.h"
 

Minecraft.World/compression.cpp

@@ -334,9 +334,8 @@ HRESULT Compression::Decompress(void *pDestination, unsigned int *pDestSize, voi
 	*pDestSize = (unsigned int)destSize;
 	return ( ( res == Z_OK ) ? S_OK : -1 );
 #elif defined __PS3__
-	uLongf destSize = (uLongf)(*pDestSize);
+	uint32_t destSize = (uint32_t)(*pDestSize);
-	bool res = uncompress((Bytef*)pDestination, &destSize, (Bytef*)pSource, SrcSize);
+	bool res = EdgeZLib::Decompress(pDestination, &destSize, pSource, SrcSize);
-
 	*pDestSize = (unsigned int)destSize;
 	return ( ( res ) ? S_OK : -1 );
 #else

Minecraft.World/stdafx.h

@@ -53,17 +53,10 @@ using namespace DirectX;
 #include <xboxmath.h>
 #include <xuiapp.h>
 #include <xact3.h>
-#ifdef _DISABLE_XBLIVE
-typedef ULONGLONG PlayerUID;
-typedef ULONGLONG SessionID;
-typedef PlayerUID GameSessionUID;
-class INVITE_INFO;
-#else
 typedef XINVITE_INFO INVITE_INFO;
 typedef XUID PlayerUID;
 typedef XNKID SessionID;
 typedef XUID GameSessionUID;
-#endif // _DISABLE_XBLIVE
 #endif
 
 #ifdef __PS3__

Minecraft.World/x64headers/extraX64.h

@@ -11,10 +11,6 @@
 
 #define MULTITHREAD_ENABLE
 
-#if defined(__PS3__) || defined(__ORBIS__)
-#define DISABLE_PSN
-#endif
-
 typedef unsigned char byte;
 
 const int XUSER_INDEX_ANY = 255;
@@ -35,16 +31,10 @@ const int MINECRAFT_NET_MAX_PLAYERS = 8;
 #include <np/np_npid.h>
 #include <user_service.h>
 #include "..\..\Minecraft.Client\Orbis\Orbis_PlayerUID.h"
-
-#ifndef DISABLE_PSN
 #include "..\..\Minecraft.Client\Orbis\Network\SQRNetworkManager_Orbis.h"
 typedef SQRNetworkManager_Orbis::SessionID SessionID;
 typedef SQRNetworkManager_Orbis::PresenceSyncInfo INVITE_INFO;
-#else
+
-typedef ULONGLONG GameSessionUID;
-typedef ULONGLONG SessionID;
-class INVITE_INFO;
-#endif // DISABLE_PSN
 #elif defined __PS3__		// defined in the profile lib
 #include <np.h>
 #include <sysutil/sysutil_userinfo.h>
@@ -52,16 +42,9 @@ class INVITE_INFO;
 #include <assert.h>
 #include <stdlib.h>
 #include "..\..\Minecraft.Client\PS3\PS3_PlayerUID.h"
-
-#ifndef DISABLE_PSN
 #include "..\..\Minecraft.Client\PS3\Network\SQRNetworkManager_PS3.h"
 typedef SQRNetworkManager::SessionID SessionID;
 typedef SQRNetworkManager::PresenceSyncInfo INVITE_INFO;
-#else
-typedef ULONGLONG GameSessionUID;
-typedef ULONGLONG SessionID;
-class INVITE_INFO;
-#endif
 
 #elif defined __PSVITA__
 #include <np.h>
@@ -232,17 +215,10 @@ public:
 	int GetUserIndex();
 	void SetCustomDataValue(ULONG_PTR ulpCustomDataValue);
 	ULONG_PTR GetCustomDataValue();
-
-	BYTE m_smallId;
-	bool m_isRemote;
-	bool m_isHostPlayer;
-	wchar_t m_gamertag[32];
 private:
 	ULONG_PTR m_customData;
 };
 
-void Win64_SetupRemoteQNetPlayer(IQNetPlayer *player, BYTE smallId, bool isHost, bool isLocal);
-
 const int QNET_GETSENDQUEUESIZE_SECONDARY_TYPE = 0;
 const int QNET_GETSENDQUEUESIZE_MESSAGES = 0;
 const int QNET_GETSENDQUEUESIZE_BYTES = 0;
@@ -333,12 +309,9 @@ public:
 	bool IsHost();
 	HRESULT JoinGameFromInviteInfo(DWORD dwUserIndex, DWORD dwUserMask, const INVITE_INFO *pInviteInfo);
 	void HostGame();
-	void ClientJoinGame();
 	void EndGame();
 
-	static IQNetPlayer m_player[MINECRAFT_NET_MAX_PLAYERS];
+	static IQNetPlayer m_player[4];
-	static DWORD s_playerCount;
-	static bool s_isHosting;
 };
 
 #ifdef _DURANGO