feat(Windows64): TU24 Tutorial World & Sounds

The msscmp is from TU25 but ignore that

.gitattributes

@@ -0,0 +1 @@
+*.sfo binary

.gitea/workflows/release.yaml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: Validate version format
         run: |
-          if (-not ("${{ inputs.version }}" -match '^v\d+\.\d+\.\d+[a-zA-Z0-9.-]*$')) {
+          if (-not ("${{ inputs.version }}" -match '^[vb]\d+\.\d+\.\d+[a-zA-Z0-9.-]*$')) {
             Write-Error "Version '${{ inputs.version }}' doesn't match expected format (e.g. v1.0.0)"
             exit 1
           }
@@ -27,7 +27,7 @@ jobs:
     needs: validate
     strategy:
       matrix:
-        configuration: [Release]
+        configuration: [ContentPackage]
         platform: [Windows64, Xbox360, Orbis, PSVita, PS3]
         include:
         - platform: Windows64

Minecraft.Client/BufferedImage.cpp

@@ -93,14 +93,13 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
 
 		if(bTitleUpdateTexture)
 		{
-			// Make the content package point to to the UPDATE: drive is needed
 			wDrive= wstr + L"\\Common\\res\\TitleUpdate\\";
 		}
 		else
 		{
 			wDrive= wstr + L"/Common/";
 		}
-#elif __PSVITA__
+//#elif __PSVITA__
 
 		/*char *pchUsrDir=getUsrDirPath();
 
@@ -115,20 +114,9 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
 		{
 			wDrive= wstr + L"/Common/";
 		}*/
-
-		if(bTitleUpdateTexture)
-		{
-			// Make the content package point to to the UPDATE: drive is needed
-			wDrive= L"Common\\res\\TitleUpdate\\";
-		}
-		else
-		{
-			wDrive= L"Common/";
-		}
 #else
 		if(bTitleUpdateTexture)
 		{
-			// Make the content package point to to the UPDATE: drive is needed
 			wDrive= L"Common\\res\\TitleUpdate\\";
 		}
 		else

Minecraft.Client/ClientConnection.cpp

@@ -1365,7 +1365,7 @@ void ClientConnection::handleChat(shared_ptr<ChatPacket> packet)
 		break;
 	case ChatPacket::e_ChatCannotPlaceLava:
 		displayOnGui = false;
-		app.SetGlobalXuiAction(eAppAction_DisplayLavaMessage);
+		app.SetGlobalUIAction(eAppAction_DisplayLavaMessage);
 		break;
 	case ChatPacket::e_ChatDeathInFire:
 		message=app.GetString(IDS_DEATH_INFIRE);

Minecraft.Client/Common/App_enums.h

@@ -31,7 +31,7 @@ enum eFont
 	eFont_None, // to fallback to nothing
 };
 
-enum eXuiAction
+enum eUIAction
 {
 	eAppAction_Idle=0,
 	eAppAction_SaveGame,
@@ -112,21 +112,21 @@ enum eTMSAction
 
 // The server runs on its own thread, so we need to call its actions there rather than where all other Xui actions are performed
 // In general these are debugging options
-enum eXuiServerAction
+enum eUIServerAction
 {
-	eXuiServerAction_Idle=0,
-	eXuiServerAction_DropItem, // Debug
-	eXuiServerAction_SaveGame,
-	eXuiServerAction_AutoSaveGame,
-	eXuiServerAction_SpawnMob, // Debug
-	eXuiServerAction_PauseServer,
-	eXuiServerAction_ToggleRain, // Debug
-	eXuiServerAction_ToggleThunder, // Debug
-	eXuiServerAction_ServerSettingChanged_Gamertags,
-	eXuiServerAction_ServerSettingChanged_Difficulty,
-	eXuiServerAction_ExportSchematic, //Debug
-	eXuiServerAction_ServerSettingChanged_BedrockFog,
-	eXuiServerAction_SetCameraLocation, //Debug
+	eUIServerAction_Idle=0,
+	eUIServerAction_DropItem, // Debug
+	eUIServerAction_SaveGame,
+	eUIServerAction_AutoSaveGame,
+	eUIServerAction_SpawnMob, // Debug
+	eUIServerAction_PauseServer,
+	eUIServerAction_ToggleRain, // Debug
+	eUIServerAction_ToggleThunder, // Debug
+	eUIServerAction_ServerSettingChanged_Gamertags,
+	eUIServerAction_ServerSettingChanged_Difficulty,
+	eUIServerAction_ExportSchematic, //Debug
+	eUIServerAction_ServerSettingChanged_BedrockFog,
+	eUIServerAction_SetCameraLocation, //Debug
 };
 
 enum eGameSetting
@@ -835,7 +835,7 @@ enum EControllerActions
 	ACTION_MENU_GTC_RESUME,
 #endif
 
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ACTION_MENU_TOUCHPAD_PRESS,
 #endif
 

Minecraft.Client/Common/App_structs.h

@@ -138,9 +138,9 @@ typedef std::vector <PBANNEDLISTDATA> VBANNEDLIST;
 typedef struct
 {
 	int iPad;
-	eXuiAction action;
+	eUIAction action;
 } 
-XuiActionParam;
+UIActionParam;
 
 // tips
 typedef struct 

Minecraft.Client/Common/Audio/SoundEngine.cpp

@@ -1100,7 +1100,7 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 {
 #ifdef __DISABLE_MILES__
 	return 0;
-#endif
+#else
 	SoundEngine *soundEngine = (SoundEngine *)lpParameter;
 	soundEngine->m_hStream = AIL_open_stream(soundEngine->m_hDriver,soundEngine->m_szStreamName,0);
 
@@ -1111,6 +1111,7 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 	}
 #endif
 	return 0;
+#endif
 }
 
 /////////////////////////////////////////////
@@ -1120,8 +1121,7 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 /////////////////////////////////////////////
 void SoundEngine::playMusicTick() 
 {
-// AP - vita will update the music during the mixer callback
-#ifndef __PSVITA__
+#ifndef __PSVITA__ // AP - vita will update the music during the mixer callback
 	playMusicUpdate();
 #endif
 }
@@ -1156,10 +1156,6 @@ void SoundEngine::playMusicUpdate()
 		if(m_musicID!=-1)
 		{
 			// start playing it
-
-
-#if ( defined __PS3__  || defined __PSVITA__ || defined __ORBIS__ )
-
 #ifdef __PS3__
 			// 4J-PB - Need to check if we are a patched BD build
 			if(app.GetBootedFromDiscPatch())
@@ -1171,13 +1167,12 @@ void SoundEngine::playMusicUpdate()
 			{
 				sprintf(m_szStreamName,"%s/%s",getUsrDirPath(), m_szMusicPath );
 			}
-#else
+#elif (defined __PSVITA__ || __ORBIS__)
 			sprintf(m_szStreamName,"%s/%s",getUsrDirPath(), m_szMusicPath );
-#endif
-
 #else
 			strcpy((char *)m_szStreamName,m_szMusicPath);
 #endif
+
 			// are we using a mash-up pack?
 			//if(pMinecraft && !pMinecraft->skins->isUsingDefaultSkin() && pMinecraft->skins->getSelected()->hasAudio())
 			if(Minecraft::GetInstance()->skins->getSelected()->hasAudio())
@@ -1251,30 +1246,9 @@ void SoundEngine::playMusicUpdate()
 					m_StreamingAudioInfo.bIs3D=false;
 				}		
 				else if(m_musicID<m_iStream_CD_1)
-				{
-					SetIsPlayingStreamingGameMusic(true);
-					SetIsPlayingStreamingCDMusic(false);
-					m_MusicType=eMusicType_Game;
-					m_StreamingAudioInfo.bIs3D=false;
-					// build the name
-					strcat((char *)m_szStreamName,"music/");
-					strcat((char *)m_szStreamName,m_szStreamFileA[m_musicID]);
-					strcat((char *)m_szStreamName,".binka");
-				}
-
-				else
-				{
-					SetIsPlayingStreamingGameMusic(false);
-					SetIsPlayingStreamingCDMusic(true);
-					m_MusicType=eMusicType_CD;
-					m_StreamingAudioInfo.bIs3D=true;
-					// build the name
-					strcat((char *)m_szStreamName,"cds/");
-					strcat((char *)m_szStreamName,m_szStreamFileA[m_musicID]);
-					strcat((char *)m_szStreamName,".binka");
-				}
 #else
 				if(m_musicID<m_iStream_CD_1)
+#endif
 				{
 					SetIsPlayingStreamingGameMusic(true);
 					SetIsPlayingStreamingCDMusic(false);
@@ -1294,8 +1268,6 @@ void SoundEngine::playMusicUpdate()
 				}
 				strcat((char *)m_szStreamName,m_szStreamFileA[m_musicID]);
 				strcat((char *)m_szStreamName,".binka");
-				
-#endif
 			}
 
 			// 			wstring name = m_szStreamFileA[m_musicID];

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

@@ -62,7 +62,9 @@ foreach ($copy in $fileCopies) {
 }
 
 $deleteDirs = @(
-    "Common\Media\font\RU"
+    "Common\Media\font\RU",
+    "Common\res\TitleUpdate\DLC",
+    "Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -74,13 +76,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"Common\Media\font",
-	"Common\Media\font\*"
+	"Common\Media\font\*",
+    "Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -76,7 +76,9 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS4_GAME\Common\Media\font\RU"
+    "PS4_GAME\Common\Media\font\RU",
+    "PS4_GAME\Common\res\TitleUpdate\DLC",
+    "PS4_GAME\Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -88,13 +90,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"PS4_GAME\Common\Media\font",
-	"PS4_GAME\Common\Media\font\*"
+	"PS4_GAME\Common\Media\font\*",
+    "PS4_GAME\Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -85,7 +85,9 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS3_GAME\USRDIR\Common\Media\font\RU"
+    "PS3_GAME\USRDIR\Common\Media\font\RU",
+    "PS3_GAME\USRDIR\Common\res\TitleUpdate\DLC",
+    "PS3_GAME\USRDIR\Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -97,13 +99,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
     "PS3_GAME\USRDIR\Common\Media\font",
-    "PS3_GAME\USRDIR\Common\Media\font\*"
+    "PS3_GAME\USRDIR\Common\Media\font\*",
+    "PS3_GAME\USRDIR\Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -73,7 +73,9 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PSVITA_GAME\Common\Media\font\RU" 
+    "PSVITA_GAME\Common\Media\font\RU",
+    "PSVITA_GAME\Common\res\TitleUpdate\DLC",
+    "PSVITA_GAME\Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -85,13 +87,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"PSVITA_GAME\Common\Media\font",
-	"PSVITA_GAME\Common\Media\font\*"
+	"PSVITA_GAME\Common\Media\font\*",
+    "PSVITA_GAME\Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -23,7 +23,7 @@ $folderCopies = @(
     @{ Source = "Common\Media\Font";	Dest = "Common\Media\Font" },
     @{ Source = "Windows64Media\DLC";  	Dest = "Windows64Media\DLC" },
 	@{ Source = "Windows64Media\Sound";	Dest = "Windows64Media\Sound" },
-	#@{ Source = "PSVita\Tutorial"; 	Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
+	@{ Source = "Windows64Media\Tutorial"; 	Dest = "Windows64Media\Tutorial" },
 	@{ Source = "Windows64\Miles\lib\redist64"; Dest = "Windows64\redist64" }
 )
 
@@ -60,7 +60,9 @@ foreach ($copy in $fileCopies) {
 }
 
 $deleteDirs = @(
-    "Common\Media\font\RU" #str1k3r - russian font?
+    "Common\Media\font\RU", #str1k3r - russian font?
+    "Common\res\TitleUpdate\DLC",
+    "Common\res\TitleUpdate\Audio"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -72,13 +74,14 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"Common\Media\font",
-	"Common\Media\font\*"
+	"Common\Media\font\*",
+    "Common\res\TitleUpdate\GameRules"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -45,6 +45,18 @@ $fileCopies = @(
 	@{ Source = "Common\Tutorial\Tutorial";     Dest = "Tutorial\Tutorial" }
 )
 
+$delDirs = @(
+    "Common\res\TitleUpdate\GameRules"
+)
+
+foreach ($dir in $delDirs) {
+    $path = Join-Path $OutDir $dir
+    if (Test-Path $path) {
+        Get-ChildItem -Path $path -Recurse -Include *.mcs -File |
+            Remove-Item -Force -ErrorAction SilentlyContinue
+    }
+}
+
 foreach ($copy in $fileCopies) {
     $src = Join-Path $ProjectDir $copy.Source
     $dst = Join-Path $OutDir $copy.Dest

Minecraft.Client/Common/Consoles_App.cpp

@@ -89,8 +89,8 @@ CMinecraftApp::CMinecraftApp()
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
 		m_eTMSAction[i]=eTMSAction_Idle;
-		m_eXuiAction[i]=eAppAction_Idle;
-		m_eXuiActionParam[i] = NULL;
+		m_eUIAction[i]=eAppAction_Idle;
+		m_eUIActionParam[i] = NULL;
 		//m_dwAdditionalModelParts[i] = 0;
 
 		if(FAILED(XUserGetSigninInfo(i,XUSER_GET_SIGNIN_INFO_OFFLINE_XUID_ONLY ,&m_currentSigninInfo[i])))
@@ -106,8 +106,8 @@ CMinecraftApp::CMinecraftApp()
 		m_uiOpacityCountDown[i]=0;
 
 	}
-	m_eGlobalXuiAction=eAppAction_Idle;
-	m_eGlobalXuiServerAction=eXuiServerAction_Idle;
+	m_eGlobalUIAction=eAppAction_Idle;
+	m_eGlobalUIServerAction=eUIServerAction_Idle;
 
 	m_bResourcesLoaded=false;
 	m_bGameStarted=false;
@@ -199,13 +199,13 @@ CMinecraftApp::CMinecraftApp()
 	//	m_uiTransferSlotC=5;
 #endif	
 
-#if (defined _CONTENT_PACAKGE) || (defined _XBOX)
+#if (defined _CONTENT_PACAKGE || _XBOX)
 	m_bUseDPadForDebug = false;
 #else
 	m_bUseDPadForDebug = true;
 #endif
 
-#if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
+#if !(defined _WINDOWS64 || _XBOX)
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
 		m_eOptionsStatusA[i]=C4JStorage::eOptions_Callback_Idle;
@@ -301,25 +301,25 @@ LPCWSTR CMinecraftApp::GetString(int iID)
 	return app.m_stringTable->getString(iID);
 }
 
