fix: networking fixes + add server

major bug: when connecting to the server a second time, it gets softlocked and keeps repeating ticking connection A\n in debug logs until it times out.

.gitea/workflows/release.yaml

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

.gitignore

@@ -6,15 +6,24 @@
 /*Release*
 /*ContentPackage*
 
+# Minecraft.Server
+/Minecraft.Server/x64
+/Minecraft.Server/x64_*
+/Minecraft.Server/*Debug
+/Minecraft.Server/*Release*
+/Minecraft.Server/*Server*
+/Minecraft.Server/*ContentPackage*
+
 # Minecraft.Client
 /Minecraft.Client/x64
 /Minecraft.Client/x64_*
 /Minecraft.Client/*Debug
 /Minecraft.Client/*Release*
+/Minecraft.Client/*Server*
 /Minecraft.Client/*ContentPackage*
 /Minecraft.Client/Windows64/GameHDD
 
-# Minecraft.world
+# Minecraft.World
 /Minecraft.World/x64
 /Minecraft.World/x64_*
 /Minecraft.World/*Debug
@@ -43,4 +52,4 @@ Minecraft.Client/Common/Media/XURs
 *.opensdf
 *.v11.suo
 *.vcxproj.user
-*.aps
+*.aps

Minecraft.Client/BufferedImage.cpp

@@ -93,13 +93,14 @@ 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();
 
@@ -114,9 +115,20 @@ 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/Chunk.cpp

@@ -402,6 +402,7 @@ void Chunk::rebuild()
 						}
 						
 						Tile *tile = Tile::tiles[tileId];
+						if (!tile) continue;
 						if (currentLayer == 0 && tile->isEntityTile())
 						{
 							shared_ptr<TileEntity> et = region->getTileEntity(x, y, z);
@@ -739,9 +740,9 @@ void Chunk::rebuild_SPU()
 				{
 					// 4J - get tile from those copied into our local array in earlier optimisation
 					unsigned char tileId = pOutData->getTile(x,y,z);
-					if (tileId > 0)
+					if (tileId > 0 && tileId != 0xff)
 					{
-						if (currentLayer == 0 && Tile::tiles[tileId]->isEntityTile())
+						if (currentLayer == 0 && Tile::tiles[tileId] && Tile::tiles[tileId]->isEntityTile())
 						{
 							shared_ptr<TileEntity> et = region.getTileEntity(x, y, z);
 							if (TileEntityRenderDispatcher::instance->hasRenderer(et))
@@ -754,6 +755,7 @@ void Chunk::rebuild_SPU()
 						{
 
 							Tile *tile = Tile::tiles[tileId];
+							if (!tile) continue;
 							int renderLayer = tile->getRenderLayer();
 
 							if (renderLayer != currentLayer)

Minecraft.Client/ClientConnection.cpp

@@ -50,11 +50,16 @@
 #else
 #include "Common\UI\UI.h"
 #endif
-#ifdef __PS3__
+#if defined __PS3__ && !defined DISABLE_PSN
 #include "PS3/Network/SonyVoiceChat.h"
 #endif
 #include "DLCTexturePack.h"
 
+#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
+#include "Xbox\Network\NetworkPlayerXbox.h"
+#include "Common\Network\PlatformNetworkManager.h"
+#endif
+
 #ifdef _DURANGO
 #include "..\Minecraft.World\DurangoStats.h"
 #include "..\Minecraft.World\GenericStats.h"
@@ -298,6 +303,10 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
 			level->isClientSide = true;
 			minecraft->setLevel(level);	
 		}
+		else
+		{
+			level = (MultiPlayerLevel *)dimensionLevel;
+		}
 
 		minecraft->player->setPlayerIndex( packet->m_playerIndex );
 		minecraft->player->setCustomSkin( app.GetPlayerSkinId(m_userIndex) );
@@ -771,6 +780,7 @@ void ClientConnection::handleAddPlayer(shared_ptr<AddPlayerPacket> packet)
 	player->yRotp = packet->yRot;
 	player->yHeadRot = packet->yHeadRot * 360 / 256.0f;
 	player->setXuid(packet->xuid);
+	player->setOnlineXuid(packet->OnlineXuid);
 
 #ifdef _DURANGO
 	// On Durango request player display name from network manager
@@ -781,6 +791,32 @@ void ClientConnection::handleAddPlayer(shared_ptr<AddPlayerPacket> packet)
 	player->m_displayName = player->name;
 #endif
 
+#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
+	{
+		PlayerUID netXuid = packet->OnlineXuid;
+		const PlayerUID WIN64_XUID_BASE = (PlayerUID)0xe000d45248242f2e;
+		if (netXuid >= WIN64_XUID_BASE && netXuid < WIN64_XUID_BASE + MINECRAFT_NET_MAX_PLAYERS)
+		{
+			BYTE smallId = (BYTE)(netXuid - WIN64_XUID_BASE);
+			INetworkPlayer *np = g_NetworkManager.GetPlayerBySmallId(smallId);
+			if (np != NULL)
+			{
+				NetworkPlayerXbox *npx = (NetworkPlayerXbox *)np;
+				IQNetPlayer *qp = npx->GetQNetPlayer();
+				if (qp != NULL)
+				{
+					wcsncpy(qp->m_gamertag, packet->name.c_str(), 31);
+					qp->m_gamertag[31] = L'\0';
+					if (g_NetworkManager.IsHost())
+					{
+						g_NetworkManager.UpdateAndSetGameSessionData();
+					}
+				}
+			}
+		}
+	}
+#endif
+
 	//	printf("\t\t\t\t%d: Add player\n",packet->id,packet->yRot);
 
 	int item = packet->carriedItem;
@@ -1004,6 +1040,7 @@ void ClientConnection::handleChunkVisibility(shared_ptr<ChunkVisibilityPacket> p
 void ClientConnection::handleChunkTilesUpdate(shared_ptr<ChunkTilesUpdatePacket> packet)
 {
 	// 4J - changed to encode level in packet
+	if (packet->levelIdx >= minecraft->levels.length) return;
 	MultiPlayerLevel *dimensionLevel = (MultiPlayerLevel *)minecraft->levels[packet->levelIdx];
 	if( dimensionLevel )
 	{
@@ -1073,6 +1110,7 @@ void ClientConnection::handleChunkTilesUpdate(shared_ptr<ChunkTilesUpdatePacket>
 void ClientConnection::handleBlockRegionUpdate(shared_ptr<BlockRegionUpdatePacket> packet)
 {
 	// 4J - changed to encode level in packet
+	if (packet->levelIdx >= minecraft->levels.length) return;
 	MultiPlayerLevel *dimensionLevel = (MultiPlayerLevel *)minecraft->levels[packet->levelIdx];
 	if( dimensionLevel )
 	{
@@ -1130,6 +1168,8 @@ void ClientConnection::handleTileUpdate(shared_ptr<TileUpdatePacket> packet)
 		destroyTilePacket = true;
 	}
 	// 4J - changed to encode level in packet
+	if (packet->levelIdx >= minecraft->levels.length) return;
+
 	MultiPlayerLevel *dimensionLevel = (MultiPlayerLevel *)minecraft->levels[packet->levelIdx];
 	if( dimensionLevel )
 	{
@@ -1365,7 +1405,7 @@ void ClientConnection::handleChat(shared_ptr<ChatPacket> packet)
 		break;
 	case ChatPacket::e_ChatCannotPlaceLava:
 		displayOnGui = false;
-		app.SetGlobalUIAction(eAppAction_DisplayLavaMessage);
+		app.SetGlobalXuiAction(eAppAction_DisplayLavaMessage);
 		break;
 	case ChatPacket::e_ChatDeathInFire:
 		message=app.GetString(IDS_DEATH_INFIRE);
@@ -1769,6 +1809,7 @@ void ClientConnection::handleEntityActionAtPosition(shared_ptr<EntityActionAtPos
 
 void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 {
+	app.DebugPrintf("ClientConnection::handlePreLogin ENTER (user %d)\n", m_userIndex);
 //	printf("Client: handlePreLogin\n");
 #if 1
 	// 4J - Check that we can play with all the players already in the game who have Friends-Only UGC set
@@ -1794,6 +1835,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 	}
 
 #ifdef _XBOX
+#if !defined(_DISABLE_XBLIVE)
 	if(!g_NetworkManager.IsHost() && !app.GetGameHostOption(eGameHostOption_FriendsOfFriends))
 	{
 		if(m_userIndex == ProfileManager.GetPrimaryPad() )
@@ -1937,6 +1979,16 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 			}
 		}
 	}
+#else
+	// Offline/system-link games have no Xbox Live friend list, so grant all
+	// pre-login permissions (the Xbox Live-only checks above would otherwise
+	// fail and reject the client's own pre-login before Login is ever sent).
+	canPlay = TRUE;
+	canPlayLocal = TRUE;
+	isAtLeastOneFriend = TRUE;
+	isFriendsWithHost = TRUE;
+	cantPlayContentRestricted = FALSE;
+#endif // _DISABLE_XBLIVE
 #else
 	// TODO - handle this kind of things for non-360 platforms
 	canPlay = TRUE;
@@ -1944,7 +1996,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 	isAtLeastOneFriend = TRUE;
 	cantPlayContentRestricted= FALSE;
 
-#if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
+#if !defined DISABLE_PSN && ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
 
 	if(!g_NetworkManager.IsHost() && !app.GetGameHostOption(eGameHostOption_FriendsOfFriends))
 	{
@@ -2226,7 +2278,8 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 		}
 		BOOL allAllowed, friendsAllowed;
 		ProfileManager.AllowedPlayerCreatedContent(m_userIndex,true,&allAllowed,&friendsAllowed);
-		send( shared_ptr<LoginPacket>( new LoginPacket(minecraft->user->name, SharedConstants::NETWORK_PROTOCOL_VERSION, offlineXUID, onlineXUID, (allAllowed!=TRUE && friendsAllowed==TRUE), 
+		app.DebugPrintf("ClientConnection::handlePreLogin SENDING LoginPacket (user %d)\n", m_userIndex);
+		send( shared_ptr<LoginPacket>( new LoginPacket(minecraft->user->name, SharedConstants::NETWORK_PROTOCOL_VERSION, offlineXUID, onlineXUID, (allAllowed!=TRUE && friendsAllowed==TRUE),
 			packet->m_ugcPlayersVersion, app.GetPlayerSkinId(m_userIndex), app.GetPlayerCapeId(m_userIndex), ProfileManager.IsGuest( m_userIndex ))));
 
 		if(!g_NetworkManager.IsHost() )
@@ -2276,6 +2329,7 @@ void ClientConnection::handleAddMob(shared_ptr<AddMobPacket> packet)
 	float xRot = packet->xRot * 360 / 256.0f;
 
 	shared_ptr<LivingEntity> mob = dynamic_pointer_cast<LivingEntity>(EntityIO::newById(packet->type, level));
+	if (mob == NULL) return;
 	mob->xp = packet->x;
 	mob->yp = packet->y;
 	mob->zp = packet->z;
@@ -3519,10 +3573,12 @@ void ClientConnection::handleCustomPayload(shared_ptr<CustomPayloadPacket> custo
 			}
 #else
 			UIScene *scene = ui.GetTopScene(m_userIndex, eUILayer_Scene);
-			UIScene_TradingMenu *screen = (UIScene_TradingMenu *)scene;
-			trader = screen->getMerchant();
+			UIScene_TradingMenu *screen = dynamic_cast<UIScene_TradingMenu *>(scene);
+			if (screen != NULL)
+				trader = screen->getMerchant();
 #endif
 			
+			if (trader == NULL) return;
 			MerchantRecipeList *recipeList = MerchantRecipeList::createFromStream(&input);
 			trader->overrideOffers(recipeList);
 		}

Minecraft.Client/Common/App_enums.h

@@ -31,7 +31,7 @@ enum eFont
 	eFont_None, // to fallback to nothing
 };
 
-enum eUIAction
+enum eXuiAction
 {
 	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 eUIServerAction
+enum eXuiServerAction
 {
-	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
+	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
 };
 
 enum eGameSetting

Minecraft.Client/Common/App_structs.h

@@ -138,9 +138,9 @@ typedef std::vector <PBANNEDLISTDATA> VBANNEDLIST;
 typedef struct
 {
 	int iPad;
-	eUIAction action;
+	eXuiAction action;
 } 
-UIActionParam;
+XuiActionParam;
 
 // tips
 typedef struct 
@@ -162,7 +162,7 @@ MOJANG_DATA;
 typedef struct  
 {
 	eDLCContentType eDLCType;
-#if defined( __PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined( __PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
 	char chImageURL[256];//SCE_NP_COMMERCE2_URL_LEN
 #else
 

Minecraft.Client/Common/Audio/SoundEngine.cpp

@@ -1100,7 +1100,7 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 {
 #ifdef __DISABLE_MILES__
 	return 0;
-#else
+#endif
 	SoundEngine *soundEngine = (SoundEngine *)lpParameter;
 	soundEngine->m_hStream = AIL_open_stream(soundEngine->m_hDriver,soundEngine->m_szStreamName,0);
 
@@ -1111,7 +1111,6 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 	}
 #endif
 	return 0;
-#endif
 }
 
 /////////////////////////////////////////////
@@ -1121,7 +1120,8 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 /////////////////////////////////////////////
 void SoundEngine::playMusicTick() 
 {
-#ifndef __PSVITA__ // AP - vita will update the music during the mixer callback
+// AP - vita will update the music during the mixer callback
+#ifndef __PSVITA__
 	playMusicUpdate();
 #endif
 }
@@ -1156,6 +1156,10 @@ 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())
@@ -1167,12 +1171,13 @@ void SoundEngine::playMusicUpdate()
 			{
 				sprintf(m_szStreamName,"%s/%s",getUsrDirPath(), m_szMusicPath );
 			}
-#elif (defined __PSVITA__ || __ORBIS__)
+#else
 			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())
@@ -1244,11 +1249,32 @@ void SoundEngine::playMusicUpdate()
 					SetIsPlayingStreamingCDMusic(false);
 					m_MusicType=eMusicType_Game;
 					m_StreamingAudioInfo.bIs3D=false;
-				}		
+				}
 				else if(m_musicID<m_iStream_CD_1)
-#else
+				{
+					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);
@@ -1268,6 +1294,8 @@ 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

@@ -26,7 +26,7 @@ foreach ($dir in $directories) {
 $folderCopies = @(
     @{ Source = "Common\Media\Font";	Dest = "Common\Media\Font" },
     @{ Source = "Common\res";      		 Dest = "Common\res" },
-	@{ Source = "Durango\Sound";      	 Dest = "Sound" },
+	@{ Source = "DurangoMedia\Sound";    Dest = "Sound" },
 	@{ Source = "DurangoMedia\DLC";      Dest = "DLC" },
 	@{ Source = "DurangoMedia\Tutorial"; Dest = "Tutorial" },
 	@{ Source = "music";      			 Dest = "music" },
@@ -40,6 +40,8 @@ foreach ($copy in $folderCopies) {
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+    } else {
+        Write-Host "Durango Postbuild: Folder not found, skipping: $src"
     }
 }
 
@@ -54,13 +56,13 @@ foreach ($copy in $fileCopies) {
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
-	}
+	} else {
+        Write-Host "Durango Postbuild: File not found, skipping: $src"
+    }
 }
 
 $deleteDirs = @(
-    "Common\Media\font\RU",
-    "Common\res\TitleUpdate\DLC",
-    "Common\res\TitleUpdate\Audio"
+    "Common\Media\font\RU"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -72,14 +74,13 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"Common\Media\font",
-	"Common\Media\font\*",
-    "Common\res\TitleUpdate\GameRules"
+	"Common\Media\font\*"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        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 |
+        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 |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -25,12 +25,12 @@ $folderCopies = @(
     @{ Source = "music";		    Dest = "PS4_GAME\music" },
     @{ Source = "Common\Media\Font";Dest = "PS4_GAME\Common\Media\Font" },
     @{ Source = "Common\res";       Dest = "PS4_GAME\Common\res" },
-	@{ Source = "Orbis\Sound";     Dest = "PS4_GAME\Orbis\Sound" },
+	@{ Source = "OrbisMedia\Sound"; Dest = "PS4_GAME\Orbis\Sound" },
     @{ Source = "OrbisMedia\DLC";   Dest = "PS4_GAME\Orbis\DLC" },
     @{ Source = "Orbis\DLCImages";  Dest = "PS4_GAME\Orbis\DLCImages" },
     @{ Source = "OrbisMedia\Tutorial";  Dest = "PS4_GAME\Orbis\Tutorial" },
-    @{ Source = "$env:SCE_ORBIS_SDK_DIR\target\sce_module"; Dest = "PS4_GAME\sce_module" },
-    @{ Source = Join-Path $PSScriptRoot "Contents\Orbis\sce_gls";	Dest = "PS4_GAME\sce_gls" },
+    @{ Source = "$env:SCE_ORBIS_SDK_DIR\target\sce_module";       Dest = "PS4_GAME\sce_module" },
+    @{ Source = Join-Path $PSScriptRoot "Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" },
     @{ Source = Join-Path $PSScriptRoot "Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" }
 )
 
@@ -44,7 +44,9 @@ foreach ($copy in $folderCopies) {
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
-	}
+	} else {
+        Write-Host "Orbis Postbuild: Folder not found, skipping: $src"
+    }
 }
 
 $fileCopies = @(
@@ -58,7 +60,9 @@ foreach ($copy in $fileCopies) {
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
-	}
+	} else {
+        Write-Host "Orbis Postbuild: File not found, skipping: $src"
+    }
 }
 
 $builtFile = Join-Path $OutDir "Minecraft.Client.elf"
@@ -72,9 +76,7 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS4_GAME\Common\Media\font\RU",
-    "PS4_GAME\Common\res\TitleUpdate\DLC",
-    "PS4_GAME\Common\res\TitleUpdate\Audio"
+    "PS4_GAME\Common\Media\font\RU"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -86,14 +88,13 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"PS4_GAME\Common\Media\font",
-	"PS4_GAME\Common\Media\font\*",
-    "PS4_GAME\Common\res\TitleUpdate\GameRules"
+	"PS4_GAME\Common\Media\font\*"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -24,18 +24,24 @@ $folderCopies = @(
     @{ Source = "Common\Media\Font";Dest = "PS3_GAME\USRDIR\Common\Media\Font" },
     @{ Source = "Common\res";       Dest = "PS3_GAME\USRDIR\Common\res" },
 	@{ Source = "PS3Media\DLC";		Dest = "PS3_GAME\USRDIR\DLC" },
-	@{ Source = "PS3\Sound";        Dest = "PS3_GAME\USRDIR\PS3\Sound" },
+    @{ Source = "PS3Media\Sound";   Dest = "PS3_GAME\USRDIR\PS3\Sound" },
 	#@{ Source = "PSVita\Tutorial"; Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }, # str1k3r - softlocks game
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\LICDIR";  Dest = "PS3_GAME\LICDIR" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\TROPDIR"; Dest = "PS3_GAME\TROPDIR" }
 )
 
 foreach ($copy in $folderCopies) {
-    $src = Join-Path $ProjectDir $copy.Source
+    if ([System.IO.Path]::IsPathRooted($copy.Source)) {
+        $src = $copy.Source
+    } else {
+        $src = Join-Path $ProjectDir $copy.Source
+    }
     $dst = Join-Path $OutDir $copy.Dest
 
     if (Test-Path $src) {
 		xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+    } else {
+        Write-Host "PS3 Postbuild: Folder not found, skipping: $src"
     }
 }
 
@@ -58,7 +64,9 @@ foreach ($copy in $fileCopies) {
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
-	}
+	} else {
+        Write-Host "PS3 Postbuild: File not found, skipping: $src"
+    }
 }
 
 if ($Configuration -match "ContentPackage") {
@@ -77,9 +85,7 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS3_GAME\USRDIR\Common\Media\font\RU",
-    "PS3_GAME\USRDIR\Common\res\TitleUpdate\DLC",
-    "PS3_GAME\USRDIR\Common\res\TitleUpdate\Audio"
+    "PS3_GAME\USRDIR\Common\Media\font\RU"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -91,14 +97,13 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
     "PS3_GAME\USRDIR\Common\Media\font",
-    "PS3_GAME\USRDIR\Common\Media\font\*",
-    "PS3_GAME\USRDIR\Common\res\TitleUpdate\GameRules"
+    "PS3_GAME\USRDIR\Common\Media\font\*"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -12,7 +12,8 @@ $directories = @(
 	"PSVITA_GAME\Common\res",
     "PSVITA_GAME\Common\Media",
     "PSVITA_GAME\PSVita\Sound",
-    "PSVITA_GAME\PSVita\Tutorial"
+    "PSVITA_GAME\PSVita\Tutorial",
+	"PSVITA_GAME\savedata"
 )
 
 foreach ($dir in $directories) {
@@ -20,14 +21,14 @@ foreach ($dir in $directories) {
 }
 
 $folderCopies = @(
-    @{ Source = "music";		   Dest = "PSVITA_GAME\music" },
+    @{ Source = "music";		     Dest = "PSVITA_GAME\music" },
     @{ Source = "Common\Media\Font"; Dest = "PSVITA_GAME\Common\Media\Font" },
-    @{ Source = "Common\res";      Dest = "PSVITA_GAME\Common\res" },
-	@{ Source = "PSVita\Sound";    Dest = "PSVITA_GAME\PSVita\Sound" },
-	@{ Source = "PSVitaMedia\DLC"; Dest = "PSVITA_GAME\PSVita\DLC" },
-    @{ Source = "PSVita\Tutorial"; Dest = "PSVITA_GAME\PSVita\Tutorial" },
-	@{ Source = "$env:SCE_PSP2_SDK_DIR\target\sce_module";      Dest = "PSVITA_GAME\sce_module" },
-    @{ Source = Join-Path $PSScriptRoot "Contents\PSVita\sce_sys";    Dest = "PSVITA_GAME\sce_sys" }
+    @{ Source = "Common\res";        Dest = "PSVITA_GAME\Common\res" },
+	@{ Source = "PSVitaMedia\Sound"; Dest = "PSVITA_GAME\PSVita\Sound" },
+	@{ Source = "PSVitaMedia\DLC";   Dest = "PSVITA_GAME\PSVita\DLC" },
+    @{ Source = "PSVita\Tutorial";   Dest = "PSVITA_GAME\PSVita\Tutorial" },
+	@{ Source = "$env:SCE_PSP2_SDK_DIR\target\sce_module";         Dest = "PSVITA_GAME\sce_module" },
+    @{ Source = Join-Path $PSScriptRoot "Contents\PSVita\sce_sys"; Dest = "PSVITA_GAME\sce_sys" }
 )
 
 foreach ($copy in $folderCopies) {
@@ -40,7 +41,9 @@ foreach ($copy in $folderCopies) {
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
-	}
+	} else {
+        Write-Host "PSVita Postbuild: Folder not found, skipping: $src"
+    }
 }
 
 $fileCopies = @(
@@ -55,7 +58,9 @@ foreach ($copy in $fileCopies) {
     if (Test-Path $src) {
         New-Item -ItemType Directory -Path (Split-Path $dst -Parent) -Force | Out-Null
         Copy-Item -Path $src -Destination $dst -Force
-	}
+	} else {
+        Write-Host "PSVita Postbuild: File not found, skipping: $src"
+    }
 }
 
 $builtFile = Join-Path $OutDir "Minecraft.Client.self"
@@ -69,9 +74,7 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PSVITA_GAME\Common\Media\font\RU",
-    "PSVITA_GAME\Common\res\TitleUpdate\DLC",
-    "PSVITA_GAME\Common\res\TitleUpdate\Audio"
+    "PSVITA_GAME\Common\Media\font\RU" 
 )
 
 foreach ($dir in $deleteDirs) {
@@ -83,14 +86,13 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"PSVITA_GAME\Common\Media\font",
-	"PSVITA_GAME\Common\Media\font\*",
-    "PSVITA_GAME\Common\res\TitleUpdate\GameRules"
+	"PSVITA_GAME\Common\Media\font\*"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, *.mcs, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -0,0 +1,85 @@
+param(
+    [string]$OutDir,
+    [string]$ProjectDir
+)
+
+Write-Host "Server Postbuild: script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
+
+$directories = @(
+    "Windows64\GameHDD",
+    "Common\Media",
+    "Common\res",
+	"redist64"
+)
+
+foreach ($dir in $directories) {
+    New-Item -ItemType Directory -Path (Join-Path $OutDir $dir) -Force | Out-Null
+}
+
+$folderCopies = @(
+    @{ Source = "Common\Media";    		Dest = "Common\Media" },
+    @{ Source = "Common\res";      		Dest = "Common\res" },
+	@{ Source = "Common\Postbuilds\Contents\Windows64\redist64"; Dest = "redist64" }
+)
+
+foreach ($copy in $folderCopies) {
+    $src = Join-Path "$ProjectDir\..\Minecraft.Client" $copy.Source
+    $dst = Join-Path $OutDir $copy.Dest
+
+    if (Test-Path $src) {
+        xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+    }
+}
+
+$fileCopies = @(
+    @{ Source = Join-Path "$ProjectDir\..\Minecraft.Client" "Windows64\4JLibs\4J_Input\Windows64\vendor\SDL\lib\x64\SDL3.dll"; Dest = "SDL3.dll" },
+	@{ Source = "Common\Media\MediaWindows64.arc";	Dest = "Common\Media\MediaWindows64.arc" },
+	@{ Source = Join-Path $PSScriptRoot "Contents\Windows64\mss64.dll"; Dest = "mss64.dll" },
+	@{ Source = "Windows64\Iggy\lib\redist64\iggy_w64.dll"; Dest = "iggy_w64.dll" }
+)
+
+foreach ($copy in $fileCopies) {
+    $src = $copy.Source
+    $dst = Join-Path $OutDir $copy.Dest
+    if (Test-Path $src) {
+        Copy-Item -Path $src -Destination $dst -Force
+	} else {
+        Write-Host "Server Postbuild: File not found, skipping: $src"
+    }
+}
+
+$deleteDirs = @(
+    "Common\Media\Sound",
+    "Common\Media\Graphics",
+	"Common\Media\de-DE",
+	"Common\Media\es-ES",
+	"Common\Media\fr-FR",
+	"Common\Media\it-IT",
+	"Common\Media\ja-JP",
+	"Common\Media\ko-KR",
+	"Common\Media\pt-BR",
+	"Common\Media\pt-PT",
+	"Common\Media\zh-CHT"
+)
+
+foreach ($dir in $deleteDirs) {
+    $path = Join-Path $OutDir $dir
+    if (Test-Path $path) {
+        Remove-Item $path -Recurse -Force -ErrorAction SilentlyContinue
+    }
+}
+
+$delDirs = @(
+    "Common\Media",
+    "Common\Media\font"
+)
+
+foreach ($dir in $delDirs) {
+    if ($delDirs -contains $dir) {
+        $path = Join-Path $OutDir $dir
+        if (Test-Path $path) {
+            Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File |
+                Remove-Item -Force -ErrorAction SilentlyContinue
+        }
+    }
+}

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

@@ -19,28 +19,34 @@ foreach ($dir in $directories) {
 
 $folderCopies = @(
     @{ Source = "music";                Dest = "music" },
-    @{ Source = "Common\Media";    		Dest = "Common\Media" },
     @{ Source = "Common\res";      		Dest = "Common\res" },
+    @{ Source = "Common\Media\Font";	Dest = "Common\Media\Font" },
     @{ Source = "Windows64Media\DLC";  	Dest = "Windows64Media\DLC" },
-	@{ Source = "Windows64\Sound"; 	Dest = "Windows64Media\Sound" },
-	#@{ Source = "PSVita\Tutorial"; 	 Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
+	@{ Source = "Windows64Media\Sound";	Dest = "Windows64Media\Sound" },
+	#@{ Source = "PSVita\Tutorial"; 	Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
 	@{ Source = "Windows64\Miles\lib\redist64"; Dest = "Windows64\redist64" }
 )
 
 foreach ($copy in $folderCopies) {
-    $src = Join-Path $ProjectDir $copy.Source
+    if ([System.IO.Path]::IsPathRooted($copy.Source)) {
+        $src = $copy.Source
+    } else {
+        $src = Join-Path $ProjectDir $copy.Source
+    }
     $dst = Join-Path $OutDir $copy.Dest
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+    } else {
+        Write-Host "Windows64 Postbuild: Folder not found, skipping: $src"
     }
 }
 
 $fileCopies = @(
     @{ Source = Join-Path $ProjectDir   "Windows64\4JLibs\4J_Input\Windows64\vendor\SDL\lib\x64\SDL3.dll"; Dest = "SDL3.dll" },
 	@{ Source = "Common\Media\MediaWindows64.arc";	Dest = "Common\Media\MediaWindows64.arc" },
-	@{ Source = Join-Path $PSScriptRoot "Contents\Windows64\iggy_w64.dll"; Dest = "iggy_w64.dll" },
-	@{ Source = Join-Path $PSScriptRoot "Contents\Windows64\mss64.dll"; Dest = "mss64.dll" }
+	@{ Source = Join-Path $PSScriptRoot "Contents\Windows64\mss64.dll"; Dest = "mss64.dll" },
+	@{ Source = "Windows64\Iggy\lib\redist64\iggy_w64.dll"; Dest = "iggy_w64.dll" }
 )
 
 foreach ($copy in $fileCopies) {
@@ -49,14 +55,12 @@ foreach ($copy in $fileCopies) {
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
 	} else {
-        Write-Host "Windows64 Postbuild: source not found, skipping: $src"
+        Write-Host "Windows64 Postbuild: File not found, skipping: $src"
     }
 }
 
 $deleteDirs = @(
-    "Common\Media\font\RU", #str1k3r - russian font?
-    "Common\res\TitleUpdate\DLC",
-    "Common\res\TitleUpdate\Audio"
+    "Common\Media\font\RU" #str1k3r - russian font?
 )
 
 foreach ($dir in $deleteDirs) {
@@ -68,14 +72,13 @@ foreach ($dir in $deleteDirs) {
 
 $delDirs = @(
 	"Common\Media\font",
-	"Common\Media\font\*",
-    "Common\res\TitleUpdate\GameRules"
+	"Common\Media\font\*"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        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 |
+        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 |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

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

@@ -24,6 +24,8 @@ foreach ($copy in $copies) {
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
+    } else {
+        Write-Host "Xbox Postbuild: Folder not found, skipping: $src"
     }
 }
 
@@ -43,22 +45,12 @@ $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
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
-	}
+	} else {
+        Write-Host "Xbox Postbuild: File not found, skipping: $src"
+    }
 }

Minecraft.Client/Common/Console_Utils.cpp

@@ -1,15 +1,27 @@
 #include "stdafx.h"
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+#include "../../Minecraft.Server/ServerLogManager.h"
+#endif
+
 
 //--------------------------------------------------------------------------------------
 // Name: DebugSpewV()
 // Desc: Internal helper function
 //--------------------------------------------------------------------------------------
 #ifndef _CONTENT_PACKAGE
-static VOID DebugSpewV( const CHAR* strFormat, const va_list pArgList )
+static VOID DebugSpewV( const CHAR* strFormat, va_list pArgList )
 {
 #if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
 	assert(0);
 #else
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+    // Dedicated server routes legacy debug spew through ServerLogger to preserve CLI prompt handling.
+    if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
+    {
+        ServerRuntime::ServerLogManager::ForwardClientDebugSpewLogV(strFormat, pArgList);
+        return;
+    }
+#endif
 	CHAR str[2048];
 	// Use the secure CRT to avoid buffer overruns. Specify a count of
 	// _TRUNCATE so that too long strings will be silently truncated

Minecraft.Client/Common/Consoles_App.cpp

@@ -30,6 +30,9 @@
 #include "GameRules\ConsoleGameRules.h"
 #include "GameRules\ConsoleSchematicFile.h"
 #include "..\User.h"
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+#include "..\..\Minecraft.Server\ServerLogManager.h"
+#endif
 #include "..\\EntityRenderDispatcher.h"
 #include "..\TexturePackRepository.h"
 #include "..\DLCTexturePack.h"
@@ -89,8 +92,8 @@ CMinecraftApp::CMinecraftApp()
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
 		m_eTMSAction[i]=eTMSAction_Idle;
-		m_eUIAction[i]=eAppAction_Idle;
-		m_eUIActionParam[i] = NULL;
+		m_eXuiAction[i]=eAppAction_Idle;
+		m_eXuiActionParam[i] = NULL;
 		//m_dwAdditionalModelParts[i] = 0;
 
 		if(FAILED(XUserGetSigninInfo(i,XUSER_GET_SIGNIN_INFO_OFFLINE_XUID_ONLY ,&m_currentSigninInfo[i])))
@@ -106,8 +109,8 @@ CMinecraftApp::CMinecraftApp()
 		m_uiOpacityCountDown[i]=0;
 
 	}
-	m_eGlobalUIAction=eAppAction_Idle;
-	m_eGlobalUIServerAction=eUIServerAction_Idle;
+	m_eGlobalXuiAction=eAppAction_Idle;
+	m_eGlobalXuiServerAction=eXuiServerAction_Idle;
 
 	m_bResourcesLoaded=false;
 	m_bGameStarted=false;
@@ -199,13 +202,13 @@ CMinecraftApp::CMinecraftApp()
 	//	m_uiTransferSlotC=5;
 #endif	
 
-#if (defined _CONTENT_PACAKGE || _XBOX)
+#if (defined _CONTENT_PACAKGE) || (defined _XBOX)
 	m_bUseDPadForDebug = false;
 #else
 	m_bUseDPadForDebug = true;
 #endif
 
-#if !(defined _WINDOWS64 || _XBOX)
+#if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
 		m_eOptionsStatusA[i]=C4JStorage::eOptions_Callback_Idle;
@@ -230,12 +233,21 @@ void CMinecraftApp::DebugPrintf(const char *szFormat, ...)
 {
 
 #ifndef _FINAL_BUILD
-	char    buf[1024];
-	va_list ap;
-	va_start(ap, szFormat);
-	vsnprintf(buf, sizeof(buf), szFormat, ap);
-	va_end(ap);
-	OutputDebugStringA(buf);
+    va_list ap;
+    va_start(ap, szFormat);
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+    // Dedicated server routes client debug spew through ServerLogger so CLI output stays prompt-safe.
+    if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
+    {
+        ServerRuntime::ServerLogManager::ForwardClientAppDebugLogV(szFormat, ap);
+        va_end(ap);
+        return;
+    }
+#endif
+    char    buf[1024];
+    vsnprintf(buf, sizeof(buf), szFormat, ap);
+    va_end(ap);
+    OutputDebugStringA(buf);
 #endif
 
 }
@@ -243,13 +255,22 @@ void CMinecraftApp::DebugPrintf(const char *szFormat, ...)
 void CMinecraftApp::DebugPrintf(int user, const char *szFormat, ...)
 {
 #ifndef _FINAL_BUILD
-	if(user == USER_NONE)
-		return;
-	char    buf[1024];
-	va_list ap;
-	va_start(ap, szFormat);
-	vsnprintf(buf, sizeof(buf), szFormat, ap);
-	va_end(ap);
+    if(user == USER_NONE)
+        return;
+    va_list ap;
+    va_start(ap, szFormat);
+#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+    // Dedicated server routes client debug spew through ServerLogger so CLI output stays prompt-safe.
+    if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
+    {
+        ServerRuntime::ServerLogManager::ForwardClientUserDebugLogV(user, szFormat, ap);
+        va_end(ap);
+        return;
+    }
+#endif
+    char    buf[1024];
+    vsnprintf(buf, sizeof(buf), szFormat, ap);
+    va_end(ap);
 #ifdef __PS3__
 	unsigned int writelen;
 	sys_tty_write(SYS_TTYP_USER1 + ( user - 1 ), buf, strlen(buf), &writelen );
@@ -301,25 +322,25 @@ LPCWSTR CMinecraftApp::GetString(int iID)
 	return app.m_stringTable->getString(iID);
 }
 
-void CMinecraftApp::SetAction(int iPad, eUIAction action, LPVOID param)
+void CMinecraftApp::SetAction(int iPad, eXuiAction action, LPVOID param)
 {
-	if( ( m_eUIAction[iPad] == eAppAction_ReloadTexturePack ) && ( action == eAppAction_EthernetDisconnected ) )
+	if( ( m_eXuiAction[iPad] == eAppAction_ReloadTexturePack ) && ( action == eAppAction_EthernetDisconnected ) )
 	{
-		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eUIAction[iPad], action);
+		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eXuiAction[iPad], action);
 	}
-	else if( ( m_eUIAction[iPad] == eAppAction_ReloadTexturePack ) && ( action == eAppAction_ExitWorld ) )
+	else if( ( m_eXuiAction[iPad] == eAppAction_ReloadTexturePack ) && ( action == eAppAction_ExitWorld ) )
 	{
-		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eUIAction[iPad], action);
+		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eXuiAction[iPad], action);
 	}
-	else if(m_eUIAction[iPad] == eAppAction_ExitWorldCapturedThumbnail && action != eAppAction_Idle)
+	else if(m_eXuiAction[iPad] == eAppAction_ExitWorldCapturedThumbnail && action != eAppAction_Idle)
 	{
-		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eUIAction[iPad], action);
+		app.DebugPrintf("Invalid change of App action for pad %d from %d to %d, ignoring\n", iPad, m_eXuiAction[iPad], action);
 	}
 	else
 	{
-		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;
+		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;
 	}
 }	
 
@@ -344,6 +365,30 @@ 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;
@@ -729,7 +774,7 @@ void CMinecraftApp::InitGameSettings()
 {
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
-#if !(defined _WINDOWS64 || _XBOX)
+#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
 		GameSettingsA[i]=(GAME_SETTINGS *)StorageManager.GetGameDefinedProfileData(i);
 #else
 		GameSettingsA[i]=(GAME_SETTINGS *)ProfileManager.GetGameDefinedProfileData(i);
@@ -740,20 +785,21 @@ 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
-#ifdef _WINDOWS64
+#if defined _WINDOWS64
 		C_4JProfile::PROFILESETTINGS *pProfileSettings=ProfileManager.GetDashboardProfileSettings(i);
 		SetDefaultOptions(pProfileSettings,i);
 		ProfileManager.LoadSettings(GameSettingsA[i], sizeof(GAME_SETTINGS));
 		ApplyGameSettingsChanged(i);
-#elif !defined(_XBOX)
+#elif defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__
 		C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
 		// 4J-PB - don't cause an options write to happen here
 		SetDefaultOptions(pProfileSettings,i,false);
+
 #endif
 	}
 }
 
-#if !(defined _WINDOWS64 || _XBOX)
+#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
 int CMinecraftApp::SetDefaultOptions(C4JStorage::PROFILESETTINGS *pSettings,const int iPad,bool bWriteProfile)
 #else
 int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,const int iPad)
@@ -846,7 +892,7 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
 
 	//#endif
 
-#if !(defined _WINDOWS64 || _XBOX)
+#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
 	GameSettingsA[iPad]->bSettingsChanged=bWriteProfile;
 #endif
 
@@ -874,7 +920,8 @@ int CMinecraftApp::DefaultOptionsCallback(LPVOID pParam,C_4JProfile::PROFILESETT
 	return 0;
 }
 
-#if !(defined _WINDOWS64 || _XBOX)
+#if ( defined  __PS3__  || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__)
+
 wstring CMinecraftApp::toStringOptionsStatus(const C4JStorage::eOptionsCallback &eStatus)
 {
 #ifndef _CONTENT_PACKAGE
@@ -1201,6 +1248,9 @@ 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
@@ -1323,7 +1373,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.SetUIServerAction(iPad,eUIServerAction_ServerSettingChanged_Difficulty);
+				app.SetXuiServerAction(iPad,eXuiServerAction_ServerSettingChanged_Difficulty);
 			}
 		}
 		else
@@ -1389,7 +1439,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.SetUIServerAction(iPad,eUIServerAction_ServerSettingChanged_Gamertags);
+				app.SetXuiServerAction(iPad,eXuiServerAction_ServerSettingChanged_Gamertags);
 
 				PlayerList *players = MinecraftServer::getInstance()->getPlayerList();
 				for(AUTO_VAR(it3, players->players.begin()); it3 != players->players.end(); ++it3)
@@ -1465,7 +1515,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.SetUIServerAction(iPad,eUIServerAction_ServerSettingChanged_BedrockFog);
+				app.SetXuiServerAction(iPad,eXuiServerAction_ServerSettingChanged_BedrockFog);
 			}
 		}
 		break;
@@ -2559,21 +2609,21 @@ int CMinecraftApp::DisplaySavingMessage(void *pParam, C4JStorage::ESavingMessage
 
 void CMinecraftApp::SetActionConfirmed(LPVOID param)
 {
-	UIActionParam *actionInfo = (UIActionParam *)param;
+	XuiActionParam *actionInfo = (XuiActionParam *)param;
 	app.SetAction(actionInfo->iPad, actionInfo->action);
 }
 
 
-void CMinecraftApp::HandleUIActions(void)
+void CMinecraftApp::HandleXuiActions(void)
 {
-	eUIAction eAction;
+	eXuiAction eAction;
 	eTMSAction eTMS;
 	LPVOID param;
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> player;
 
 	// are there any global actions to deal with?
-	eAction = app.GetGlobalUIAction();
+	eAction = app.GetGlobalXuiAction();
 	if(eAction!=eAppAction_Idle)
 	{
 		switch(eAction)
@@ -2584,7 +2634,7 @@ void CMinecraftApp::HandleUIActions(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) SetGlobalUIAction(eAppAction_Idle);
+				if(result != C4JStorage::EMessage_Busy) SetGlobalXuiAction(eAppAction_Idle);
 
 			}
 			break;
@@ -2596,8 +2646,8 @@ void CMinecraftApp::HandleUIActions(void)
 	// are there any app actions to deal with?
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
 	{
-		eAction = app.GetUIAction(i);
-		param = m_eUIActionParam[i];
+		eAction = app.GetXuiAction(i);
+		param = m_eXuiActionParam[i];
 
 		if(eAction!=eAppAction_Idle)
 		{			
@@ -2632,7 +2682,7 @@ void CMinecraftApp::HandleUIActions(void)
 					bool bKeepHiding = false;
 					for(int j=0; j < XUSER_MAX_COUNT;++j)
 					{
-						if(app.GetUIAction(j) == eAppAction_SocialPostScreenshot)
+						if(app.GetXuiAction(j) == eAppAction_SocialPostScreenshot)
 						{
 							bKeepHiding = true;
 							break;
@@ -2754,7 +2804,7 @@ void CMinecraftApp::HandleUIActions(void)
 					SetAction(i,eAppAction_Idle);
 
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
-					app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_AutoSaveGame);
+					app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_AutoSaveGame);
 
 					if(app.GetGameHostOption(eGameHostOption_DisableSaving)) StorageManager.SetSaveDisabled(true);
 #else
@@ -3236,7 +3286,7 @@ void CMinecraftApp::HandleUIActions(void)
 						pMinecraft->localplayers[i]->respawn();
 
 						// If the respawn requires a dimension change then the action will have changed
-						//if(app.GetUIAction(i) == eAppAction_Respawn)
+						//if(app.GetXuiAction(i) == eAppAction_Respawn)
 						//{
 						//	SetAction(i,eAppAction_Idle);
 						//	CloseXuiScenes(i);
@@ -4860,11 +4910,13 @@ void CMinecraftApp::SignInChangeCallback(LPVOID pParam,bool bPrimaryPlayerChange
 				// 4J Stu - On PS4 we can also cause to exit players if they are signed out here, but we shouldn't do that if
 				// we are going to switch to an offline game as it will likely crash due to incompatible parallel processes
 				bool switchToOffline = false;
+#ifndef _DISABLE_XBLIVE
 				// If it's an online game, and the primary profile is no longer signed into LIVE then we act as if disconnected
 				if( !ProfileManager.IsSignedInLive( ProfileManager.GetLockedProfile() ) && !g_NetworkManager.IsLocalGame() )
 				{
 					switchToOffline = true;
 				}
+#endif
 
 				//printf("Old: %x, New: %x, Changed: %x\n", m_ulLastSignInData, ulSignInData, changedPlayers);
 				for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
@@ -4929,6 +4981,7 @@ void CMinecraftApp::SignInChangeCallback(LPVOID pParam,bool bPrimaryPlayerChange
 
 				g_NetworkManager.HandleSignInChange();
 			}
+#ifndef _DISABLE_XBLIVE
 			// Some menus require the player to be signed in to live, so if this callback happens and the primary player is
 			// no longer signed in then nav back
 			else if ( pApp->GetLiveLinkRequired() && !ProfileManager.IsSignedInLive( ProfileManager.GetLockedProfile() ) )
@@ -4940,6 +4993,7 @@ void CMinecraftApp::SignInChangeCallback(LPVOID pParam,bool bPrimaryPlayerChange
 				pApp->SetAction(iPrimaryPlayer,eAppAction_EthernetDisconnected);
 			}
 			}
+#endif
 
 #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__ )
 			// 4J-JEV: Need to kick of loading of profile data for sub-sign in players.
@@ -5065,6 +5119,9 @@ void CMinecraftApp::NotificationsCallback(LPVOID pParam,DWORD dwNotification, un
 #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 int CMinecraftApp::MustSignInFullVersionPurchaseReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
+#ifdef DISABLE_PSN
+	return 0;
+#else
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #ifdef __PS3__
@@ -5077,11 +5134,15 @@ int CMinecraftApp::MustSignInFullVersionPurchaseReturned(void *pParam,int iPad,C
 	}
 
 	return 0;
+#endif
 }
 
 #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
+#ifdef DISABLE_PSN
+	return 0;
+#else
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #ifdef __PS3__
@@ -5097,6 +5158,7 @@ int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial(void *pParam,i
 	app.SetAction(iPad,eAppAction_ExitWorldTrial);	
 
 	return 0;
+#endif
 }
 #endif
 
@@ -6430,7 +6492,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__ || _XBOX)
+#if !(defined __ORBIS__ || __PS3__)
 	text = replaceAll(text, L"{*CONTROLLER_VK_START*}",			GetVKReplacement(VK_PAD_START		) );
 	text = replaceAll(text, L"{*CONTROLLER_VK_BACK*}",			GetVKReplacement(VK_PAD_BACK		) );
 #endif
@@ -6748,7 +6810,7 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
 #endif
 }
 
-#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
 unordered_map<PlayerUID, MOJANG_DATA *, PlayerUID::Hash> CMinecraftApp::MojangData;
 unordered_map<int, char * >  CMinecraftApp::DLCTextures_PackID;
 unordered_map<string, DLC_INFO * >  CMinecraftApp::DLCInfo;
@@ -6759,6 +6821,12 @@ unordered_map<int, wstring >  CMinecraftApp::DLCTextures_PackID; // for mash-up
 //unordered_map<ULONGLONG,DLC_INFO * > CMinecraftApp::DLCInfo_Trial; // full offerid, dlc_info
 unordered_map<wstring,DLC_INFO * > CMinecraftApp::DLCInfo_Full; // full offerid, dlc_info
 unordered_map<wstring, wstring >  CMinecraftApp::DLCInfo_SkinName; // skin name, full offer id
+#elif defined(DISABLE_PSN)
+unordered_map<PlayerUID, MOJANG_DATA *, PlayerUID::Hash> CMinecraftApp::MojangData;
+unordered_map<int, ULONGLONG >  CMinecraftApp::DLCTextures_PackID;
+unordered_map<ULONGLONG, DLC_INFO * >  CMinecraftApp::DLCInfo_Trial;
+unordered_map<ULONGLONG, DLC_INFO * >  CMinecraftApp::DLCInfo_Full;
+unordered_map<wstring, ULONGLONG >  CMinecraftApp::DLCInfo_SkinName;
 #else
 unordered_map<PlayerUID, MOJANG_DATA *> CMinecraftApp::MojangData;
 unordered_map<int, ULONGLONG >  CMinecraftApp::DLCTextures_PackID;
@@ -6841,7 +6909,7 @@ HRESULT CMinecraftApp::RegisterConfigValues(WCHAR *pType, int iValue)
 	return hr;
 }
 
-#if (defined _XBOX || defined _WINDOWS64)
+#if (defined _XBOX || defined _WINDOWS64 || defined DISABLE_PSN)
 HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGender, __uint64 ullOfferID_Full, __uint64 ullOfferID_Trial, WCHAR *pFirstSkin, unsigned int uiSortIndex, int iConfig, WCHAR *pDataFile)
 {
 	HRESULT hr=S_OK;
@@ -6858,12 +6926,20 @@ HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGe
 	// ignore the names if we don't recognize them
 	if(pBannerName!=L"")
 	{	
+#ifdef __PSVITA__
+		wcsncpy_s( pDLCData->wchBanner, MAX_BANNERNAME_SIZE, pBannerName, MAX_BANNERNAME_SIZE);
+#else
 		wcsncpy_s( pDLCData->wchBanner, pBannerName, MAX_BANNERNAME_SIZE);
+#endif
 	}
 
 	if(pDataFile[0]!=0)
 	{	
+#ifdef __PSVITA__
+		wcsncpy_s( pDLCData->wchDataFile, MAX_BANNERNAME_SIZE, pDataFile, MAX_BANNERNAME_SIZE);
+#else
 		wcsncpy_s( pDLCData->wchDataFile, pDataFile, MAX_BANNERNAME_SIZE);
+#endif
 	}
 #endif
 
@@ -7033,7 +7109,7 @@ HRESULT CMinecraftApp::RegisterDLCData(char *pchDLCName, unsigned int uiSortInde
 
 
 
-#if defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
 bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal)
 {
 	AUTO_VAR(it, DLCInfo_SkinName.find(FirstSkin));
@@ -7301,7 +7377,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForProductName(WCHAR *pwchProductName)
 	return NULL;
 }
 
-#elif defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#elif !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
 #else
 
 DLC_INFO *CMinecraftApp::GetDLCInfoForFullOfferID(ULONGLONG ullOfferID_Full)
@@ -7336,7 +7412,7 @@ void CMinecraftApp::EnterSaveNotificationSection()
 
 		if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
 		{
-			app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)TRUE);
+			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
 		}
 	}
 	}
@@ -7354,7 +7430,7 @@ void CMinecraftApp::LeaveSaveNotificationSection()
 
 		if( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 )
 		{
-			app.SetUIServerAction(ProfileManager.GetPrimaryPad(),eUIServerAction_PauseServer,(void *)FALSE);
+			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
 		}
 	}
 	}
@@ -7383,14 +7459,14 @@ int CMinecraftApp::RemoteSaveThreadProc( void* lpParameter )
 	pMinecraft->progressRenderer->progressStage( -1 );
 	pMinecraft->progressRenderer->progressStagePercentage(0);
 
-	while( !app.GetGameStarted() && app.GetUIAction( ProfileManager.GetPrimaryPad() ) == eAppAction_WaitRemoteServerSaveComplete )
+	while( !app.GetGameStarted() && app.GetXuiAction( ProfileManager.GetPrimaryPad() ) == eAppAction_WaitRemoteServerSaveComplete )
 	{
 		// Tick all the games connections
 		pMinecraft->tickAllConnections();
 		Sleep( 100 );
 	}
 
-	if( app.GetUIAction( ProfileManager.GetPrimaryPad() ) != eAppAction_WaitRemoteServerSaveComplete )
+	if( app.GetXuiAction( ProfileManager.GetPrimaryPad() ) != eAppAction_WaitRemoteServerSaveComplete )
 	{
 		// Something cancelled us?
 		return ERROR_CANCELLED;
@@ -9412,7 +9488,7 @@ byteArray CMinecraftApp::getArchiveFile(const wstring &filename)
 
 // DLC
 
-#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
 int CMinecraftApp::GetDLCInfoCount() 
 { 
 	return (int)DLCInfo.size();

Minecraft.Client/Common/Consoles_App.h

@@ -114,6 +114,7 @@ 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
@@ -159,17 +160,17 @@ public:
 	eGameMode		GetGameMode()																										{ return m_eGameMode;}
 	void			SetGameMode(eGameMode eMode)																						{ m_eGameMode=eMode;}
 
-	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);
+	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);
 	void			SetTMSAction(int iPad, eTMSAction action)																			{m_eTMSAction[iPad]=action; }	
 	eTMSAction      GetTMSAction(int iPad)																								{return m_eTMSAction[iPad];}
-	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;}
+	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;}
 
 	DisconnectPacket::eDisconnectReason	GetDisconnectReason()																			{ return m_disconnectReason; }
 	void			SetDisconnectReason(DisconnectPacket::eDisconnectReason bVal)														{ m_disconnectReason = bVal; }
@@ -183,7 +184,7 @@ public:
 
 	// 4J Stu - Added so that we can call this when a confirmation box is selected
 	static void		SetActionConfirmed(LPVOID param);
-	void			HandleUIActions(void);
+	void			HandleXuiActions(void);
 
 	// 4J Stu - Functions used for Minecon and other promo work
 	bool			GetLoadSavesFromFolderEnabled()																						{ return m_bLoadSavesFromFolderEnabled; }
@@ -445,6 +446,8 @@ private:
 
 	VBANNEDLIST *m_vBannedListA[XUSER_MAX_COUNT]; 
 
+	void HandleButtonPresses(int iPad);
+
 	bool m_bResourcesLoaded;
 
 	// Global string table for this application.
@@ -511,13 +514,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
-	eUIAction m_eUIAction[XUSER_MAX_COUNT];
+	eXuiAction m_eXuiAction[XUSER_MAX_COUNT];
 	eTMSAction m_eTMSAction[XUSER_MAX_COUNT];
-	LPVOID m_eUIActionParam[XUSER_MAX_COUNT];
-	eUIAction m_eGlobalUIAction;	
-	eUIServerAction m_eUIServerAction[XUSER_MAX_COUNT];
-	LPVOID m_eUIServerActionParam[XUSER_MAX_COUNT];
-	eUIServerAction m_eGlobalUIServerAction;
+	LPVOID m_eXuiActionParam[XUSER_MAX_COUNT];
+	eXuiAction m_eGlobalXuiAction;	
+	eXuiServerAction m_eXuiServerAction[XUSER_MAX_COUNT];
+	LPVOID m_eXuiServerActionParam[XUSER_MAX_COUNT];
+	eXuiServerAction m_eGlobalXuiServerAction;
 
 	bool m_bLiveLinkRequired;
 
@@ -591,7 +594,7 @@ public:
 	MOJANG_DATA *GetMojangDataForXuid(PlayerUID xuid);
 	static HRESULT RegisterConfigValues(WCHAR *pType, int iValue);
 
-#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
 	HRESULT RegisterDLCData(char *pchDLCName, unsigned int uiSortIndex, char *pchImageURL);
 	bool GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal);
 	DLC_INFO *GetDLCInfoForTrialOfferID(ULONGLONG ullOfferID_Trial);
@@ -628,7 +631,7 @@ private:
 
 	std::vector <SCreditTextItemDef *> vDLCCredits;
 
-#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
 	static unordered_map<PlayerUID,MOJANG_DATA *, PlayerUID::Hash > MojangData;
 	static unordered_map<int, char * >  DLCTextures_PackID; // for mash-up packs & texture packs
 	static unordered_map<string,DLC_INFO * > DLCInfo; 
@@ -639,6 +642,12 @@ private:
 	//static unordered_map<wstring,DLC_INFO * > DLCInfo_Trial; // full offerid, dlc_info
 	static unordered_map<wstring,DLC_INFO * > DLCInfo_Full; // full offerid, dlc_info
 	static unordered_map<wstring, wstring >  DLCInfo_SkinName; // skin name, full offer id
+#elif defined(DISABLE_PSN)
+	static unordered_map<PlayerUID,MOJANG_DATA *, PlayerUID::Hash > MojangData;
+	static unordered_map<int, ULONGLONG >  DLCTextures_PackID; // for mash-up packs & texture packs
+	static unordered_map<ULONGLONG,DLC_INFO * > DLCInfo_Trial; // full offerid, dlc_info
+	static unordered_map<ULONGLONG,DLC_INFO * > DLCInfo_Full; // full offerid, dlc_info
+	static unordered_map<wstring, ULONGLONG >  DLCInfo_SkinName; // skin name, full offer id
 #else
 	static unordered_map<PlayerUID,MOJANG_DATA * > MojangData;
 	static unordered_map<int, ULONGLONG >  DLCTextures_PackID; // for mash-up packs & texture packs
@@ -769,7 +778,7 @@ public:
 	void			ClearTMSPPFilesRetrieved();
 	unsigned int	AddTMSPPFileTypeRequest(eDLCContentType eType, bool bPromote=false);
 	int				GetDLCInfoTexturesOffersCount();
-#if defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
+#if !defined(DISABLE_PSN) && (defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
 	DLC_INFO *GetDLCInfo(int iIndex);	
 	DLC_INFO *GetDLCInfo(char *);
 	DLC_INFO *GetDLCInfoFromTPackID(int iTPID);

Minecraft.Client/Common/Leaderboards/base64.cpp

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

Minecraft.Client/Common/Leaderboards/base64.h

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