-void CMinecraftApp::SetAction(int iPad, eXuiAction action, LPVOID param)
+void CMinecraftApp::SetAction(int iPad, eUIAction action, LPVOID param)
 {
-	if( ( m_eXuiAction[iPad] == eAppAction_ReloadTexturePack ) && ( action == eAppAction_EthernetDisconnected ) )
+	if( ( m_eUIAction[iPad] == eAppAction_ReloadTexturePack ) && ( action == eAppAction_EthernetDisconnected ) )
 	{
-		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eXuiAction[iPad], action);
+		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eUIAction[iPad], action);
 	}
-	else if( ( m_eXuiAction[iPad] == eAppAction_ReloadTexturePack ) && ( action == eAppAction_ExitWorld ) )
+	else if( ( m_eUIAction[iPad] == eAppAction_ReloadTexturePack ) && ( action == eAppAction_ExitWorld ) )
 	{
-		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eXuiAction[iPad], action);
+		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eUIAction[iPad], action);
 	}
-	else if(m_eXuiAction[iPad] == eAppAction_ExitWorldCapturedThumbnail && action != eAppAction_Idle)
+	else if(m_eUIAction[iPad] == eAppAction_ExitWorldCapturedThumbnail && action != eAppAction_Idle)
 	{
-		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eXuiAction[iPad], action);
+		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eUIAction[iPad], action);
 	}
 	else
 	{
-		app.DebugPrintf("Changing App action for pad %d from %d to %d\n", iPad, m_eXuiAction[iPad], action);
-		m_eXuiAction[iPad]=action;
-		m_eXuiActionParam[iPad] = param;
+		app.DebugPrintf("Changing App action for pad %d from %d to %d\n", iPad, m_eUIAction[iPad], action);
+		m_eUIAction[iPad]=action;
+		m_eUIActionParam[iPad] = param;
 	}
 }	
 
@@ -344,30 +344,6 @@ void CMinecraftApp::SetAppPaused(bool val)
 	m_bIsAppPaused = val;
 }
 
-void CMinecraftApp::HandleButtonPresses()
-{
-	for(int i=0;i<4;i++)
-	{
-		HandleButtonPresses(i);
-	}
-}
-
-void CMinecraftApp::HandleButtonPresses(int iPad)
-{
-
-	// 		// test an update of the profile data
-	// 		void *pData=ProfileManager.GetGameDefinedProfileData(iPad);
-	// 
-	// 		unsigned char *pchData= (unsigned char *)pData;
-	// 		int iCount=0;
-	// 		for(int i=0;i<GAME_DEFINED_PROFILE_DATA_BYTES;i++)
-	// 		{
-	// 			pchData[i]=0xBC;
-	// 			//if(iCount==255) iCount = 0;
-	// 		}
-	//  		ProfileManager.WriteToProfile(iPad,true);
-}
-
 bool CMinecraftApp::LoadInventoryMenu(int iPad,shared_ptr<LocalPlayer> player,bool bNavigateBack)
 {
 	bool success = true;
@@ -753,7 +729,7 @@ void CMinecraftApp::InitGameSettings()
 {
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
-#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
+#if !(defined _WINDOWS64 || _XBOX)
 		GameSettingsA[i]=(GAME_SETTINGS *)StorageManager.GetGameDefinedProfileData(i);
 #else
 		GameSettingsA[i]=(GAME_SETTINGS *)ProfileManager.GetGameDefinedProfileData(i);
@@ -764,21 +740,20 @@ void CMinecraftApp::InitGameSettings()
 		//SetDefaultGameSettings(i); - done on a callback from the profile manager
 
 		// 4J-PB - adding in for Windows & PS3 to set the defaults for the joypad
-#if defined _WINDOWS64
+#ifdef _WINDOWS64
 		C_4JProfile::PROFILESETTINGS *pProfileSettings=ProfileManager.GetDashboardProfileSettings(i);
 		SetDefaultOptions(pProfileSettings,i);
 		ProfileManager.LoadSettings(GameSettingsA[i], sizeof(GAME_SETTINGS));
 		ApplyGameSettingsChanged(i);
-#elif defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__
+#elif !defined(_XBOX)
 		C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
 		// 4J-PB - don't cause an options write to happen here
 		SetDefaultOptions(pProfileSettings,i,false);
-
 #endif
 	}
 }
 
-#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
+#if !(defined _WINDOWS64 || _XBOX)
 int CMinecraftApp::SetDefaultOptions(C4JStorage::PROFILESETTINGS *pSettings,const int iPad,bool bWriteProfile)
 #else
 int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,const int iPad)
@@ -871,7 +846,7 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
 
 	//#endif
 
-#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
+#if !(defined _WINDOWS64 || _XBOX)
 	GameSettingsA[iPad]->bSettingsChanged=bWriteProfile;
 #endif
 
@@ -899,8 +874,7 @@ int CMinecraftApp::DefaultOptionsCallback(LPVOID pParam,C_4JProfile::PROFILESETT
 	return 0;
 }
 
-#if ( defined  __PS3__  || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
-
+#if !(defined _WINDOWS64 || _XBOX)
 wstring CMinecraftApp::toStringOptionsStatus(const C4JStorage::eOptionsCallback &eStatus)
 {
 #ifndef _CONTENT_PACKAGE
@@ -1227,9 +1201,6 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
 		{	
 			// This might be from a version during testing of new profile updates
 			app.DebugPrintf("Don't know what to do with this profile version!\n");
-#ifndef _CONTENT_PACKAGE
-			//		__debugbreak();
-#endif
 
 			GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
 			pGameSettings->ucMenuSensitivity=100; //eGameSetting_Sensitivity_InMenu
@@ -1352,7 +1323,7 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 			// Game Host only (and for now we can't change the diff while in game, so this shouldn't happen)
 			if(bInGame && g_NetworkManager.IsHost() && (iPad==ProfileManager.GetPrimaryPad()))
 			{
-				app.SetXuiServerAction(iPad,eXuiServerAction_ServerSettingChanged_Difficulty);
+				app.SetUIServerAction(iPad,eUIServerAction_ServerSettingChanged_Difficulty);
 			}
 		}
 		else
@@ -1418,7 +1389,7 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 			{
 				// Update the Game Host setting if you are the host and you are in-game
 				app.SetGameHostOption(eGameHostOption_Gamertags,((GameSettingsA[iPad]->usBitmaskValues&0x0008)!=0)?1:0);
-				app.SetXuiServerAction(iPad,eXuiServerAction_ServerSettingChanged_Gamertags);
+				app.SetUIServerAction(iPad,eUIServerAction_ServerSettingChanged_Gamertags);
 
 				PlayerList *players = MinecraftServer::getInstance()->getPlayerList();
 				for(AUTO_VAR(it3, players->players.begin()); it3 != players->players.end(); ++it3)
@@ -1494,7 +1465,7 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 			{
 				// Update the Game Host setting if you are the host and you are in-game
 				app.SetGameHostOption(eGameHostOption_BedrockFog,GetGameSettings(iPad,eGameSetting_BedrockFog)?1:0);
-				app.SetXuiServerAction(iPad,eXuiServerAction_ServerSettingChanged_BedrockFog);
+				app.SetUIServerAction(iPad,eUIServerAction_ServerSettingChanged_BedrockFog);
 			}
 		}
 		break;
@@ -2588,21 +2559,21 @@ int CMinecraftApp::DisplaySavingMessage(void *pParam, C4JStorage::ESavingMessage
 
 void CMinecraftApp::SetActionConfirmed(LPVOID param)
 {
-	XuiActionParam *actionInfo = (XuiActionParam *)param;
+	UIActionParam *actionInfo = (UIActionParam *)param;
 	app.SetAction(actionInfo->iPad, actionInfo->action);
 }
 
 
-void CMinecraftApp::HandleXuiActions(void)
+void CMinecraftApp::HandleUIActions(void)
 {
-	eXuiAction eAction;
+	eUIAction eAction;
 	eTMSAction eTMS;
 	LPVOID param;
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> player;
 
 	// are there any global actions to deal with?
-	eAction = app.GetGlobalXuiAction();
+	eAction = app.GetGlobalUIAction();
 	if(eAction!=eAppAction_Idle)
 	{
 		switch(eAction)
@@ -2613,7 +2584,7 @@ void CMinecraftApp::HandleXuiActions(void)
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_CONFIRM_OK;
 				C4JStorage::EMessageResult result = ui.RequestErrorMessage( IDS_CANT_PLACE_NEAR_SPAWN_TITLE, IDS_CANT_PLACE_NEAR_SPAWN_TEXT, uiIDA,1,XUSER_INDEX_ANY);
-				if(result != C4JStorage::EMessage_Busy) SetGlobalXuiAction(eAppAction_Idle);
+				if(result != C4JStorage::EMessage_Busy) SetGlobalUIAction(eAppAction_Idle);
 
 			}
 			break;
@@ -2625,8 +2596,8 @@ void CMinecraftApp::HandleXuiActions(void)
 	// are there any app actions to deal with?
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
-		eAction = app.GetXuiAction(i);
-		param = m_eXuiActionParam[i];
+		eAction = app.GetUIAction(i);
+		param = m_eUIActionParam[i];
 
 		if(eAction!=eAppAction_Idle)
 		{			
@@ -2661,7 +2632,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					bool bKeepHiding = false;
 					for(int j=0; j < XUSER_MAX_COUNT;++j)
 					{
-						if(app.GetXuiAction(j) == eAppAction_SocialPostScreenshot)
+						if(app.GetUIAction(j) == eAppAction_SocialPostScreenshot)
 						{
 							bKeepHiding = true;
 							break;
@@ -2783,7 +2754,7 @@ void CMinecraftApp::HandleXuiActions(void)
 					SetAction(i,eAppAction_Idle);
 
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
-					app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_AutoSaveGame);
+					app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_AutoSaveGame);
 
 					if(app.GetGameHostOption(eGameHostOption_DisableSaving)) StorageManager.SetSaveDisabled(true);
 #else
@@ -3265,7 +3236,7 @@ void CMinecraftApp::HandleXuiActions(void)
 						pMinecraft->localplayers[i]->respawn();
 
 						// If the respawn requires a dimension change then the action will have changed
-						//if(app.GetXuiAction(i) == eAppAction_Respawn)
+						//if(app.GetUIAction(i) == eAppAction_Respawn)
 						//{
 						//	SetAction(i,eAppAction_Idle);
 						//	CloseXuiScenes(i);
@@ -6459,7 +6430,7 @@ wstring CMinecraftApp::FormatHTMLString(int iPad, const wstring &desc, int shado
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_DOWN*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_DOWN		) );
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_RIGHT*}",	GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_RIGHT		) );	
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_LEFT*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_LEFT		) );
-#if !(defined __ORBIS__ || __PS3__)
+#if !(defined __ORBIS__ || __PS3__ || _XBOX)
 	text = replaceAll(text, L"{*CONTROLLER_VK_START*}",			GetVKReplacement(VK_PAD_START		) );
 	text = replaceAll(text, L"{*CONTROLLER_VK_BACK*}",			GetVKReplacement(VK_PAD_BACK		) );
 #endif
@@ -7365,7 +7336,7 @@ void CMinecraftApp::EnterSaveNotificationSection()
 
 		if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
 		{
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
+			app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)TRUE);
 		}
 	}
 	}
@@ -7383,7 +7354,7 @@ void CMinecraftApp::LeaveSaveNotificationSection()
 
 		if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
 		{
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+			app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
 		}
 	}
 	}
@@ -7412,14 +7383,14 @@ int CMinecraftApp::RemoteSaveThreadProc( void* lpParameter )
 	pMinecraft->progressRenderer->progressStage( -1 );
 	pMinecraft->progressRenderer->progressStagePercentage(0);
 
-	while( !app.GetGameStarted() && app.GetXuiAction( ProfileManager.GetPrimaryPad() ) == eAppAction_WaitRemoteServerSaveComplete )
+	while( !app.GetGameStarted() && app.GetUIAction( ProfileManager.GetPrimaryPad() ) == eAppAction_WaitRemoteServerSaveComplete )
 	{
 		// Tick all the games connections
 		pMinecraft->tickAllConnections();
 		Sleep( 100 );
 	}
 
-	if( app.GetXuiAction( ProfileManager.GetPrimaryPad() ) != eAppAction_WaitRemoteServerSaveComplete )
+	if( app.GetUIAction( ProfileManager.GetPrimaryPad() ) != eAppAction_WaitRemoteServerSaveComplete )
 	{
 		// Something cancelled us?
 		return ERROR_CANCELLED;

Minecraft.Client/Common/Consoles_App.h

@@ -114,7 +114,6 @@ public:
 	static const int USER_SR = 6;
 	static const int USER_UI = 7; // 4J Stu - This also makes it appear on the UI console
 
-	void			HandleButtonPresses();
 	bool			IntroRunning()																									{ return m_bIntroRunning;}
 	void			SetIntroRunning(bool bSet)																						{m_bIntroRunning=bSet;}
 #ifdef _CONTENT_PACKAGE
@@ -160,17 +159,17 @@ public:
 	eGameMode		GetGameMode()																										{ return m_eGameMode;}
 	void			SetGameMode(eGameMode eMode)																						{ m_eGameMode=eMode;}
 
-	eXuiAction      GetGlobalXuiAction()																								{return m_eGlobalXuiAction;}
-	void			SetGlobalXuiAction(eXuiAction action)																				{m_eGlobalXuiAction=action;}
-	eXuiAction      GetXuiAction(int iPad)																								{return m_eXuiAction[iPad];}
-	void			SetAction(int iPad, eXuiAction action, LPVOID param = NULL);
+	eUIAction       GetGlobalUIAction()																								{return m_eGlobalUIAction;}
+	void			SetGlobalUIAction(eUIAction action)																				{m_eGlobalUIAction=action;}
+	eUIAction       GetUIAction(int iPad)																								{return m_eUIAction[iPad];}
+	void			SetAction(int iPad, eUIAction action, LPVOID param = NULL);
 	void			SetTMSAction(int iPad, eTMSAction action)																			{m_eTMSAction[iPad]=action; }	
 	eTMSAction      GetTMSAction(int iPad)																								{return m_eTMSAction[iPad];}
-	eXuiServerAction GetXuiServerAction(int iPad)																						{return m_eXuiServerAction[iPad];}
-	LPVOID			GetXuiServerActionParam(int iPad)																					{return m_eXuiServerActionParam[iPad];}
-	void			SetXuiServerAction(int iPad, eXuiServerAction action, LPVOID param = NULL)											{m_eXuiServerAction[iPad]=action; m_eXuiServerActionParam[iPad] = param;}
-	eXuiServerAction GetGlobalXuiServerAction()																							{return m_eGlobalXuiServerAction;}
-	void			SetGlobalXuiServerAction(eXuiServerAction action)																			{m_eGlobalXuiServerAction=action;}
+	eUIServerAction GetUIServerAction(int iPad)																						{return m_eUIServerAction[iPad];}
+	LPVOID			GetUIServerActionParam(int iPad)																					{return m_eUIServerActionParam[iPad];}
+	void			SetUIServerAction(int iPad, eUIServerAction action, LPVOID param = NULL)											{m_eUIServerAction[iPad]=action; m_eUIServerActionParam[iPad] = param;}
+	eUIServerAction GetGlobalUIServerAction()																							{return m_eGlobalUIServerAction;}
+	void			SetGlobalUIServerAction(eUIServerAction action)																			{m_eGlobalUIServerAction=action;}
 
 	DisconnectPacket::eDisconnectReason	GetDisconnectReason()																			{ return m_disconnectReason; }
 	void			SetDisconnectReason(DisconnectPacket::eDisconnectReason bVal)														{ m_disconnectReason = bVal; }
@@ -184,7 +183,7 @@ public:
 
 	// 4J Stu - Added so that we can call this when a confirmation box is selected
 	static void		SetActionConfirmed(LPVOID param);
-	void			HandleXuiActions(void);
+	void			HandleUIActions(void);
 
 	// 4J Stu - Functions used for Minecon and other promo work
 	bool			GetLoadSavesFromFolderEnabled()																						{ return m_bLoadSavesFromFolderEnabled; }
@@ -446,8 +445,6 @@ private:
 
 	VBANNEDLIST *m_vBannedListA[XUSER_MAX_COUNT]; 
 
-	void HandleButtonPresses(int iPad);
-
 	bool m_bResourcesLoaded;
 
 	// Global string table for this application.
@@ -514,13 +511,13 @@ private:
 
 	// To avoid problems with threads being kicked off from xuis that alter things that may be in progress within the run_middle,
 	// we'll action these at the end of the game loop
-	eXuiAction m_eXuiAction[XUSER_MAX_COUNT];
+	eUIAction m_eUIAction[XUSER_MAX_COUNT];
 	eTMSAction m_eTMSAction[XUSER_MAX_COUNT];
-	LPVOID m_eXuiActionParam[XUSER_MAX_COUNT];
-	eXuiAction m_eGlobalXuiAction;	
-	eXuiServerAction m_eXuiServerAction[XUSER_MAX_COUNT];
-	LPVOID m_eXuiServerActionParam[XUSER_MAX_COUNT];
-	eXuiServerAction m_eGlobalXuiServerAction;
+	LPVOID m_eUIActionParam[XUSER_MAX_COUNT];
+	eUIAction m_eGlobalUIAction;	
+	eUIServerAction m_eUIServerAction[XUSER_MAX_COUNT];
+	LPVOID m_eUIServerActionParam[XUSER_MAX_COUNT];
+	eUIServerAction m_eGlobalUIServerAction;
 
 	bool m_bLiveLinkRequired;
 

Minecraft.Client/Common/Network/GameNetworkManager.cpp

@@ -1173,11 +1173,11 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
 	pMinecraft->progressRenderer->progressStage( IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME );
 #endif
 
-	while( app.GetXuiServerAction(ProfileManager.GetPrimaryPad() ) != eXuiServerAction_Idle && !MinecraftServer::serverHalted() )
+	while( app.GetUIServerAction(ProfileManager.GetPrimaryPad() ) != eUIServerAction_Idle && !MinecraftServer::serverHalted() )
 	{
 		Sleep(10);
 	}
-	app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
+	app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)TRUE);
 
 	// wait for the server to be in a non-ticking state
 	pServer->m_serverPausedEvent->WaitForSignal(INFINITE);
@@ -1333,7 +1333,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
 
 	// Start the game again
 	app.SetGameStarted(true);				
-	app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+	app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
 	app.SetChangingSessionType(false);
 	app.SetReallyChangingSessionType(false);
 

Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp

@@ -1309,7 +1309,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 		break;
 #endif
 	case ACTION_MENU_A:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(!bRepeat)

Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp

@@ -192,7 +192,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 		bHandled = true;
 		break;
 	case ACTION_MENU_A:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		// Do some crafting!

Minecraft.Client/Common/UI/IUIScene_HUD.cpp

@@ -170,7 +170,7 @@ void IUIScene_HUD::updateFrameTick()
 	}
 	SetOpacity(fVal);
 
-	bool bDisplayGui=app.GetGameStarted() && !ui.GetMenuDisplayed(iPad) && !(app.GetXuiAction(iPad)==eAppAction_AutosaveSaveGameCapturedThumbnail) && app.GetGameSettings(iPad,eGameSetting_DisplayHUD)!=0;
+	bool bDisplayGui=app.GetGameStarted() && !ui.GetMenuDisplayed(iPad) && !(app.GetUIAction(iPad)==eAppAction_AutosaveSaveGameCapturedThumbnail) && app.GetGameSettings(iPad,eGameSetting_DisplayHUD)!=0;
 	if(bDisplayGui && pMinecraft->localplayers[iPad] != NULL)
 	{
 		SetVisible(true);			

Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp

@@ -354,11 +354,11 @@ int IUIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
 	bool bAutosave=(bool)lpParameter;
 	if(bAutosave)
 	{
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_AutoSaveGame);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_AutoSaveGame);
 	}
 	else
 	{
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SaveGame);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_SaveGame);
 	}
 
 	// Share AABB & Vec3 pools with default (main thread) - should be ok as long as we don't tick the main thread whilst this thread is running
@@ -374,7 +374,7 @@ int IUIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
 	{	
 		app.SetGameStarted(false);
 
-		while( app.GetXuiServerAction(ProfileManager.GetPrimaryPad() ) != eXuiServerAction_Idle && !MinecraftServer::serverHalted() )
+		while( app.GetUIServerAction(ProfileManager.GetPrimaryPad() ) != eUIServerAction_Idle && !MinecraftServer::serverHalted() )
 		{
 			Sleep(10);
 		}

Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp

@@ -59,7 +59,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 		handled = true;
 		break;
 	case ACTION_MENU_A:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(!m_activeOffers.empty())

Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp

@@ -64,16 +64,19 @@ F64 UIComponent_Tooltips::getSafeZoneHalfWidth()
 	float safeWidth = 0.0f;
 
 #ifndef __PSVITA__
-	// 85% safezone for tooltips in either SD mode
-	if( !RenderManager.IsHiDef() )
+	if (!(width >= 960.0f && width < 1280.0f))
 	{
-		// 85% safezone
-		safeWidth = m_movieWidth * (0.15f / 2);
-	}
-	else
-	{
-		// 90% safezone
-		safeWidth = width * (0.1f / 2);
+		// 85% safezone for tooltips in either SD mode
+		if( !RenderManager.IsHiDef() )
+		{
+			// 85% safezone
+			safeWidth = m_movieWidth * (0.15f / 2);
+		}
+		else
+		{
+			// 90% safezone
+			safeWidth = width * (0.1f / 2);
+		}
 	}
 #endif
 	return safeWidth;

Minecraft.Client/Common/UI/UIController.cpp

@@ -35,15 +35,16 @@
 #ifdef __ORBIS__
 #include "Orbis\Iggy\include\iggyperfmon.h"
 #include "Orbis\Iggy\include\iggyperfmon_orbis.h"
-#elif defined _DURANGO
+#elif _DURANGO
 #include "Durango\Iggy\include\iggyperfmon.h"
-#elif defined __PS3__
+#elif __PS3__
 #include "PS3\Iggy\include\iggyperfmon.h"
 #include "PS3\Iggy\include\iggyperfmon_ps3.h"
-#elif defined __PSVITA__
+#elif __PSVITA__
 #include "PSVita\Iggy\include\iggyperfmon.h"
 #include "PSVita\Iggy\include\iggyperfmon_psp2.h"
-#elif defined __WINDOWS64
+#elif _WINDOWS64
+//str1k3r - IggyPerfmon is broken on windows64 as we dont have the DLL
 #include "Windows64\Iggy\include\iggyperfmon.h"
 #endif
 
@@ -184,17 +185,6 @@ UIController::UIController()
 	InitializeCriticalSection(&m_Allocatorlock);
 #endif
 
-	// 4J Stu - This is a bit of a hack until we change the Minecraft initialisation to store the proper screen size for other platforms
-#if defined _DURANGO || defined __ORBIS__
-	m_fScreenWidth = 1920.0f;
-	m_fScreenHeight = 1080.0f;
-	m_bScreenWidthSetup = true;
-#else
-	m_fScreenWidth = 1280.0f;
-	m_fScreenHeight = 720.0f;
-	m_bScreenWidthSetup = false;
-#endif
-
 	for(unsigned int i = 0; i < eLibrary_Count; ++i)
 	{
 		m_iggyLibraries[i] = IGGY_INVALID_LIBRARY;
@@ -257,6 +247,7 @@ void UIController::SetSystemUIShowing(LPVOID lpParam,bool bVal)
 // SETUP
 void UIController::preInit(S32 width, S32 height)
 {
+	//str1k3r - 4J previously hardcoded this in UIController(), this is already set per platform so just use this :3
 	m_fScreenWidth = width;
 	m_fScreenHeight = height;
 	m_bScreenWidthSetup = true;
@@ -500,14 +491,14 @@ void UIController::tick()
 	}
 
 #ifdef _WINDOWS64
-	GetControllerType();
+	GetControllerSwf();
 #endif
 }
 
 //str1k3r - PS3 & PS4 icons are broken in some spots, therefore they wont be included yet
 #ifdef _WINDOWS64
 //str1k3r - this is what actually does all the autoswitching
-void UIController::GetControllerType()
+void UIController::GetControllerSwf()
 {
 	EControllerType ControllerType = InputManager.GetControllerType(0);
 	wstring controlTooltipsPath = L"";
@@ -521,7 +512,6 @@ void UIController::GetControllerType()
 			case EControllerType_Xbox360:
 				controlTooltipsPath = (ui.getScreenWidth() >= 1920) ? L"ControlTooltips\\HD\\XboxHDControls.swf" : L"ControlTooltips\\XboxControls.swf";
 				break;
-			case EControllerType_Default:
 			case EControllerType_XboxOne:
 				controlTooltipsPath = (ui.getScreenWidth() >= 1920) ? L"ControlTooltips\\HD\\DurangoHDControls.swf" : L"ControlTooltips\\DurangoControls.swf";
 				break;
@@ -539,6 +529,9 @@ void UIController::GetControllerType()
 				controlTooltipsPath = (ui.getScreenWidth() >= 1920) ? L"ControlTooltips\\HD\\SwitchHDControls.swf" : L"ControlTooltips\\SwitchControls.swf";
 				break;
 			*/
+			case EControllerType_Default: //str1k3r - this is going to get a custom swf soon
+				controlTooltipsPath = (ui.getScreenWidth() >= 1920) ? L"ControlTooltips\\HD\\DurangoHDControls.swf" : L"ControlTooltips\\DurangoControls.swf";
+				break;
 			default:
 				controlTooltipsPath = (ui.getScreenWidth() >= 1920) ? L"ControlTooltips\\HD\\Windows64HDControls.swf" : L"ControlTooltips\\Windows64Controls.swf";
 				break;
@@ -569,7 +562,6 @@ wstring UIController::GetTooltipSkinPath()
 	{
 		case EControllerType_Xbox360:
 			return ui.getScreenWidth() >= 1920 ? L"ControlTooltips\\HD\\XboxHDControls.swf" : L"ControlTooltips\\XboxControls.swf";
-		case EControllerType_Default:
 		case EControllerType_XboxOne:
 			return ui.getScreenWidth() >= 1920 ? L"ControlTooltips\\HD\\DurangoHDControls.swf" : L"ControlTooltips\\DurangoControls.swf";
 		/*
@@ -582,6 +574,8 @@ wstring UIController::GetTooltipSkinPath()
 		case EControllerType_Switch:
 			return ui.getScreenWidth() >= 1920 ? L"ControlTooltips\\HD\\SwitchHDControls.swf" : L"ControlTooltips\\SwitchControls.swf";
 		*/
+		case EControllerType_Default:
+			return ui.getScreenWidth() >= 1920 ? L"ControlTooltips\\HD\\DurangoHDControls.swf" : L"ControlTooltips\\DurangoControls.swf";
 		default:
 			return ui.getScreenWidth() >= 1920 ? L"ControlTooltips\\HD\\Windows64HDControls.swf" : L"ControlTooltips\\Windows64Controls.swf";
 			break;
@@ -601,12 +595,12 @@ void UIController::loadSkins()
 #elif defined __PSVITA__
 	platformSkinPath = L"skinVita.swf";
 #elif defined _WINDOWS64
-	if(m_fScreenWidth >= 1920.0f)
+	if(ui.getScreenWidth() >= 1920.0f)
 	{
 		tooltipsSkinPath = GetTooltipSkinPath();
 		platformSkinPath = L"skinHDWin.swf";
 	}
-	else if (m_fScreenWidth >= 960.0f && m_fScreenWidth < 1280.0f) //str1k3r - we need to check this to make sure we dont load the vita skin on 720p
+	else if (ui.getScreenWidth() >= 960.0f && ui.getScreenWidth() < 1280.0f) //str1k3r - we need to check this to make sure we dont load the vita skin on 720p
 	{
 		tooltipsSkinPath = GetTooltipSkinPath();
 		platformSkinPath = L"skinWinVita.swf";	
@@ -639,7 +633,7 @@ void UIController::loadSkins()
 
 	// str1k3r - Fixes 720p/480p Crashes on Windows64, also allows this to be used on 1080p consoles instead of just Windows64
 	// This also cleans up some 4J code and turns 3 if statements into 1.
-	if (m_fScreenWidth >= 1920.0f)
+	if (ui.getScreenWidth() >= 1920.0f)
 	{
 		m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskinHD.swf");
 		m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
@@ -929,7 +923,8 @@ void UIController::handleInput()
 
 		if(ProfileManager.GetLockedProfile() >= 0 && !InputManager.IsPadLocked( ProfileManager.GetLockedProfile() ) && firstUnfocussedUnhandledPad >= 0)
 		{
-			ProfileManager.RequestSignInUI(false, false, false, false, true, NULL, NULL, firstUnfocussedUnhandledPad );
+			//ProfileManager.RequestSignInUI(false, false, false, false, true, NULL, NULL, firstUnfocussedUnhandledPad );
+			ProfileManager.RequestSignInUI(false, false, false, false, true, static_cast<int (*)(LPVOID, const bool, const int)>(NULL), NULL, firstUnfocussedUnhandledPad );
 		}
 	}
 #endif
@@ -2624,7 +2619,7 @@ void UIController::ClearPressStart()
 
 C4JStorage::EMessageResult UIController::RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString)
 {
-#ifndef __ORBIS__
+#if !(defined __ORBIS__ || _XBOX_ONE)
 	return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pwchFormatString, 0, false);
 #else
 	return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, NULL, pwchFormatString, 0, false);
@@ -2633,14 +2628,14 @@ C4JStorage::EMessageResult UIController::RequestAlertMessage(UINT uiTitle, UINT
 
 C4JStorage::EMessageResult UIController::RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString)
 {
-#ifndef __ORBIS__
+#if !(defined __ORBIS__ || _XBOX_ONE)
 	return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pwchFormatString, 0, true);
 #else
 	return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, NULL, pwchFormatString, 0, true);
 #endif
 }
 
-#ifndef __ORBIS__
+#if !(defined __ORBIS__ || _XBOX_ONE)
 C4JStorage::EMessageResult UIController::RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
 														   int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError)
 #else

Minecraft.Client/Common/UI/UIController.h

@@ -204,7 +204,7 @@ public:
 	virtual void tick();
 
 private:
-	void GetControllerType();
+	void GetControllerSwf();
 	wstring GetTooltipSkinPath();
 	void loadSkins();
 	IggyLibrary loadSkin(const wstring &skinPath, const wstring &skinName);
@@ -236,6 +236,8 @@ public:
 	// RENDERING
 	float getScreenWidth() { return m_fScreenWidth; }
 	float getScreenHeight() { return m_fScreenHeight; }
+	void setScreenWidth(float w) { m_fScreenWidth = w; }
+	void setScreenHeight(float h) { m_fScreenHeight = h; }
 
 	virtual void render() = 0;
 	void getRenderDimensions(C4JRender::eViewportType viewport, S32 &width, S32 &height);
@@ -363,7 +365,7 @@ public:
 
 	virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
 	virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
-#ifndef __ORBIS__
+#if !(defined __ORBIS__ || _XBOX_ONE)
 private:
 	virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,
 						int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError);

Minecraft.Client/Common/UI/UIScene.cpp

@@ -125,15 +125,18 @@ F64 UIScene::getSafeZoneHalfHeight()
 	float safeHeight = 0.0f;
 
 #ifndef __PSVITA__
-	if( !RenderManager.IsHiDef() && RenderManager.IsWidescreen() )
+	if (!(height >= 544.0f && height < 720.0f))
 	{
-		// 90% safezone
-		safeHeight = height * (0.15f / 2);
-	}
-	else
-	{
-		// 90% safezone
-		safeHeight = height * (0.1f / 2);
+		if( !RenderManager.IsHiDef() && RenderManager.IsWidescreen() )
+		{
+			// 90% safezone
+			safeHeight = height * (0.15f / 2);
+		}
+		else
+		{
+			// 90% safezone
+			safeHeight = height * (0.1f / 2);
+		}
 	}
 #endif
 	return safeHeight;
@@ -145,15 +148,18 @@ F64 UIScene::getSafeZoneHalfWidth()
 
 	float safeWidth = 0.0f;
 #ifndef __PSVITA__
-	if( !RenderManager.IsHiDef() && RenderManager.IsWidescreen() )
+	if (!(width >= 960.0f && width < 1280.0f))
 	{
-		// 85% safezone
-		safeWidth = width * (0.15f / 2);
-	}
-	else
-	{
-		// 90% safezone
-		safeWidth = width * (0.1f / 2);
+		if( !RenderManager.IsHiDef() && RenderManager.IsWidescreen() )
+		{
+			// 85% safezone
+			safeWidth = width * (0.15f / 2);
+		}
+		else
+		{
+			// 90% safezone
+			safeWidth = width * (0.1f / 2);
+		}
 	}
 #endif
 	return safeWidth;
@@ -329,20 +335,20 @@ void UIScene::loadMovie()
 #endif
 			app.FatalLoadError();
 #else
-			app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on 480\n", moviePath.c_str());
+			app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on Vita\n", moviePath.c_str());
 
 			moviePath = getMoviePath();
-			moviePath.append(L"480.swf");
-			m_loadedResolution = eSceneResolution_480;
+			moviePath.append(L"Vita.swf");
+			m_loadedResolution = eSceneResolution_544;
 
 			//str1k3r - while 480 & Vita share basically all the same skins its just a extra fallback :D
 			if(!app.hasArchiveFile(moviePath))
 			{
-				app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on Vita\n", moviePath.c_str());
+				app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on 480\n", moviePath.c_str());
 
 				moviePath = getMoviePath();
-				moviePath.append(L"Vita.swf");
-				m_loadedResolution = eSceneResolution_544;
+				moviePath.append(L"480.swf");
+				m_loadedResolution = eSceneResolution_480;
 
 				if(!app.hasArchiveFile(moviePath))
 				{
@@ -940,7 +946,7 @@ int UIScene::convertGameActionToIggyKeycode(int action)
 	int keycode = -1;
 	switch(action)
 	{
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_A:

Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp

@@ -12,7 +12,7 @@ UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(int iPad, UILayer *
 	// in this scene, we override the press sound with our own for crafting success or fail
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,true);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_X,true);
@@ -51,7 +51,7 @@ void UIScene_AbstractContainerMenu::handleDestroy()
 
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,false);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_X,false);

Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp

@@ -224,7 +224,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
 // 			}
 // 			break;
 		case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 		case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 			if(pressed)

Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp

@@ -159,7 +159,7 @@ void UIScene_ControlsMenu::handleInput(int iPad, int key, bool repeat, bool pres
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if( pressed )

Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp

@@ -163,7 +163,7 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void *_initData, UILayer *p
 	// in this scene, we override the press sound with our own for crafting success or fail
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,true);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,true);
@@ -204,7 +204,7 @@ void UIScene_CraftingMenu::handleDestroy()
 
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,false);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,false);

Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp

@@ -367,7 +367,7 @@ void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool p
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 

Minecraft.Client/Common/UI/UIScene_Credits.cpp

@@ -648,7 +648,7 @@ void UIScene_Credits::handleInput(int iPad, int key, bool repeat, bool pressed,
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp

@@ -103,7 +103,7 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp

@@ -149,7 +149,7 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp

@@ -68,7 +68,7 @@ void UIScene_DeathMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 		handled = true;
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp

@@ -100,7 +100,7 @@ void UIScene_DebugCreateSchematic::handlePress(F64 controlId, F64 childId)
 			else if(m_data->endZ < 0 && m_data->endZ%2 ==0)
 				m_data->endZ+=1;
 
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_ExportSchematic, (void *)m_data);
+			app.SetUIServerAction(ProfileManager.GetPrimaryPad(), eUIServerAction_ExportSchematic, (void *)m_data);
 
 			navigateBack();
 		}

Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp

@@ -167,7 +167,7 @@ void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
 		{
 			app.DebugPrintf("UIScene_DebugOverlay::handlePress for itemsList: %f\n", childId);
 			int id = childId;
-			//app.SetXuiServerAction(m_iPad, eXuiServerAction_DropItem, (void *)m_itemIds[id]);
+			//app.SetUIServerAction(m_iPad, eUIServerAction_DropItem, (void *)m_itemIds[id]);
 			ClientConnection *conn = Minecraft::GetInstance()->getConnection(ProfileManager.GetPrimaryPad());
 			conn->send( GiveItemCommand::preparePacket(dynamic_pointer_cast<Player>(Minecraft::GetInstance()->localplayers[ProfileManager.GetPrimaryPad()]), m_itemIds[id]) );
 		}
@@ -177,7 +177,7 @@ void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
 			int id = childId;
 			if(id<m_mobFactories.size())
 			{			
-				app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SpawnMob,(void *)m_mobFactories[id]);
+				app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_SpawnMob,(void *)m_mobFactories[id]);
 			}
 		}
 		break;
@@ -204,13 +204,13 @@ void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
 		break;
 	case eControl_Rain:
 		{
-			//app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_ToggleRain);
+			//app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_ToggleRain);
 			ClientConnection *conn = Minecraft::GetInstance()->getConnection(ProfileManager.GetPrimaryPad());
 			conn->send( ToggleDownfallCommand::preparePacket() );
 		}
 		break;
 	case eControl_Thunder:
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_ToggleThunder);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_ToggleThunder);
 		break;
 	case eControl_ResetTutorial:
 		Tutorial::debugResetPlayerSavedProgress( ProfileManager.GetPrimaryPad() );

Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp

@@ -91,8 +91,8 @@ void UIScene_DebugSetCamera::handlePress(F64 controlId, F64 childId)
 	switch((int)controlId)
 	{
 	case eControl_Teleport:
-		app.SetXuiServerAction(	ProfileManager.GetPrimaryPad(),
-			eXuiServerAction_SetCameraLocation, 
+		app.SetUIServerAction(	ProfileManager.GetPrimaryPad(),
+			eUIServerAction_SetCameraLocation, 
 			(void *)currentPosition);
 		break;
 	case eControl_CamX:

Minecraft.Client/Common/UI/UIScene_EULA.cpp

@@ -106,7 +106,7 @@ void UIScene_EULA::handleInput(int iPad, int key, bool repeat, bool pressed, boo
 {
 	if(m_bIgnoreInput) return;
 
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	// ignore all players except player 0 - it's their profile that is currently being used
 	if(iPad!=0) return;
 #endif

Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp

@@ -276,7 +276,7 @@ void UIScene_FullscreenProgress::handleInput(int iPad, int key, bool repeat, boo
 		switch(key)
 		{
 		case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 		case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 			if(pressed)

Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp

@@ -189,7 +189,7 @@ void UIScene_HelpAndOptionsMenu::handleInput(int iPad, int key, bool repeat, boo
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	//CD - Added for audio

Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp

@@ -210,7 +210,7 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
 		}
 		break;
 	case ACTION_MENU_A:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(pressed)

Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp

@@ -175,7 +175,7 @@ void UIScene_HowToPlayMenu::handleInput(int iPad, int key, bool repeat, bool pre
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp

@@ -136,7 +136,7 @@ void UIScene_InGameHostOptionsMenu::handleInput(int iPad, int key, bool repeat,
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp

@@ -313,7 +313,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
 
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp

@@ -414,7 +414,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_Intro.cpp

@@ -12,27 +12,27 @@ UIScene_Intro::UIScene_Intro(int iPad, void *initData, UILayer *parentLayer) : U
 
 	bool bSkipESRB = false;
 	bool bChina = false;
-#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-	bSkipESRB = app.GetProductSKU() != e_sku_SCEA;
-#elif defined(_XBOX) || defined(_DURANGO)
+#if (defined __PS3__ || __ORBIS__ || __PSVITA__)
+	bSkipESRB = !app.IsAmericanSKU();
+#else
 	bSkipESRB = !ProfileManager.LocaleIsUSorCanada();
 #endif
 
-#ifdef _DURANGO
+#if (defined _DURANGO || _WINDOWS64)
 	bChina = ProfileManager.LocaleIsChina();
 #endif
 	// 4J Stu - These map to values in the Actionscript
 #ifdef _WINDOWS64
 	int platformIdx = 0;
-#elif defined(_XBOX)
+#elif _XBOX
 	int platformIdx = 1;
-#elif defined(_DURANGO)
+#elif _DURANGO
 	int platformIdx = 2;
-#elif defined(__PS3__)
+#elif __PS3__
 	int platformIdx = 3;
-#elif defined(__ORBIS__)
+#elif __ORBIS__
 	int platformIdx = 4;
-#elif defined(__PSVITA__)
+#elif __PSVITA__
 	int platformIdx = 5;
 #endif
 
@@ -67,7 +67,7 @@ void UIScene_Intro::handleInput(int iPad, int key, bool repeat, bool pressed, bo
 	switch(key)
 	{
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(!m_bIgnoreNavigate)

Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp

@@ -286,7 +286,7 @@ void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 		}
 		handled = true;
 		break;
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp

@@ -96,7 +96,7 @@ void UIScene_LanguageSelector::handleInput(int iPad, int key, bool repeat, bool
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp

@@ -271,7 +271,7 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat,
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		// 4J-JEV: Inform user why their game must be offline.

Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp

@@ -642,7 +642,7 @@ void UIScene_LoadMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		

Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp

@@ -115,7 +115,10 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
 
 
 #if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
-	m_spaceIndicatorSaves.init(L"",eControl_SpaceIndicator,0, (4LL *1024LL * 1024LL * 1024LL) );
+    if(ui.getScreenWidth() >= 1920)
+    {
+	    m_spaceIndicatorSaves.init(L"",eControl_SpaceIndicator,0, (4LL *1024LL * 1024LL * 1024LL) );
+    }
 #endif
     m_bUpdateSaveSize = false;
 
@@ -161,7 +164,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
     }
 #endif
 
-#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) || defined(_DURANGO)
+#if (defined __PS3__ || __ORBIS__ || __PSVITA__ || _DURANGO || _WINDOWS64)
     // Always clear the saves when we enter this menu
     StorageManager.ClearSavesInfo();
 #endif
@@ -585,7 +588,7 @@ void UIScene_LoadOrJoinMenu::tick()
 			m_bSaveTransferRunning = false; 
 #endif
 #if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
-        if(m_bUpdateSaveSize)
+        if(m_bUpdateSaveSize && ui.getScreenWidth() >= 1920)
         {
             if((m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC))
             {
@@ -606,7 +609,10 @@ void UIScene_LoadOrJoinMenu::tick()
             {
                 //CD - Fix - Adding define for ORBIS/XBOXONE
 #if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
-                m_spaceIndicatorSaves.reset();
+                if(ui.getScreenWidth() >= 1920)
+                {
+                    m_spaceIndicatorSaves.reset();
+                }
 #endif
 
                 AddDefaultButtons();
@@ -634,25 +640,28 @@ void UIScene_LoadOrJoinMenu::tick()
 #elif defined(__ORBIS__)
                     m_spaceIndicatorSaves.addSave(m_pSaveDetails->SaveInfoA[i].blocksUsed * (32 * 1024) );
 #elif defined(_WINDOWS64)
-					ZeroMemory(m_saveDetails[i].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH);
-	                memcpy(m_saveDetails[i].UTF8SaveFilename, m_pSaveDetails->SaveInfoA[i].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
-	                wstring folderPath = wstring(L"Windows64\\GameHDD\\") + app.UTF8ToWide(m_saveDetails[i].UTF8SaveFilename) + L"\\*";
+                    if(ui.getScreenWidth() >= 1920)
+                    {
+					    ZeroMemory(m_saveDetails[i].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH);
+	                    memcpy(m_saveDetails[i].UTF8SaveFilename, m_pSaveDetails->SaveInfoA[i].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
+	                    wstring folderPath = wstring(L"Windows64\\GameHDD\\") + app.UTF8ToWide(m_saveDetails[i].UTF8SaveFilename) + L"\\*";
 						
-					DWORD fileSize = 0;
-	                WIN32_FIND_DATAW findData;
-					HANDLE hFile = FindFirstFileW(folderPath.c_str(), &findData);
+					    DWORD fileSize = 0;
+	                    WIN32_FIND_DATAW findData;
+					    HANDLE hFile = FindFirstFileW(folderPath.c_str(), &findData);
 	
-	                if (hFile != INVALID_HANDLE_VALUE) {
-                        do {
-	                        if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-                            {
-							    fileSize = findData.nFileSizeLow;
-                                break;
-                            }
-                        } while (FindNextFileW(hFile, &findData));
-	                    FindClose(hFile);
-	                }
-	                m_spaceIndicatorSaves.addSave(fileSize);
+	                    if (hFile != INVALID_HANDLE_VALUE) {
+                            do {
+	                            if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+                                {
+							        fileSize = findData.nFileSizeLow;
+                                    break;
+                                }
+                            } while (FindNextFileW(hFile, &findData));
+	                        FindClose(hFile);
+	                    }
+	                    m_spaceIndicatorSaves.addSave(fileSize);
+                    }
 #endif
 #ifdef _DURANGO
                     m_buttonListSaves.addItem(m_pSaveDetails->SaveInfoA[i].UTF16SaveTitle, L"");
@@ -1200,7 +1209,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
         break;
 
     case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
     case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
     case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_MainMenu.cpp

@@ -237,8 +237,7 @@ void UIScene_MainMenu::handleReload()
 	removeControl( &m_buttons[(int)eControl_Exit], false );
 	// We don't have a way to display trophies/achievements, so remove the button
 	removeControl( &m_buttons[(int)eControl_Achievements], false );
-#endif
-#ifdef _DURANGO
+#elif _DURANGO
 	// Allowed to not have achievements in the menu
 	removeControl( &m_buttons[(int)eControl_Achievements], false );
 #endif
@@ -250,7 +249,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 	
 	if ( m_bIgnorePress || (eNavigateWhenReady >= 0) ) return;
 
-#if defined (__ORBIS__) || defined (__PSVITA__)
+#if (defined __ORBIS__ || __PSVITA__ || _WINDOWS64)
 	// ignore all players except player 0 - it's their profile that is currently being used
 	if(iPad!=0) return;
 #endif
@@ -260,7 +259,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 	switch(key)
 	{
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(pressed)
@@ -278,8 +277,7 @@ void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 			ProfileManager.RequestSignInUI(false, false, false, false, false, ChooseUser_SignInReturned, this, iPad);
 		}
 		break;
-#endif
-#ifdef __PSVITA__
+#elif __PSVITA__
 	case ACTION_MENU_X:
 		if(pressed && ProfileManager.IsFullVersion()) 
 		{
@@ -563,7 +561,7 @@ int UIScene_MainMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EM
 			SQRNetworkManager_PS3::AttemptPSNSignIn(&UIScene_MainMenu::UnlockFullGame_SignInReturned, pClass);
 			break;
 		}
-#elif defined __PSVITA__
+#elif __PSVITA__
 		switch(pClass->m_eAction)
 		{
 		case eAction_RunLeaderboardsPSN:

Minecraft.Client/Common/UI/UIScene_MessageBox.cpp

@@ -104,7 +104,7 @@ void UIScene_MessageBox::handleInput(int iPad, int key, bool repeat, bool presse
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp

@@ -83,7 +83,7 @@ void UIScene_NewUpdateMessage::handleInput(int iPad, int key, bool repeat, bool
 			ui.NavigateBack(m_iPad);
 		}
 		break;
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_OK:

Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp

@@ -94,7 +94,7 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void *initData, UILayer *parentLa
 
 	if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
 	{
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)TRUE);
 	}
 
 	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_PauseMenu, 0);
@@ -367,7 +367,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 
 			if( iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
 			{
-				app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+				app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
 			}
 
 			ui.PlayUISFX(eSFX_Back);
@@ -379,7 +379,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:
@@ -473,7 +473,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 				bool bCanScreenshot = true;
 				for(int j=0; j < XUSER_MAX_COUNT;++j)
 				{
-					if(app.GetXuiAction(j) == eAppAction_SocialPostScreenshot)
+					if(app.GetUIAction(j) == eAppAction_SocialPostScreenshot)
 					{
 						bCanScreenshot = false;
 						break;
@@ -511,7 +511,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 	case BUTTON_PAUSE_RESUMEGAME:
 		if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
 		{
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+			app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
 		}
 		navigateBack();
 		break;

Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp

@@ -107,7 +107,7 @@ void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, bool pr
 			}
 			break;
 		case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 		case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 			if(pressed)

Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp

@@ -69,7 +69,7 @@ void UIScene_ReinstallMenu::handleInput(int iPad, int key, bool repeat, bool pre
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp

@@ -71,7 +71,7 @@ void UIScene_SaveMessage::handleInput(int iPad, int key, bool repeat, bool press
 	switch(key)
 	{
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp

@@ -76,7 +76,7 @@ void UIScene_SettingsAudioMenu::handleInput(int iPad, int key, bool repeat, bool
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp

@@ -76,7 +76,7 @@ void UIScene_SettingsControlMenu::handleInput(int iPad, int key, bool repeat, bo
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp

@@ -113,7 +113,7 @@ void UIScene_SettingsGraphicsMenu::handleInput(int iPad, int key, bool repeat, b
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp

@@ -102,7 +102,7 @@ void UIScene_SettingsMenu::handleInput(int iPad, int key, bool repeat, bool pres
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp

@@ -224,7 +224,7 @@ void UIScene_SettingsOptionsMenu::handleInput(int iPad, int key, bool repeat, bo
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp

@@ -129,7 +129,7 @@ void UIScene_SettingsUIMenu::handleInput(int iPad, int key, bool repeat, bool pr
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		sendInputToMovie(key, repeat, pressed, released);

Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp

@@ -129,7 +129,7 @@ void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, bool pre
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp

@@ -217,7 +217,7 @@ void UIScene_SkinSelectMenu::handleInput(int iPad, int key, bool repeat, bool pr
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(pressed)

Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp

@@ -236,7 +236,7 @@ void UIScene_TeleportMenu::handleInput(int iPad, int key, bool repeat, bool pres
 		}
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 	case ACTION_MENU_UP:

Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp

@@ -53,7 +53,7 @@ UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void *_initData, UILayer *par
 	// in this scene, we override the press sound with our own for crafting success or fail
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,true);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,true);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,true);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,true);
@@ -99,7 +99,7 @@ void UIScene_TradingMenu::handleDestroy()
 
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,false);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	ui.OverrideSFX(m_iPad,ACTION_MENU_TOUCHPAD_PRESS,false);
 #endif
 	ui.OverrideSFX(m_iPad,ACTION_MENU_LEFT_SCROLL,false);

Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp

@@ -31,7 +31,7 @@ void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, bool p
 		navigateBack();
 		break;
 	case ACTION_MENU_OK:
-#ifdef __ORBIS__
+#if defined __ORBIS__ || _WINDOWS64
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
 		if(pressed)

Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp

@@ -126,7 +126,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
 		if(nIndex<m_itemIds.size())
 		{
 			int id = m_itemIds[nIndex];
-			//app.SetXuiServerAction(pNotifyPressData->UserIndex, eXuiServerAction_DropItem, (void *)id);
+			//app.SetUIServerAction(pNotifyPressData->UserIndex, eUIServerAction_DropItem, (void *)id);
 			ClientConnection *conn = Minecraft::GetInstance()->getConnection(ProfileManager.GetPrimaryPad());
 			conn->send( GiveItemCommand::preparePacket(dynamic_pointer_cast<Player>(Minecraft::GetInstance()->localplayers[ProfileManager.GetPrimaryPad()]), id) );
 		}
@@ -136,7 +136,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
         nIndex = m_mobs.GetCurSel();
 		if(nIndex<m_mobFactories.size())
 		{			
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SpawnMob,(void *)m_mobFactories[nIndex]);
+			app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_SpawnMob,(void *)m_mobFactories[nIndex]);
 		}
     }
 	else if ( hObjPressed == m_enchantments )
@@ -200,13 +200,13 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
 	}
 	else if( hObjPressed == m_toggleRain )
 	{
-		//app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_ToggleRain);
+		//app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_ToggleRain);
 		ClientConnection *conn = Minecraft::GetInstance()->getConnection(ProfileManager.GetPrimaryPad());
 		conn->send( ToggleDownfallCommand::preparePacket() );
 	}
 	else if( hObjPressed == m_toggleThunder )
 	{
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_ToggleThunder);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_ToggleThunder);
 	}
 	else if( hObjPressed == m_resetTutorial )
 	{

Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp

@@ -76,7 +76,7 @@ HRESULT CScene_DebugSchematicCreator::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINo
 #endif
 			m_data->compressionType = Compression::eCompressionType_RLE;
 
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_ExportSchematic, (void *)m_data);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(), eUIServerAction_ExportSchematic, (void *)m_data);
 		
 		NavigateBack();
 		rfHandled = TRUE;

Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp

@@ -68,8 +68,8 @@ HRESULT CScene_DebugSetCamera::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPre
 
 	if (hObjPressed == m_teleport)
 	{
-		app.SetXuiServerAction(	ProfileManager.GetPrimaryPad(),
-								eXuiServerAction_SetCameraLocation, 
+		app.SetUIServerAction(	ProfileManager.GetPrimaryPad(),
+								eUIServerAction_SetCameraLocation, 
 								(void *)currentPosition);
 		rfHandled = TRUE;
 	}

Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp

@@ -152,7 +152,7 @@ HRESULT UIScene_PauseMenu::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
 	{
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)TRUE);
 	}
 
 	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_PauseMenu, 0);
@@ -190,7 +190,7 @@ HRESULT UIScene_PauseMenu::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress*
 	case BUTTON_PAUSE_RESUMEGAME:
 		if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
 		{
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+			app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
 		}
 		app.CloseXuiScenes(pNotifyPressData->UserIndex);
 		break;
@@ -441,7 +441,7 @@ HRESULT UIScene_PauseMenu::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandle
 		
 		if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
 		{
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+			app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
 		}
 
 		CXuiSceneBase::PlayUISFX(eSFX_Back);
@@ -477,7 +477,7 @@ HRESULT UIScene_PauseMenu::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandle
 				bool bCanScreenshot = true;
 				for(int j=0; j < XUSER_MAX_COUNT;++j)
 				{
-					if(app.GetXuiAction(j) == eAppAction_SocialPostScreenshot)
+					if(app.GetUIAction(j) == eAppAction_SocialPostScreenshot)
 					{
 						bCanScreenshot = false;
 						break;
@@ -579,7 +579,7 @@ HRESULT UIScene_PauseMenu::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
 	{
 		if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
 		{
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+			app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
 		}
 
 		app.CloseXuiScenes(m_iPad);
@@ -610,7 +610,7 @@ int UIScene_PauseMenu::BanGameDialogReturned(void *pParam,int iPad,C4JStorage::E
 	if(result==C4JStorage::EMessage_ResultDecline) 
 	{
 		// 4J Stu - Only do this if we are currently idle, don't want the (relatively) low priority ban task overriding something else
-		if(app.GetXuiAction(iPad) == eAppAction_Idle) app.SetAction(iPad,eAppAction_BanLevel);
+		if(app.GetUIAction(iPad) == eAppAction_Idle) app.SetAction(iPad,eAppAction_BanLevel);
 	}
 	return 0;
 }
@@ -702,7 +702,7 @@ HRESULT UIScene_PauseMenu::OnDestroy()
 
 	if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
 	{
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
 	}
 
 	return S_OK;
@@ -974,11 +974,11 @@ int UIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
 	bool bAutosave=(bool)lpParameter;
 	if(bAutosave)
 	{
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_AutoSaveGame);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_AutoSaveGame);
 	}
 	else
 	{
-		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SaveGame);
+		app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_SaveGame);
 	}
 
 	// Share AABB & Vec3 pools with default (main thread) - should be ok as long as we don't tick the main thread whilst this thread is running
@@ -994,7 +994,7 @@ int UIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
 	{	
 		app.SetGameStarted(false);
 
-		while( app.GetXuiServerAction(ProfileManager.GetPrimaryPad() ) != eXuiServerAction_Idle && !MinecraftServer::serverHalted() )
+		while( app.GetUIServerAction(ProfileManager.GetPrimaryPad() ) != eUIServerAction_Idle && !MinecraftServer::serverHalted() )
 		{
 			Sleep(10);
 		}

Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp

@@ -164,7 +164,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
-		bCheckTexturePack= app.GetGameStarted() && (ui.GetMenuDisplayed(0)==false) && (app.GetXuiAction(i)==eAppAction_Idle);
+		bCheckTexturePack= app.GetGameStarted() && (ui.GetMenuDisplayed(0)==false) && (app.GetUIAction(i)==eAppAction_Idle);
 	}
 
 	// make sure there's not a mount going on before using the textures
@@ -469,7 +469,7 @@ void CXuiSceneBase::_TickAllBaseScenes()
 		CustomMessage_TickScene( &xuiMsg );
 		XuiSendMessage( app.GetCurrentHUDScene(i), &xuiMsg );
 		
-		bool bDisplayGui=app.GetGameStarted() && !ui.GetMenuDisplayed(i) && !(app.GetXuiAction(i)==eAppAction_AutosaveSaveGameCapturedThumbnail) && app.GetGameSettings(i,eGameSetting_DisplayHUD)!=0;
+		bool bDisplayGui=app.GetGameStarted() && !ui.GetMenuDisplayed(i) && !(app.GetUIAction(i)==eAppAction_AutosaveSaveGameCapturedThumbnail) && app.GetGameSettings(i,eGameSetting_DisplayHUD)!=0;
 		if(bDisplayGui && pMinecraft->localplayers[i] != NULL)
 		{
 			XuiElementSetShow(app.GetCurrentHUDScene(i),TRUE);			

Minecraft.Client/DLCTexturePack.cpp

@@ -535,18 +535,18 @@ void DLCTexturePack::loadUI()
 			//CXuiSceneBase::GetInstance()->SkinChanged(CXuiSceneBase::GetInstance()->m_hObj);
 		}
 	}
-#else
-	if(m_archiveFile && m_archiveFile->hasFile(L"skin.swf"))
-	{
-		ui.ReloadSkins();
-		bUILoaded = true;
-	}
-#endif
 	else
 	{
 		loadDefaultUI();
 		bUILoaded = true;
 	}
+#else
+	if(m_archiveFile)
+	{
+		ui.ReloadSkins();
+		bUILoaded = true;
+	}
+#endif
 
 	AbstractTexturePack::loadUI();
 #ifndef _XBOX

Minecraft.Client/DefaultTexturePack.cpp

@@ -87,7 +87,7 @@ InputStream *DefaultTexturePack::getResourceImplementation(const wstring &name)/
 	wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
 
 	wDrive = wstr + L"\\Common\\res\\TitleUpdate\\res";
-#elif __PSVITA__
+//#elif __PSVITA__
 
 	/*
 	char *pchUsrDir=getUsrDirPath();
@@ -95,7 +95,7 @@ InputStream *DefaultTexturePack::getResourceImplementation(const wstring &name)/
 	
 	wDrive = wstr + L"Common\\res\\TitleUpdate\\res";
 	*/
-	wDrive = L"Common\\res\\TitleUpdate\\res";
+	//wDrive = L"Common\\res\\TitleUpdate\\res";
 #else
 	wDrive = L"Common\\res\\TitleUpdate\\res";
 

Minecraft.Client/Durango/4JLibs/inc/4J_Profile.h

@@ -73,6 +73,7 @@ public:
 	bool				IsSignedInLive(int iProf);
 	bool				IsGuest(int iQuadrant);
 	UINT				RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY);
+	UINT				RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(LPVOID,const bool, const int iPad, const int iController),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY);
 	UINT				DisplayOfflineProfile(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY);
 	UINT				RequestConvertOfflineToGuestUI(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY);
 	void				SetPrimaryPlayerChanged(bool bVal);								
@@ -100,6 +101,7 @@ public:
 	WXS::User^			GetUser(int iPad, bool incUsersSigningOut = false);
 	int					GetPrimaryPad();
 	void				SetPrimaryPad(int iPad);
+	void				ForcePrimaryPadController(int iController);
 	int					AddGamepadToGame(int iPad);
 	void				RemoveGamepadFromGame(int iPad);
 	void				ClearGameUsers();
@@ -110,6 +112,7 @@ public:
 	void				SetNotificationsCallback(void ( *Func)(LPVOID, DWORD, unsigned int),LPVOID lpParam);
 	bool				RegionIsNorthAmerica(void);
 	bool				LocaleIsUSorCanada(void);
+	bool				LocaleIsChina(void);
 	HRESULT				GetLiveConnectionStatus();
 	bool				IsSystemUIDisplayed();
 	void				SetProfileReadErrorCallback(void ( *Func)(LPVOID), LPVOID lpParam);

Minecraft.Client/Durango/ApplicationView.cpp

@@ -296,7 +296,7 @@ void ApplicationView::OnResuming(Platform::Object^ sender, Platform::Object^ arg
 	{
 		// Bit specific but we want to avoid switching to offline if the primary player has signed out 
 		// (and AFAIK there's no other way to find out until a few ticks time)
-		if (app.GetXuiAction(0) != eAppAction_PrimaryPlayerSignedOut)
+		if (app.GetUIAction(0) != eAppAction_PrimaryPlayerSignedOut)
 		{
 			// We've lost the party so switch to offline, previously we exited the world here but this seems friendlier
 			app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_EthernetDisconnected);

Minecraft.Client/Durango/Durango_Minecraft.cpp

@@ -633,7 +633,7 @@ void oldWinMainTick()
 		PIXEndNamedEvent();
 
 		// Any threading type things to deal with from the xui side?
-		app.HandleXuiActions();
+		app.HandleUIActions();
 
 		// 4J-PB - Update the trial timer display if we are in the trial version
 		if(!ProfileManager.IsFullVersion())

Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp

@@ -112,28 +112,28 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 	sp->addArgs(1, Tile::dirt_Id, 0); // works
 	sp->addArgs(2, Tile::dirt_Id, 0); // works
 
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  0); // fixed (+ach 'Rainbow Collection')
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  1);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  2);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  3);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  4);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  5);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  6);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  7);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  8);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  9);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 10);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 11);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 12);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 13);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 14);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 15);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  0); // fixed (+ach 'Rainbow Collection')
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  1);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  2);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  3);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  4);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  5);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  6);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  7);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  8);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  9);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 10);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 11);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 12);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 13);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 14);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 15);
 
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"McItemAcquired.AcquisitionMethodId.*.ItemId.*");
 	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::dirt_Id);				// works
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted,	Item::milk_Id);				// works.
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted,	Item::bucket_milk_Id);		// works.
 	sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted,	Tile::dirt_Id);				// works.
 	sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted,	Item::porkChop_cooked_Id);	// BROKEN! (ach 'Pork Chop' configured incorrectly)
 	sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted,	Item::cake_Id);				// works. (ach 'The Lie' configured incorrectly)
@@ -166,20 +166,20 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 
 	sp = new StatParam(L"BlockBroken.BlockId.*");
 	sp->addArgs( Tile::dirt_Id );
-	sp->addArgs( Tile::rock_Id ); 
+	sp->addArgs( Tile::stone_Id ); 
 	sp->addArgs( Tile::emeraldOre_Id );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken.BlockId.*.BlockAux.*");
 	sp->addArgs( Tile::dirt_Id, 0 );
-	sp->addArgs( Tile::rock_Id, 0 );
+	sp->addArgs( Tile::stone_Id, 0 );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken.DifficultyLevelId.*.BlockId.*");
 	sp->addArgs( 1, Tile::dirt_Id );
 	sp->addArgs( 2, Tile::dirt_Id );
-	sp->addArgs( 1, Tile::rock_Id );
-	sp->addArgs( 2, Tile::rock_Id );
+	sp->addArgs( 1, Tile::stone_Id );
+	sp->addArgs( 2, Tile::stone_Id );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken");

Minecraft.Client/Extrax64Stubs.cpp

@@ -34,10 +34,6 @@
 #include <perf.h>
 #endif
 
-#ifdef _WINDOWS64
-wchar_t	fakeGamerTagW[32] = L"PlayerName";
-#endif
-
 CSentientManager SentientManager;
 CXuiStringTable StringTable;
 
@@ -195,11 +191,7 @@ 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; }
-#ifdef _WINDOWS64
-LPCWSTR IQNetPlayer::GetGamertag() { return fakeGamerTagW; }
-#else
 LPCWSTR IQNetPlayer::GetGamertag() { return L"stub"; }
-#endif
 int IQNetPlayer::GetSessionIndex() { return 0; }
 bool IQNetPlayer::IsTalking() { return false; }
 bool IQNetPlayer::IsMutedByLocalUser(DWORD dwUserIndex) { return false; }
@@ -379,12 +371,19 @@ void XMemDestroyDecompressionContext(XMEMDECOMPRESSION_CONTEXT Context)
 DWORD XEnableGuestSignin(BOOL fEnable) { return 0; }
 #endif
 
+#ifdef _DURANGO
+bool C_4JProfile::LocaleIsChina() { return false; }
+void C_4JProfile::ForcePrimaryPadController(int iController) { ; }
+UINT C_4JProfile::RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(LPVOID,const bool, const int iPad, const int iController),LPVOID lpParam,int iQuadrant)
+{
+	return 0;
+}
+#endif
 
 
 /////////////////////////////////////////////// Profile library
 #ifdef _WINDOWS64
 static void *profileData[4];
-static bool s_bProfileIsFullVersion;
 void				C_4JProfile::Initialise( DWORD dwTitleID,
 								DWORD dwOfferID,
 								unsigned short usProfileVersion,
@@ -452,11 +451,6 @@ void				C_4JProfile::Initialise( DWORD dwTitleID,
 }
 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; }
-void				C_4JProfile::SetLockedProfile(int iProf) {}
-bool				C_4JProfile::IsSignedIn(int iQuadrant) { return ( iQuadrant == 0); }
-bool				C_4JProfile::IsSignedInLive(int iProf) { return true; }
-bool				C_4JProfile::IsGuest(int iQuadrant) { return false; }
 UINT				C_4JProfile::RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant) { return 0; }
 UINT				C_4JProfile::DisplayOfflineProfile(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant)  { return 0; }
 UINT				C_4JProfile::RequestConvertOfflineToGuestUI(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant) { return 0; }
@@ -465,7 +459,6 @@ bool				C_4JProfile::QuerySigninStatus(void) { return true; }
 void				C_4JProfile::GetXUID(int iPad, PlayerUID *pXuid,bool bOnlineXuid) {*pXuid = 0xe000d45248242f2e; }
 BOOL				C_4JProfile::AreXUIDSEqual(PlayerUID xuid1,PlayerUID xuid2) { return false; }
 BOOL				C_4JProfile::XUIDIsGuest(PlayerUID xuid) { return false; }
-bool				C_4JProfile::AllowedToPlayMultiplayer(int iProf) { return true; }
 
 #if defined(__ORBIS__)
 bool				C_4JProfile::GetChatAndContentRestrictions(int iPad, bool thisQuadrantOnly, bool *pbChatRestricted,bool *pbContentRestricted,int *piAge)
@@ -482,28 +475,16 @@ void				C_4JProfile::AllowedPlayerCreatedContent(int iPad, bool thisQuadrantOnly
 BOOL				C_4JProfile::CanViewPlayerCreatedContent(int iPad, bool thisQuadrantOnly, PPlayerUID pXuids, DWORD dwXuidCount ) { return true; }
 bool				C_4JProfile::GetProfileAvatar(int iPad,int( *Func)(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes), LPVOID lpParam) { return false; }
 void				C_4JProfile::CancelProfileAvatarRequest() {}
-int					C_4JProfile::GetPrimaryPad() { return 0; }
-void				C_4JProfile::SetPrimaryPad(int iPad) {}
-char				fakeGamerTag[32] = "PlayerName";
 #ifdef _DURANGO
 void				SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); }
 char*				C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
-#elif _WINDOWS64
-void				CConsoleMinecraftApp::SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); size_t chars = 0; mbstowcs_s(&chars, fakeGamerTagW, 32, name, _TRUNCATE); }
-char*				C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
-wstring				C_4JProfile::GetDisplayName(int iPad){ return fakeGamerTagW; }
-#else //str1k3r - every other platform BUT Windows64 and Durango
+#elif !_WINDOWS64
 void				SetFakeGamertag(char *name){ strcpy_s(fakeGamerTag, name); size_t chars = 0; }
 char*				C_4JProfile::GetGamertag(int iPad){ return fakeGamerTag; }
 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) {}
 void				C_4JProfile::SetNotificationsCallback(void ( *Func)(LPVOID, DWORD, unsigned int),LPVOID lpParam) {}
-bool				C_4JProfile::RegionIsNorthAmerica(void) { return false; }
-bool				C_4JProfile::LocaleIsUSorCanada(void) { return false; }
-HRESULT				C_4JProfile::GetLiveConnectionStatus() { return S_OK; }
-bool				C_4JProfile::IsSystemUIDisplayed() { return false; }
 void				C_4JProfile::SetProfileReadErrorCallback(void ( *Func)(LPVOID), LPVOID lpParam) {}
 int( *defaultOptionsCallback)(LPVOID,C_4JProfile::PROFILESETTINGS *, const int iPad) = NULL;
 LPVOID lpProfileParam = NULL;
@@ -544,7 +525,6 @@ void				C_4JProfile::SetRichPresenceContextValue(int iPad,int iContextID, int iV
 void				C_4JProfile::SetCurrentGameActivity(int iPad,int iNewPresence, bool bSetOthersToIdle) {}
 void				C_4JProfile::DisplayFullVersionPurchase(bool bRequired, int iQuadrant, int iUpsellParam) {}
 void				C_4JProfile::SetUpsellCallback(void ( *Func)(LPVOID lpParam, eUpsellType type, eUpsellResponse response, int iUserData),LPVOID lpParam) {}
-void				C_4JProfile::SetDebugFullOverride(bool bVal) {s_bProfileIsFullVersion = bVal;}
 void				C_4JProfile::ShowProfileCard(int iPad, PlayerUID targetUid) {}
 
 /////////////////////////////////////////////// Storage library
@@ -659,6 +639,11 @@ void StatsCounter::WipeLeaderboards() {}
 #endif
 */
 
-#ifdef __PS3__
-bool				C_4JProfile::IsFullVersion() { return true; }
+//str1k3r - needed on every platform but windows64 until we decomp the other libs
+#ifndef _WINDOWS64
+bool C_4JProfile::IsFullVersion() { return true; }
+#endif
+
+#ifdef _WINDOWS64
+C_4JProfile ProfileManager;
 #endif

Minecraft.Client/GameRenderer.cpp

@@ -1335,10 +1335,7 @@ void GameRenderer::renderLevel(float a, __int64 until)
 			// 4J Stu - When rendering entities, in the end if the dragon is hurt or we have a lot of entities we can end up wrapping
 			// our index into the temp Vec3 cache and overwrite the one that was storing the camera position
 			// Fix for #77745 - TU9: Content: Gameplay: Items and mobs not belonging to end world are disappearing when Enderdragon is damaged.
-			Vec3 *cameraPosTemp = cameraEntity->getPos(a);
-			cameraPos->x = cameraPosTemp->x;
-			cameraPos->y = cameraPosTemp->y;
-			cameraPos->z = cameraPosTemp->z;
+			Vec3 *cameraPos = cameraEntity->getPos(a);
 			levelRenderer->renderEntities(cameraPos, frustum, a);
 #ifdef __PSVITA__
 			// AP - make sure we're using the Alpha cut out effect for particles

Minecraft.Client/Gui.cpp

@@ -184,7 +184,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
 	}
 
 	// 4J-PB - turn off the slot display if a xui menu is up, or if we're autosaving
-	bool bDisplayGui=!ui.GetMenuDisplayed(iPad) && !(app.GetXuiAction(iPad)==eAppAction_AutosaveSaveGameCapturedThumbnail);
+	bool bDisplayGui=!ui.GetMenuDisplayed(iPad) && !(app.GetUIAction(iPad)==eAppAction_AutosaveSaveGameCapturedThumbnail);
 
 	// if tooltips are off, set the y offset to zero
 	if(app.GetGameSettings(iPad,eGameSetting_Tooltips)==0 && bDisplayGui)	

Minecraft.Client/Minecraft.Client.vcxproj

@@ -629,6 +629,7 @@
     <OutDir>$(SolutionDir)$(Platform)_$(Configuration)\</OutDir>
     <IntDir>$(Platform)_$(Configuration)\</IntDir>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">
     <LinkIncremental>false</LinkIncremental>
@@ -718,6 +719,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <AdditionalDependencies>xavatar2d.lib;xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;xuirund.lib;xuirenderd.lib;xuihtmld.lib;xonline.lib;xhvd2.lib;qnetxaudio2d.lib;xpartyd.lib;..\Minecraft.World\Debug\Minecraft.World.lib;xbox\4JLibs\libs\4J_Input_d.lib;xbox\4JLibs\libs\4J_Storage_d.lib;xbox\4JLibs\libs\4J_Profile_d.lib;xbox\4JLibs\libs\4J_Render_d.lib;xsocialpostd.lib;xrnmd.lib;xbox\Sentient\libs\SenCoreD.lib;xbox\Sentient\libs\SenNewsD.lib;xbox\Sentient\libs\SenUGCD.lib;xbox\Sentient\libs\SenBoxArtD.lib;nuiapid.lib;STd.lib;NuiFitnessApid.lib;NuiHandlesd.lib;NuiSpeechd.lib;xhttpd.lib;xauthd.lib;xgetserviceendpointd.lib;xavd.lib;xjsond.lib;xbox\4JLibs\libs\4J_XTMS_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
       <Command>powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/"</Command>
@@ -761,6 +763,7 @@
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <SetChecksum>true</SetChecksum>
+      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <ImageXex>
       <ConfigurationFile>$(ProjectDir)xbox\xex-dev.xml</ConfigurationFile>
@@ -1168,6 +1171,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <IgnoreSpecificDefaultLibraries>xapilib.lib</IgnoreSpecificDefaultLibraries>
       <GenerateMapFile>false</GenerateMapFile>
       <MapExports>false</MapExports>
+      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <ImageXex>
       <ConfigurationFile>$(ProjectDir)xbox\xex.xml</ConfigurationFile>
@@ -1216,6 +1220,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <IgnoreSpecificDefaultLibraries>xapilib.lib</IgnoreSpecificDefaultLibraries>
       <GenerateMapFile>false</GenerateMapFile>
       <MapExports>false</MapExports>
+      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <ImageXex>
       <ConfigurationFile>$(ProjectDir)xbox\xex.xml</ConfigurationFile>
@@ -1264,6 +1269,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <IgnoreSpecificDefaultLibraries>xapilib.lib</IgnoreSpecificDefaultLibraries>
       <GenerateMapFile>false</GenerateMapFile>
       <MapExports>false</MapExports>
+      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <ImageXex>
       <ConfigurationFile>$(ProjectDir)xbox\xex.xml</ConfigurationFile>
@@ -1313,6 +1319,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU  $(LayoutDir)Image\Loose\CU</C
       <IgnoreSpecificDefaultLibraries>xapilib.lib</IgnoreSpecificDefaultLibraries>
       <GenerateMapFile>false</GenerateMapFile>
       <MapExports>false</MapExports>
+      <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <ImageXex>
       <ConfigurationFile>$(ProjectDir)xbox\xex.xml</ConfigurationFile>
@@ -2162,12 +2169,13 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;_CONTENT_PACKAGE;_FINAL_BUILD</PreprocessorDefinitions>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Warnings>WarningsOff</Warnings>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>..\ORBIS_ContentPackage\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render.a;Orbis\4JLibs\libs\4j_Input.a;Orbis\4JLibs\libs\4J_Storage.a;Orbis\4JLibs\libs\4J_Profile.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_rtti;-lSceNpToolkitUtils_rtti;-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;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceRemoteplay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak</AdditionalDependencies>
+      <AdditionalDependencies>..\ORBIS_ContentPackage\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render.a;Orbis\4JLibs\libs\4j_Input.a;Orbis\4JLibs\libs\4J_Storage.a;Orbis\4JLibs\libs\4J_Profile.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;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceRemoteplay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Link>
       <InfoStripping>None</InfoStripping>
@@ -14406,6 +14414,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
+      <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>
     </ClInclude>
     <ClInclude Include="PSVita\PSVitaExtras\Conf.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -27939,6 +27953,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
+      <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>
     </ClCompile>
     <ClCompile Include="PSVita\PSVitaExtras\CustomMap.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
@@ -35540,7 +35560,15 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
+    </Image>
+    <Image Include="Xbox\MinecraftWindows64.ico">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
     </Image>
     <Image Include="Xbox\small.ico">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>

Minecraft.Client/Minecraft.Client.vcxproj.filters

@@ -351,9 +351,6 @@
     <Filter Include="Windows64\GameConfig">
       <UniqueIdentifier>{71d6ccac-7a6e-4399-987b-06b606056f59}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Windows64\res">
-      <UniqueIdentifier>{05765c7e-26d6-4760-b0f6-7aa9f374d163}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Windows64\Source Files">
       <UniqueIdentifier>{02363026-02fd-4efc-a115-6ae3dc652546}</UniqueIdentifier>
     </Filter>
@@ -582,9 +579,6 @@
     <Filter Include="Common\Source Files\Leaderboards">
       <UniqueIdentifier>{3eefa342-44e2-493a-9165-40f85bcef557}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Windows64\Source Files\SentientLibs">
-      <UniqueIdentifier>{f88c0f6a-8051-41e7-9bf6-b9d3c7bb2937}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Xbox\Source Files\XUI">
       <UniqueIdentifier>{a6b9803b-8dc2-4552-856e-470f78757533}</UniqueIdentifier>
     </Filter>
@@ -3790,9 +3784,6 @@
     <ClInclude Include="Common\Leaderboards\LeaderboardInterface.h">
       <Filter>Common\Source Files\Leaderboards</Filter>
     </ClInclude>
-    <ClInclude Include="PSVita\PSVitaExtras\OldSdk.h">
-      <Filter>PSVita</Filter>
-    </ClInclude>
     <ClInclude Include="Windows64\Windows64_Minecraft.h">
       <Filter>Windows64\Source Files</Filter>
     </ClInclude>
@@ -3805,6 +3796,9 @@
     <ClInclude Include="Windows64\Windows64Extras\Windows64Stubs.h">
       <Filter>Windows64\Windows64Extras</Filter>
     </ClInclude>
+    <ClInclude Include="PSVita\PSVitaExtras\OldSdk.h">
+      <Filter>PSVita\PSVitaExtras</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -5940,9 +5934,6 @@
     <ClCompile Include="Common\Leaderboards\LeaderboardInterface.cpp">
       <Filter>Common\Source Files\Leaderboards</Filter>
     </ClCompile>
-    <ClCompile Include="PSVita\PSVitaExtras\OldSdk.cpp">
-      <Filter>PSVita</Filter>
-    </ClCompile>
     <ClCompile Include="Xbox\Xbox_UIController.cpp">
       <Filter>Xbox</Filter>
     </ClCompile>
@@ -5952,6 +5943,9 @@
     <ClCompile Include="Windows64\Windows64Extras\Windows64Stubs.cpp">
       <Filter>Windows64\Windows64Extras</Filter>
     </ClCompile>
+    <ClCompile Include="PSVita\PSVitaExtras\OldSdk.cpp">
+      <Filter>PSVita\PSVitaExtras</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Library Include="Xbox\4JLibs\libs\4J_Render_d.lib">
@@ -6234,6 +6228,9 @@
     <Image Include="Xbox\MinecraftWindows.ico">
       <Filter>Windows</Filter>
     </Image>
+    <Image Include="Xbox\MinecraftWindows64.ico">
+      <Filter>Windows</Filter>
+    </Image>
     <Image Include="Xbox\small.ico">
       <Filter>Windows</Filter>
     </Image>

Minecraft.Client/Minecraft.cpp

@@ -224,8 +224,7 @@ Minecraft::Minecraft(Component *mouseComponent, Canvas *parent, MinecraftApplet
 
 	// 4J-PB - Removed it from here on Orbis due to it causing a crash with the network init.
 	// We should work out why...
-	//str1k3r - removed on Windows64 as the SoundEngine was starting really late
-#if !(defined __ORBIS__ || _WINDOWS64)
+#ifndef __ORBIS__
 	this->soundEngine->init(NULL);
 #endif
 
@@ -1215,7 +1214,7 @@ void Minecraft::run_middle()
 				{
 					// if the pause menu is up for the primary player, don't autosave
 					// If saving isn't disabled, and the main player has a app action running , or has any crafting or containers open, don't autosave
-					if(!StorageManager.GetSaveDisabled() && (app.GetXuiAction(ProfileManager.GetPrimaryPad())==eAppAction_Idle) )
+					if(!StorageManager.GetSaveDisabled() && (app.GetUIAction(ProfileManager.GetPrimaryPad())==eAppAction_Idle) )
 					{
 						if(!ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad()) && !ui.IsIgnoreAutosaveMenuDisplayed(ProfileManager.GetPrimaryPad()))
 						{
@@ -1660,7 +1659,6 @@ void Minecraft::run_middle()
 				if(i!=0)
 				{
 					InputManager.Tick();
-					app.HandleButtonPresses();
 				}
 
 				ticks++;
@@ -1784,7 +1782,7 @@ void Minecraft::run_middle()
 							RenderManager.InternalScreenCapture();
 #endif
 							// check to see if we need to capture a screenshot for the save game thumbnail
-							switch(app.GetXuiAction(i))
+							switch(app.GetUIAction(i))
 							{
 							case eAppAction_ExitWorldCapturedThumbnail:
 							case eAppAction_SaveGameCapturedThumbnail:
@@ -1813,7 +1811,7 @@ void Minecraft::run_middle()
 				// Do we need to capture a screenshot for a social post?
 				for( int i = 0; i < XUSER_MAX_COUNT; i++ )
 				{
-					if(app.GetXuiAction(i)==eAppAction_SocialPostScreenshot)
+					if(app.GetUIAction(i)==eAppAction_SocialPostScreenshot)
 					{
 						app.CaptureScreenshot(i);
 					}
@@ -3638,7 +3636,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 	// 			printf("Input Detected!\n");
 	//
 	// 			// see if we can react to this
-	// 			if(app.GetXuiAction(iPad)==eAppAction_Idle)
+	// 			if(app.GetUIAction(iPad)==eAppAction_Idle)
 	// 			{
 	// 				app.SetAction(iPad,eAppAction_DebugText,(LPVOID)wchInput);
 	// 			}

Minecraft.Client/MinecraftServer.cpp

@@ -1344,16 +1344,16 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 			}
 
 			// Process delayed actions			
-			eXuiServerAction eAction;
+			eUIServerAction eAction;
 			LPVOID param;
 			for(int i=0;i<XUSER_MAX_COUNT;i++)
 			{
-				eAction = app.GetXuiServerAction(i);
-				param = app.GetXuiServerActionParam(i);
+				eAction = app.GetUIServerAction(i);
+				param = app.GetUIServerActionParam(i);
 
 				switch(eAction)
 				{
-				case eXuiServerAction_AutoSaveGame:
+				case eUIServerAction_AutoSaveGame:
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
 					{
 						PIXBeginNamedEvent(0,"Autosave");
@@ -1402,7 +1402,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 					}
 					break;
 #endif
-				case eXuiServerAction_SaveGame:
+				case eUIServerAction_SaveGame:
 					app.EnterSaveNotificationSection();
 					if (players != NULL)
 					{
@@ -1418,7 +1418,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 						// with the data from the nethers leveldata.
 						// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
 						ServerLevel *level = levels[levels.length - 1 - j];
-						level->save(true, Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));
+						level->save(true, Minecraft::GetInstance()->progressRenderer, (eAction==eUIServerAction_AutoSaveGame));
 
 						players->broadcastAll( shared_ptr<UpdateProgressPacket>( new UpdateProgressPacket(33 + (j*33) ) ) );
 					}
@@ -1426,11 +1426,11 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 					{
 						saveGameRules();
 
-						levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));	
+						levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, (eAction==eUIServerAction_AutoSaveGame));	
 					}
 					app.LeaveSaveNotificationSection();
 					break;
-				case eXuiServerAction_DropItem:
+				case eUIServerAction_DropItem:
 					// Find the player, and drop the id at their feet
 					{
 						shared_ptr<ServerPlayer> player = players->players.at(0);
@@ -1438,7 +1438,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 						player->drop( shared_ptr<ItemInstance>( new ItemInstance(id, 1, 0 ) ) );
 					}
 					break;
-				case eXuiServerAction_SpawnMob:
+				case eUIServerAction_SpawnMob:
 					{
 						shared_ptr<ServerPlayer> player = players->players.at(0);
 						eINSTANCEOF factory = (eINSTANCEOF)((size_t)param);
@@ -1448,38 +1448,38 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 						player->level->addEntity(mob);
 					}
 					break;
-				case eXuiServerAction_PauseServer:
+				case eUIServerAction_PauseServer:
 					m_isServerPaused = ( (size_t) param == TRUE );
 					if( m_isServerPaused )
 					{						
 						m_serverPausedEvent->Set();
 					}
 					break;
-				case eXuiServerAction_ToggleRain:
+				case eUIServerAction_ToggleRain:
 					{						
 						bool isRaining = levels[0]->getLevelData()->isRaining();
 						levels[0]->getLevelData()->setRaining(!isRaining);
 						levels[0]->getLevelData()->setRainTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
 					}
 					break;
-				case eXuiServerAction_ToggleThunder:
+				case eUIServerAction_ToggleThunder:
 					{						
 						bool isThundering = levels[0]->getLevelData()->isThundering();
 						levels[0]->getLevelData()->setThundering(!isThundering);
 						levels[0]->getLevelData()->setThunderTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
 					}
 					break;
-				case eXuiServerAction_ServerSettingChanged_Gamertags:
+				case eUIServerAction_ServerSettingChanged_Gamertags:
 					players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_OPTIONS, app.GetGameHostOption(eGameHostOption_Gamertags)) ) );
 					break;
-				case eXuiServerAction_ServerSettingChanged_BedrockFog:
+				case eUIServerAction_ServerSettingChanged_BedrockFog:
 					players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, app.GetGameHostOption(eGameHostOption_All)) ) );
 					break;
 
-				case eXuiServerAction_ServerSettingChanged_Difficulty:
+				case eUIServerAction_ServerSettingChanged_Difficulty:
 					players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_DIFFICULTY, Minecraft::GetInstance()->options->difficulty) ) );
 					break;
-				case eXuiServerAction_ExportSchematic:
+				case eUIServerAction_ExportSchematic:
 #ifndef _CONTENT_PACKAGE
 					app.EnterSaveNotificationSection();
 
@@ -1510,7 +1510,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 					app.LeaveSaveNotificationSection();
 #endif
 					break;
-				case eXuiServerAction_SetCameraLocation:
+				case eUIServerAction_SetCameraLocation:
 #ifndef _CONTENT_PACKAGE
 					{
 						DebugSetCameraPosition *pos = (DebugSetCameraPosition *)param;
@@ -1533,7 +1533,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
 					break;
 				}
 
-				app.SetXuiServerAction(i,eXuiServerAction_Idle);
+				app.SetUIServerAction(i,eUIServerAction_Idle);
 			}
 
 			Sleep(1);

Minecraft.Client/Orbis/Orbis_Minecraft.cpp

@@ -799,7 +799,7 @@ int main(int argc, const char *argv[] )
 		PIXEndNamedEvent();
 
 		// Any threading type things to deal with from the xui side?
-		app.HandleXuiActions();
+		app.HandleUIActions();
 
 		// 4J-PB - Update the trial timer display if we are in the trial version
 		if(!ProfileManager.IsFullVersion())

Minecraft.Client/PSVita/PSVita_Minecraft.cpp

@@ -490,13 +490,10 @@ int main()
 	app.loadStringTable();
 
 	// Vita
-	//g_iScreenWidth = 720;
-	//g_iScreenHeight = 408;
+	ui.init(720, 408);
 
 	// Vita native
-	//g_iScreenWidth = 960;
-	//g_iScreenHeight = 544;
-	ui.init(720, 408);
+	//ui.init(960, 544);
 
 	////////////////
 	// Initialise //
@@ -783,7 +780,7 @@ int main()
 		PIXEndNamedEvent();
 
 		// Any threading type things to deal with from the xui side?
-		app.HandleXuiActions();
+		app.HandleUIActions();
 
 		// 4J-PB - Update the trial timer display if we are in the trial version
 		if(!ProfileManager.IsFullVersion())

Minecraft.Client/PreStitchedTextureMap.cpp

@@ -228,7 +228,7 @@ void PreStitchedTextureMap::makeTextureAnimated(TexturePack *texturePack, Stitch
 		if(first->getWidth() != tex->getWidth() || first->getHeight() != tex->getHeight())
 		{
 			app.DebugPrintf("%ls - first w - %d, h - %d, tex w - %d, h - %d\n",textureFileName.c_str(),first->getWidth(),tex->getWidth(),first->getHeight(),tex->getHeight());
-			__debugbreak();
+			//__debugbreak();
 		}
 #endif
 

Minecraft.Client/TexturePack.cpp

@@ -57,23 +57,21 @@ wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const char *pc
 		}			
 	}
 
-#elif __PSVITA__
+/*#elif __PSVITA__
 	char *pchUsrDir="";//getUsrDirPath();
 	wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
 
 	if(bTitleUpdateTexture)
 	{
-		// Make the content package point to to the UPDATE: drive is needed
 		wDrive= wstr + L"Common\\res\\TitleUpdate\\";
 	}
 	else
 	{
 		wDrive= wstr + L"Common\\";
-	}
+	}*/
 #else
 	if(bTitleUpdateTexture)
 	{
-		// Make the content package point to to the UPDATE: drive is needed
 		wDrive=L"Common\\res\\TitleUpdate\\";
 	}
 	else

Minecraft.Client/Textures.cpp

@@ -466,7 +466,7 @@ ResourceLocation *Textures::getTextureLocation(int iconType)
 	case Icon::TYPE_TERRAIN:
 		return &TextureAtlas::LOCATION_BLOCKS;
 		break;
-	case Icon::TYPE_ITEM:
+	default: //case Icon::TYPE_ITEM
 		return &TextureAtlas::LOCATION_ITEMS;
 		break;
 	}

Minecraft.Client/Windows64/Windows64_App.h

@@ -5,8 +5,6 @@ class CConsoleMinecraftApp : public CMinecraftApp
 public:
 	ImageFileBuffer m_ThumbnailBuffer;
 
-	static void SetFakeGamertag(char* name);
-
 	CConsoleMinecraftApp();
 
 	virtual void SetRichPresenceContext(int iPad, int contextId);

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -103,10 +103,12 @@ static Windows64LaunchArgs ParseLaunchArgs()
 		} 
 		else if (_wcsicmp(argv[i], L"-name") == 0)
 		{
+			args.name = true;
+
 			if (i + 1 < argc) 
 			{
 				app.CopyWideArgToAnsi(argv[i + 1], g_Username, sizeof(g_Username));
-				app.SetFakeGamertag(g_Username);
+				ProfileManager.SetFakeGamerTag(g_Username);
 			}
 		}
 	}
@@ -121,12 +123,22 @@ void DefineActions(void)
 
 	// Split into Menu actions, and in-game actions
 
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_A,							_360_JOY_BUTTON_A);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_B,							_360_JOY_BUTTON_B);
+	if(InputManager.IsSelectBackSwapped())
+	{
+		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_A,							_360_JOY_BUTTON_B);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_B,							_360_JOY_BUTTON_A);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OK,							_360_JOY_BUTTON_B);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_CANCEL,						_360_JOY_BUTTON_A);
+	}
+	else
+	{
+		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_A,							_360_JOY_BUTTON_A);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_B,							_360_JOY_BUTTON_B);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OK,							_360_JOY_BUTTON_A);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_CANCEL,						_360_JOY_BUTTON_B);
+	}
 	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_X,							_360_JOY_BUTTON_X);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_Y,							_360_JOY_BUTTON_Y);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OK,							_360_JOY_BUTTON_A);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_CANCEL,						_360_JOY_BUTTON_B);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_UP,							_360_JOY_BUTTON_DPAD_UP | _360_JOY_BUTTON_LSTICK_UP);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_DOWN,						_360_JOY_BUTTON_DPAD_DOWN | _360_JOY_BUTTON_LSTICK_DOWN);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_LEFT,						_360_JOY_BUTTON_DPAD_LEFT | _360_JOY_BUTTON_LSTICK_LEFT);
@@ -170,12 +182,22 @@ void DefineActions(void)
 	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_DPAD_UP,				_360_JOY_BUTTON_DPAD_UP);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_DPAD_DOWN,				_360_JOY_BUTTON_DPAD_DOWN);
 
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_A,							_360_JOY_BUTTON_A);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_B,							_360_JOY_BUTTON_B);
+	if(InputManager.IsSelectBackSwapped())
+	{
+		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_A,							_360_JOY_BUTTON_B);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_B,							_360_JOY_BUTTON_A);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OK,							_360_JOY_BUTTON_B);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_CANCEL,						_360_JOY_BUTTON_A);
+	}
+	else
+	{
+		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_A,							_360_JOY_BUTTON_A);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_B,							_360_JOY_BUTTON_B);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OK,							_360_JOY_BUTTON_A);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_CANCEL,						_360_JOY_BUTTON_B);
+	}
 	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_X,							_360_JOY_BUTTON_X);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_Y,							_360_JOY_BUTTON_Y);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OK,							_360_JOY_BUTTON_A);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_CANCEL,						_360_JOY_BUTTON_B);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_UP,							_360_JOY_BUTTON_DPAD_UP | _360_JOY_BUTTON_LSTICK_UP);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_DOWN,						_360_JOY_BUTTON_DPAD_DOWN | _360_JOY_BUTTON_LSTICK_DOWN);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_LEFT,						_360_JOY_BUTTON_DPAD_LEFT | _360_JOY_BUTTON_LSTICK_LEFT);
@@ -219,12 +241,22 @@ void DefineActions(void)
 	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_DPAD_UP,				_360_JOY_BUTTON_DPAD_UP);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_DPAD_DOWN,				_360_JOY_BUTTON_DPAD_DOWN);	
 
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_A,							_360_JOY_BUTTON_A);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_B,							_360_JOY_BUTTON_B);
+	if(InputManager.IsSelectBackSwapped())
+	{
+		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_A,							_360_JOY_BUTTON_B);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_B,							_360_JOY_BUTTON_A);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OK,							_360_JOY_BUTTON_B);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_CANCEL,						_360_JOY_BUTTON_A);
+	}
+	else
+	{
+		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_A,							_360_JOY_BUTTON_A);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_B,							_360_JOY_BUTTON_B);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OK,							_360_JOY_BUTTON_A);
+		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_CANCEL,						_360_JOY_BUTTON_B);
+	}
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_X,							_360_JOY_BUTTON_X);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_Y,							_360_JOY_BUTTON_Y);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OK,							_360_JOY_BUTTON_A);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_CANCEL,						_360_JOY_BUTTON_B);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_UP,							_360_JOY_BUTTON_DPAD_UP | _360_JOY_BUTTON_LSTICK_UP);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_DOWN,						_360_JOY_BUTTON_DPAD_DOWN | _360_JOY_BUTTON_LSTICK_DOWN);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_LEFT,						_360_JOY_BUTTON_DPAD_LEFT | _360_JOY_BUTTON_LSTICK_LEFT);
@@ -267,6 +299,11 @@ void DefineActions(void)
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_RIGHT,				_360_JOY_BUTTON_DPAD_RIGHT);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_UP,				_360_JOY_BUTTON_DPAD_UP);
 	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_DOWN,				_360_JOY_BUTTON_DPAD_DOWN);
+
+	// Touchpad mapping
+	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_TOUCHPAD_PRESS,				_PS_JOY_BUTTON_TOUCHPAD);
+	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_TOUCHPAD_PRESS,				_PS_JOY_BUTTON_TOUCHPAD);
+	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_TOUCHPAD_PRESS,				_PS_JOY_BUTTON_TOUCHPAD);
 }
 
 void MemSect(int sect)
@@ -370,7 +407,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
 	wcex.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);
 	wcex.lpszMenuName	= "Minecraft";
 	wcex.lpszClassName	= "MinecraftClass";
-	wcex.hIconSm		= LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MINECRAFTWINDOWS));
+	wcex.hIconSm		= LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MINECRAFTWINDOWS64));
 
 	return RegisterClassEx(&wcex);
 }
@@ -744,11 +781,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 	app.loadMediaArchive();
 
-	if(launchArgs.vsync)
-	{
-		RenderManager.SetVSync(false); //str1k3r - vsync is set to true by default in 4JLibs
-	}
-
 	RenderManager.Initialise(g_pd3dDevice, g_pSwapChain);
 
 	//str1k3r - set the resolution that we have at time of launch
@@ -769,6 +801,9 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	InputManager.SetJoypadMapVal(0,0);
 	InputManager.SetKeyRepeatRate(0.3f,0.2f);
 
+	//str1k3r - load username.txt if we havent ran the -name arg
+	if(!launchArgs.name) ProfileManager.LoadGamertag();
+
 	// Initialise the profile manager with the game Title ID, Offer ID, a profile version number, and the number of profile values and settings
 	ProfileManager.Initialise(TITLEID_MINECRAFT,
 		app.m_dwOfferID,
@@ -818,9 +853,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	Sleep(10000);
 #endif
 
-	//str1k3r - moved here from Minecraft.cpp so the SoundEngine starts faster
-	pMinecraft->soundEngine->init(NULL);
-
 	MSG msg = {0};
 	while( WM_QUIT != msg.message )
 	{
@@ -834,14 +866,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 		app.UpdateTime();
 		PIXBeginNamedEvent(0,"Input manager tick");
-		if (GetFocus())
-		{
-			InputManager.Tick();
-		}
+		if (GetFocus()) InputManager.Tick();
 		PIXEndNamedEvent();
-		/*PIXBeginNamedEvent(0,"Profile manager tick");
+		PIXBeginNamedEvent(0,"Profile manager tick");
 		ProfileManager.Tick();
-		PIXEndNamedEvent();*/
+		PIXEndNamedEvent();
 		PIXBeginNamedEvent(0,"Storage manager tick");
 		StorageManager.Tick();
 		PIXEndNamedEvent();
@@ -850,7 +879,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();
@@ -878,8 +907,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		ui.tick();
 		ui.render();
 
-		//str1k3r - update RenderManager's & gdraw's resolution
-		RenderManager.setResolution(g_iScreenWidth, g_iScreenHeight);
+		//str1k3r - update resolution
 		ui.updateResolution(g_iScreenWidth, g_iScreenHeight);
 
 		// Present the frame.
@@ -888,7 +916,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		ui.CheckMenuDisplayed();
 
 		// Any threading type things to deal with from the xui side?
-		app.HandleXuiActions();
+		app.HandleUIActions();
 
 		isF11Pressed = (GetAsyncKeyState(VK_F11) & 0x8000) != 0;
 
@@ -903,6 +931,19 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 		wasF11Pressed = isF11Pressed;
 
+		if(app.GetGameStarted())
+		{
+			if(ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad()))
+			{
+				if(launchArgs.vsync) RenderManager.SetVSync(true);
+			}
+			else
+			{
+				if(launchArgs.vsync) RenderManager.SetVSync(false);
+			}
+		}
+		if(launchArgs.vsync && !app.GetGameStarted()) RenderManager.SetVSync(true);
+
 		// 4J-PB - Update the trial timer display if we are in the trial version
 		if(!ProfileManager.IsFullVersion())
 		{
@@ -932,6 +973,10 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		Vec3::resetPool();
 	}
 
+	//str1k3r - shutdown server & network manager
+	MinecraftServer::HaltServer();
+	g_NetworkManager.Terminate();
+
 	//str1k3r - unregister the minecraft window class
 	UnregisterClass("MinecraftClass", g_hInst);
 

Minecraft.Client/Windows64/Windows64_Minecraft.h

@@ -19,4 +19,5 @@ struct Windows64LaunchArgs
 	bool fullscreen;
 	int resolution;
 	bool vsync;
+	bool name;
 };

Minecraft.Client/Windows64/Windows64_UIController.cpp

@@ -95,12 +95,37 @@ void ConsoleUIController::render()
 #endif
 }
 
-//str1k3r - update gdraw resolution
-void ConsoleUIController::updateResolution(S32 w, S32 h)
+//str1k3r - since we have to update the resolution in 3 spots this just updates them all
+void ConsoleUIController::updateResolution(int w, int h)
 {
 #ifdef _ENABLEIGGY
-	gdraw_D3D11_SetRendertargetSize(w, h);
+    S32 currentWidth = ui.getScreenWidth();
+    S32 currentHeight = ui.getScreenHeight();
+
+	ui.setScreenWidth(w);
+	ui.setScreenHeight(h);
+    gdraw_D3D11_SetRendertargetSize(w, h);
+	/*gdraw_D3D11_setViewport_4J();
+
+    if(w != currentWidth || h != currentHeight)
+    {
+
+        // PIEBOT: we buy junk code
+        int argumentRes = (w >= 1920.0f) ? 1920 :
+			(w >= 1280) ? 1280 :
+            (w >= 960.0f) ? 960 :
+            480;
+
+        int currentRes = (currentWidth >= 1920.0f) ? 1920 :
+			(currentWidth >= 1280.0f) ? 1280 :
+            (currentWidth >= 960.0f) ? 960 :
+            480;
+
+        if (argumentRes != currentRes)
+            ui.ReloadSkins();
+    }*/
 #endif
+	RenderManager.setResolution(w, h);
 }
 
 void ConsoleUIController::beginIggyCustomDraw4J(IggyCustomDrawCallbackRegion *region, CustomDrawData *customDrawRegion)

Minecraft.Client/Windows64/Windows64_UIController.h

@@ -12,7 +12,7 @@ public:
 
 	void render();
 	//str1k3r - updateResolution is a Windows64 exlusive thingy :3
-	void updateResolution(S32 w, S32 h);
+	void updateResolution(int w, int h);
 	void beginIggyCustomDraw4J(IggyCustomDrawCallbackRegion *region, CustomDrawData *customDrawRegion);
 	virtual CustomDrawData *setupCustomDraw(UIScene *scene, IggyCustomDrawCallbackRegion *region);
 	virtual CustomDrawData *calculateCustomDraw(IggyCustomDrawCallbackRegion *region);