fix: Xbox 360 fixes

Fixes black text and newer DLCs crashing

.gitea/workflows/release-windows64.yaml

@@ -1,114 +0,0 @@
-name: Build & Release Windows64
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version tag for release (e.g. v1.0.0).'
-        required: true
-        default: ''
-      notes:
-        description: 'URL to notes for release.'
-        required: false
-        default: ''
-
-jobs:
-  validate:
-    runs-on: windows-2022
-    steps:
-      - name: Validate version format
-        run: |
-          if (-not ("${{ inputs.version }}" -match '^v\d+\.\d+\.\d+[a-zA-Z0-9.-]*$')) {
-            Write-Error "Version '${{ inputs.version }}' doesn't match expected format (e.g. v1.0.0)"
-            exit 1
-          }
-
-  build:
-    needs: validate
-    strategy:
-      matrix:
-        configuration: [ContentPackage]
-        platform: [Windows64]
-        include:
-        - platform: Windows64
-          sdk_label: windows-2022 # str1k3r - can run on any runner
-
-    runs-on: [windows-2022, "${{ matrix.sdk_label }}"]
-
-    steps:
-      - name: Checkout Repository
-        uses: https://github.com/actions/checkout@v4
-        with:
-          fetch-depth: 1
-          clean: false
-          lfs: false
-          submodules: true
-
-      - name: Build Cafeberry
-        run: |
-          & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
-            /p:Configuration=${{ matrix.configuration }} `
-            /p:Platform=${{ matrix.platform }} `
-            /m
-
-      - name: Zip Build
-        run: |
-            7z a -r "LCEWindows64.zip" "./x64/${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.ilk" "-x!*.lib" "-x!*.exp"
-
-      - name: Stage artifacts
-        run: |
-          New-Item -ItemType Directory -Force -Path staging
-          Copy-Item "LCE${{ matrix.platform }}.zip" staging/
-          Copy-Item "./x64/${{ matrix.configuration }}/Minecraft.Client.exe" staging/
-
-      - name: Upload artifacts
-        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
-        with:
-          name: build-${{ matrix.platform }}
-          path: staging/*
-          compression-level: 0
-
-  release:
-    needs: build
-    runs-on: windows-2022
-    steps:
-      - name: Download all build artifacts
-        uses: https://github.com/christopherHX/gitea-download-artifact@v4
-        with:
-          path: downloaded
-
-      - name: Fetch release notes
-        id: notes
-        run: |
-          $notesSource = "${{ inputs.notes }}"
-          $fallback = "## Cafeberry`n`n### Whoever made this release forgot to put notes, sorry!"
-
-          if ($notesSource -match '^https?://') {
-            try {
-              $body = (Invoke-WebRequest -Uri $notesSource -UseBasicParsing).Content
-              if ([string]::IsNullOrWhiteSpace($body)) { $body = $fallback }
-            } catch {
-              $body = $fallback
-            }
-          } else {
-            $body = $fallback
-          }
-
-          $delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))"
-          $content = "description<<$delimiter`n$body`n$delimiter`n"
-
-          $utf8NoBom = New-Object System.Text.UTF8Encoding($false)
-          [System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, $content, $utf8NoBom)
-
-      - name: Publish Release
-        uses: akkuman/gitea-release-action@v1
-        with:
-          name: ${{ inputs.version }}
-          server_url: ${{ gitea.server_url }}
-          repository: ${{ gitea.repository }}
-          token: ${{ gitea.token }}
-          tag_name: ${{ inputs.version }}
-          prerelease: false
-          verbose: true
-          files: downloaded/**/*
-          body: ${{ steps.notes.outputs.description }}

.gitea/workflows/release.yaml

@@ -45,12 +45,11 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: https://github.com/actions/checkout@v4
         with:
           fetch-depth: 1
           clean: false
           lfs: false
-          submodules: recursive
 
       - name: Build Cafeberry
         run: |

.gitignore

@@ -6,24 +6,15 @@
 /*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
@@ -37,10 +28,6 @@
 /Minecraft.Client/PS3/SPU_Tasks/*/Release
 /Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
 
-# Xbox 360 XZP & XURs
-Minecraft.Client/XboxMedia/XZP
-Minecraft.Client/Common/Media/XURs
-
 # Misc
 *.ppu.o
 *.pkg
@@ -52,4 +39,4 @@ Minecraft.Client/Common/Media/XURs
 *.opensdf
 *.v11.suo
 *.vcxproj.user
-*.aps
+*.aps

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "Minecraft.Client/Windows64/4JLibs"]
 	path = Minecraft.Client/Windows64/4JLibs
-	url = https://gitea.str1k3r.xyz/cafeberry/4JLibs.git
+	url = https://gitea.str1k3r.xyz/pieeebot/Cafeberry-4JLibs
 	ignore = untracked
 	branch = main

Minecraft.Client/AbstractTexturePack.cpp

@@ -248,7 +248,7 @@ void AbstractTexturePack::loadDefaultUI()
 	//CXuiSceneBase::GetInstance()->SetVisualPrefix(L"TexturePack");
 	CXuiSceneBase::GetInstance()->SkinChanged(CXuiSceneBase::GetInstance()->m_hObj);
 #else
-	ui.ReloadSkins();
+	ui.ReloadSkin();
 #endif
 }
 

Minecraft.Client/Chunk.cpp

@@ -402,7 +402,6 @@ 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);
@@ -740,9 +739,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 && tileId != 0xff)
+					if (tileId > 0)
 					{
-						if (currentLayer == 0 && Tile::tiles[tileId] && Tile::tiles[tileId]->isEntityTile())
+						if (currentLayer == 0 && Tile::tiles[tileId]->isEntityTile())
 						{
 							shared_ptr<TileEntity> et = region.getTileEntity(x, y, z);
 							if (TileEntityRenderDispatcher::instance->hasRenderer(et))
@@ -755,7 +754,6 @@ void Chunk::rebuild_SPU()
 						{
 
 							Tile *tile = Tile::tiles[tileId];
-							if (!tile) continue;
 							int renderLayer = tile->getRenderLayer();
 
 							if (renderLayer != currentLayer)

Minecraft.Client/ClientConnection.cpp

@@ -50,16 +50,11 @@
 #else
 #include "Common\UI\UI.h"
 #endif
-#if defined __PS3__ && !defined DISABLE_PSN
+#ifdef __PS3__
 #include "PS3/Network/SonyVoiceChat.h"
 #endif
 #include "DLCTexturePack.h"
 
-#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
-#include "Xbox\Network\NetworkPlayerXbox.h"
-#include "Common\Network\PlatformNetworkManager.h"
-#endif
-
 #ifdef _DURANGO
 #include "..\Minecraft.World\DurangoStats.h"
 #include "..\Minecraft.World\GenericStats.h"
@@ -303,10 +298,6 @@ 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) );
@@ -780,7 +771,6 @@ 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
@@ -791,32 +781,6 @@ void ClientConnection::handleAddPlayer(shared_ptr<AddPlayerPacket> packet)
 	player->m_displayName = player->name;
 #endif
 
-#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
-	{
-		PlayerUID 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;
@@ -1040,7 +1004,6 @@ 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 )
 	{
@@ -1110,7 +1073,6 @@ 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 )
 	{
@@ -1168,8 +1130,6 @@ 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 )
 	{
@@ -1809,7 +1769,6 @@ 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
@@ -1825,17 +1784,13 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 		app.SetGameHostOption(eGameHostOption_All,packet->m_serverSettings);
 
 		// 4J-PB - if we go straight in from the menus via an invite, we won't have the DLC info
-		//str1k3r - TMS only exists on Xbox 360 therefore, we only need this on Xbox 360.
-#ifdef _XBOX
 		if(app.GetTMSGlobalFileListRead()==false)
 		{
 			app.SetTMSAction(ProfileManager.GetPrimaryPad(),eTMSAction_TMSPP_RetrieveFiles_RunPlayGame);
 		}
-#endif
 	}
 
 #ifdef _XBOX
-#if !defined(_DISABLE_XBLIVE)
 	if(!g_NetworkManager.IsHost() && !app.GetGameHostOption(eGameHostOption_FriendsOfFriends))
 	{
 		if(m_userIndex == ProfileManager.GetPrimaryPad() )
@@ -1979,16 +1934,6 @@ 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;
@@ -1996,7 +1941,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 	isAtLeastOneFriend = TRUE;
 	cantPlayContentRestricted= FALSE;
 
-#if !defined DISABLE_PSN && ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
+#if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
 
 	if(!g_NetworkManager.IsHost() && !app.GetGameHostOption(eGameHostOption_FriendsOfFriends))
 	{
@@ -2278,8 +2223,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 		}
 		BOOL allAllowed, friendsAllowed;
 		ProfileManager.AllowedPlayerCreatedContent(m_userIndex,true,&allAllowed,&friendsAllowed);
-		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), 
-		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() )
@@ -2329,7 +2273,6 @@ 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;
@@ -3573,12 +3516,10 @@ void ClientConnection::handleCustomPayload(shared_ptr<CustomPayloadPacket> custo
 			}
 #else
 			UIScene *scene = ui.GetTopScene(m_userIndex, eUILayer_Scene);
-			UIScene_TradingMenu *screen = dynamic_cast<UIScene_TradingMenu *>(scene);
+			UIScene_TradingMenu *screen = (UIScene_TradingMenu *)scene;
-			if (screen != NULL)
+			trader = screen->getMerchant();
-				trader = screen->getMerchant();
 #endif
 			
-			if (trader == NULL) return;
 			MerchantRecipeList *recipeList = MerchantRecipeList::createFromStream(&input);
 			trader->overrideOffers(recipeList);
 		}

Minecraft.Client/Common/App_enums.h

@@ -875,8 +875,7 @@ enum EControllerActions
 	MINECRAFT_ACTION_SPAWN_CREEPER,
 	MINECRAFT_ACTION_CHANGE_SKIN,
 	MINECRAFT_ACTION_FLY_TOGGLE,
-	MINECRAFT_ACTION_RENDER_DEBUG,
+	MINECRAFT_ACTION_RENDER_DEBUG
-	MINECRAFT_ACTION_RENDER_DEBUG_SCREEN
 };
 
 enum eMCLang

Minecraft.Client/Common/App_structs.h

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

Minecraft.Client/Common/Audio/SoundEngine.cpp

@@ -22,13 +22,44 @@
 #ifdef __ORBIS__
 #include <audioout.h>
 //#define __DISABLE_MILES__			// MGH disabled for now as it crashes if we call sceNpMatching2Initialize
-#endif
+#endif 
+
+// take out Orbis until they are done
+#if defined _XBOX 
+
+SoundEngine::SoundEngine() {}
+void SoundEngine::init(Options *pOptions)
+{
+}
+
+void SoundEngine::tick(shared_ptr<Mob> *players, float a)
+{
+}
+void SoundEngine::destroy() {}
+void SoundEngine::play(int iSound, float x, float y, float z, float volume, float pitch)
+{
+	app.DebugPrintf("PlaySound - %d\n",iSound);
+}
+void SoundEngine::playStreaming(const wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay) {}
+void SoundEngine::playUI(int iSound, float volume, float pitch) {}
+
+void SoundEngine::updateMusicVolume(float fVal) {}
+void SoundEngine::updateSoundEffectVolume(float fVal) {}
+
+void SoundEngine::add(const wstring& name, File *file) {}
+void SoundEngine::addMusic(const wstring& name, File *file) {}
+void SoundEngine::addStreaming(const wstring& name, File *file) {}
+char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpaces) { return NULL; }
+bool SoundEngine::isStreamingWavebankReady() { return true; }
+void SoundEngine::playMusicTick() {};
+
+#else
 
 // str1k3r: previously ps4 needed the durango folder to load sound and so did windows this fixes that and makes them use there own folders.
 #ifdef _WINDOWS64
 char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"};
 char SoundEngine::m_szMusicPath[]={"music\\"};
-char SoundEngine::m_szRedistName[]={"Windows64\\redist64"}; //str1k3r - moved this to the Windows64 dir so its out of plain view
+char SoundEngine::m_szRedistName[]={"Windows64\\redist64"}; //str1k3r - moved this to a the Windows64 dir so its out of plain view
 #elif defined _DURANGO
 char SoundEngine::m_szSoundPath[]={"Sound\\"};
 char SoundEngine::m_szMusicPath[]={"music\\"};
@@ -48,7 +79,7 @@ char SoundEngine::m_szMusicPath[]={"music/"};
 char SoundEngine::m_szRedistName[]={"redist"};
 #endif
 
-/*#ifdef _CONTENT_PACKAGE // str1k3r - not needed use default paths instead.
+/*#ifdef _CONTENT_PACKAGE // strk1k3r - not needed use default paths instead.
 char SoundEngine::m_szSoundPath[]={"Sound/"};
 #elif defined _ART_BUILD
 char SoundEngine::m_szSoundPath[]={"Sound/"};
@@ -80,6 +111,7 @@ char *SoundEngine::m_szStreamFileA[eStream_Max]=
 	"hal4",
 	"nuance1",
 	"nuance2",
+#ifndef _XBOX
 	// add the new music tracks
 	"creative1",
 	"creative2",
@@ -91,9 +123,11 @@ char *SoundEngine::m_szStreamFileA[eStream_Max]=
 	"menu2",
 	"menu3",
 	"menu4",
+#endif	
 	"piano1",
 	"piano2",
 	"piano3",
+
 	// Nether
 	"nether1",
 	"nether2",
@@ -274,7 +308,9 @@ void SoundEngine::init(Options *pOptions)
 		sprintf(szBankName,"%s/%s",getUsrDirPath(), m_szSoundPath );
 	}
 	
-#elif (defined __PSVITA__ || __ORBIS__)
+#elif defined __PSVITA__
+	sprintf(szBankName,"%s/%s",getUsrDirPath(), m_szSoundPath );
+#elif defined __ORBIS__
 	sprintf(szBankName,"%s/%s",getUsrDirPath(), m_szSoundPath );
 #else
 	strcpy((char *)szBankName,m_szSoundPath);
@@ -1130,17 +1166,13 @@ void SoundEngine::playMusicTick()
 void SoundEngine::playMusicUpdate() 
 {
 	//return;
-	static float fMusicVol = 0.0f;
-#ifndef _WINDOWS64 //str1k3r - if used on windows64 volume doesnt update
 	static bool firstCall = true;
+	static float fMusicVol = 0.0f;
 	if( firstCall )
 	{
 		fMusicVol = getMasterMusicVolume();
 		firstCall = false;
 	}
-#else
-	fMusicVol = getMasterMusicVolume();
-#endif
 
 	switch(m_StreamState)
 	{
@@ -1200,7 +1232,7 @@ void SoundEngine::playMusicUpdate()
 					m_MusicType=eMusicType_Game;
 					m_StreamingAudioInfo.bIs3D=false;
 				
-#if (defined _XBOX_ONE || _WINDOWS64)
+#ifdef _XBOX_ONE
 					wstring &wstrSoundName=dlcAudioFile->GetSoundName(m_musicID);
 					wstring wstrFile=L"TPACK:\\Data\\" + wstrSoundName +L".binka";
 					std::wstring mountedPath = StorageManager.GetMountedPath(wstrFile);
@@ -1209,7 +1241,12 @@ void SoundEngine::playMusicUpdate()
 					wstring &wstrSoundName=dlcAudioFile->GetSoundName(m_musicID);
 					char szName[255];
 					wcstombs(szName,wstrSoundName.c_str(),255);
+
+#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
 					string strFile="TPACK:/Data/" + string(szName) + ".binka";
+#else
+					string strFile="TPACK:\\Data\\" + string(szName) + ".binka";
+#endif
 					std::string mountedPath = StorageManager.GetMountedPath(strFile);
 					strcpy(m_szStreamName,mountedPath.c_str());
 #endif
@@ -1483,9 +1520,7 @@ void SoundEngine::playMusicUpdate()
 				}
 
 				// volume change required?
-#ifndef _WINDOWS64
+				if(fMusicVol!=getMasterMusicVolume())
-				if(fMusicVol!=getMasterMusicVolume()) //str1k3r - if used on windows64 music doesnt update its volume
-#endif
 				{
 					fMusicVol=getMasterMusicVolume();
 					HSAMPLE hSample = AIL_stream_sample_handle( m_hStream); 
@@ -1627,6 +1662,8 @@ char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpac
 	return buf;
 }
 
+#endif
+
 
 F32 AILCALLBACK custom_falloff_function (HSAMPLE   S, 
 										 F32       distance,

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

@@ -24,7 +24,7 @@ foreach ($dir in $directories) {
 }
 
 $folderCopies = @(
-    @{ Source = "Common\Media\Font";	Dest = "Common\Media\Font" },
+    @{ Source = "Common\Media";    		 Dest = "Common\Media" },
     @{ Source = "Common\res";      		 Dest = "Common\res" },
 	@{ Source = "DurangoMedia\Sound";    Dest = "Sound" },
 	@{ Source = "DurangoMedia\DLC";      Dest = "DLC" },
@@ -46,7 +46,6 @@ foreach ($copy in $folderCopies) {
 }
 
 $fileCopies = @(
-	@{ Source = "Common\Media\MediaDurango.arc";	Dest = "Common\Media\MediaDurango.arc" },
     @{ Source = "Durango\DurangoExtras\xcompress.dll"; Dest = "xcompress.dll" },
 	@{ Source = "Durango\DLCXbox1.cmp"; Dest = "DLCXbox1.cmp" }
 )
@@ -62,7 +61,17 @@ foreach ($copy in $fileCopies) {
 }
 
 $deleteDirs = @(
-    "Common\Media\font\RU"
+    "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) {
@@ -73,14 +82,16 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-	"Common\Media\font",
+    "Common\Media",
-	"Common\Media\font\*"
+    "Common\Media\font"
 )
 
 foreach ($dir in $delDirs) {
-    $path = Join-Path $OutDir $dir
+    if ($delDirs -contains $dir) {
-    if (Test-Path $path) {
+        $path = Join-Path $OutDir $dir
-        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 |
+        if (Test-Path $path) {
-            Remove-Item -Force -ErrorAction SilentlyContinue
+            Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaWindows64.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File |
+                Remove-Item -Force -ErrorAction SilentlyContinue
+        }
     }
 }

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

@@ -23,7 +23,7 @@ foreach ($dir in $directories) {
 
 $folderCopies = @(
     @{ Source = "music";		    Dest = "PS4_GAME\music" },
-    @{ Source = "Common\Media\Font";Dest = "PS4_GAME\Common\Media\Font" },
+    @{ Source = "Common\Media";     Dest = "PS4_GAME\Common\Media" },
     @{ Source = "Common\res";       Dest = "PS4_GAME\Common\res" },
 	@{ Source = "OrbisMedia\Sound"; Dest = "PS4_GAME\Orbis\Sound" },
     @{ Source = "OrbisMedia\DLC";   Dest = "PS4_GAME\Orbis\DLC" },
@@ -50,7 +50,6 @@ foreach ($copy in $folderCopies) {
 }
 
 $fileCopies = @(
-	@{ Source = "Common\Media\MediaOrbis.arc"; Dest = "PS4_GAME\Common\Media\MediaOrbis.arc" },
     @{ Source = "Orbis\PS4ProductCodes.bin"; Dest = "PS4_GAME\Orbis\PS4ProductCodes.bin" },
 	@{ Source = "Orbis\session_image.jpg"; Dest = "PS4_GAME\Orbis\session_image.jpg" }
 )
@@ -76,7 +75,17 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS4_GAME\Common\Media\font\RU"
+    "PS4_GAME\Common\Media\Sound",
+    "PS4_GAME\Common\Media\Graphics",
+	"PS4_GAME\Common\Media\de-DE",
+	"PS4_GAME\Common\Media\es-ES",
+	"PS4_GAME\Common\Media\fr-FR",
+	"PS4_GAME\Common\Media\it-IT",
+	"PS4_GAME\Common\Media\ja-JP",
+	"PS4_GAME\Common\Media\ko-KR",
+	"PS4_GAME\Common\Media\pt-BR",
+	"PS4_GAME\Common\Media\pt-PT",
+	"PS4_GAME\Common\Media\zh-CHT"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -87,15 +96,17 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-	"PS4_GAME\Common\Media\font",
+    "PS4_GAME\Common\Media",
-	"PS4_GAME\Common\Media\font\*"
+    "PS4_GAME\Common\Media\font"
 )
 
 foreach ($dir in $delDirs) {
-    $path = Join-Path $OutDir $dir
+    if ($delDirs -contains $dir) {
-    if (Test-Path $path) {
+        $path = Join-Path $OutDir $dir
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        if (Test-Path $path) {
-            Remove-Item -Force -ErrorAction SilentlyContinue
+            Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaPSVita.arc -File |
+                Remove-Item -Force -ErrorAction SilentlyContinue
+        }
     }
 }
 

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

@@ -21,11 +21,11 @@ foreach ($dir in $directories) {
 
 $folderCopies = @(
     @{ Source = "music";            Dest = "PS3_GAME\USRDIR\music" },
-    @{ Source = "Common\Media\Font";Dest = "PS3_GAME\USRDIR\Common\Media\Font" },
+    @{ Source = "Common\Media";     Dest = "PS3_GAME\USRDIR\Common\Media" },
     @{ Source = "Common\res";       Dest = "PS3_GAME\USRDIR\Common\res" },
 	@{ Source = "PS3Media\DLC";		Dest = "PS3_GAME\USRDIR\DLC" },
     @{ Source = "PS3Media\Sound";   Dest = "PS3_GAME\USRDIR\PS3\Sound" },
-	#@{ Source = "PSVita\Tutorial"; Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }, # str1k3r - softlocks game
+	#@{ 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" }
 )
@@ -47,7 +47,6 @@ foreach ($copy in $folderCopies) {
 
 $fileCopies = @(
     @{ Source = "PS3\PS3ProductCodes.bin"; Dest = "PS3_GAME\USRDIR\PS3\PS3ProductCodes.bin" },
-	@{ Source = "Common\Media\MediaPS3.arc"; Dest = "PS3_GAME\USRDIR\Common\Media\MediaPS3.arc" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_DISC.SFB";         Dest = "PS3_DISC.SFB" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\ICON0.PNG";   Dest = "PS3_GAME\ICON0.PNG" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\PARAM.SFO";   Dest = "PS3_GAME\PARAM.SFO" },
@@ -60,7 +59,7 @@ $fileCopies = @(
 )
 
 foreach ($copy in $fileCopies) {
-    $src = $copy.Source
+    $src = Join-Path $ProjectDir $copy.Source
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
@@ -85,7 +84,17 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS3_GAME\USRDIR\Common\Media\font\RU"
+    "PS3_GAME\USRDIR\Common\Media\Sound",
+    "PS3_GAME\USRDIR\Common\Media\Graphics",
+	"PS3_GAME\USRDIR\Common\Media\de-DE",
+	"PS3_GAME\USRDIR\Common\Media\es-ES",
+	"PS3_GAME\USRDIR\Common\Media\fr-FR",
+	"PS3_GAME\USRDIR\Common\Media\it-IT",
+	"PS3_GAME\USRDIR\Common\Media\ja-JP",
+	"PS3_GAME\USRDIR\Common\Media\ko-KR",
+	"PS3_GAME\USRDIR\Common\Media\pt-BR",
+	"PS3_GAME\USRDIR\Common\Media\pt-PT",
+	"PS3_GAME\USRDIR\Common\Media\zh-CHT"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -96,14 +105,16 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-    "PS3_GAME\USRDIR\Common\Media\font",
+    "PS3_GAME\USRDIR\Common\Media",
-    "PS3_GAME\USRDIR\Common\Media\font\*"
+    "PS3_GAME\USRDIR\Common\Media\font"
 )
 
 foreach ($dir in $delDirs) {
-    $path = Join-Path $OutDir $dir
+    if ($delDirs -contains $dir) {
-    if (Test-Path $path) {
+        $path = Join-Path $OutDir $dir
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        if (Test-Path $path) {
-            Remove-Item -Force -ErrorAction SilentlyContinue
+            Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaOrbis.arc, MediaPSVita.arc -File |
+                Remove-Item -Force -ErrorAction SilentlyContinue
+        }
     }
 }

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

@@ -9,11 +9,10 @@ $directories = @(
     "PSVITA_GAME\music",
 	"PSVITA_GAME\PSVita",
 	"PSVITA_GAME\Common",
-	"PSVITA_GAME\Common\res",
     "PSVITA_GAME\Common\Media",
+    "PSVITA_GAME\Common\res",
     "PSVITA_GAME\PSVita\Sound",
-    "PSVITA_GAME\PSVita\Tutorial",
+    "PSVITA_GAME\PSVita\Tutorial"
-	"PSVITA_GAME\savedata"
 )
 
 foreach ($dir in $directories) {
@@ -22,7 +21,7 @@ foreach ($dir in $directories) {
 
 $folderCopies = @(
     @{ Source = "music";		     Dest = "PSVITA_GAME\music" },
-    @{ Source = "Common\Media\Font"; Dest = "PSVITA_GAME\Common\Media\Font" },
+    @{ Source = "Common\Media";      Dest = "PSVITA_GAME\Common\Media" },
     @{ Source = "Common\res";        Dest = "PSVITA_GAME\Common\res" },
 	@{ Source = "PSVitaMedia\Sound"; Dest = "PSVITA_GAME\PSVita\Sound" },
 	@{ Source = "PSVitaMedia\DLC";   Dest = "PSVITA_GAME\PSVita\DLC" },
@@ -47,7 +46,6 @@ foreach ($copy in $folderCopies) {
 }
 
 $fileCopies = @(
-	@{ Source = "Common\Media\MediaPSVita.arc";	 Dest = "PSVITA_GAME\Common\Media\MediaPSVita.arc" },
     @{ Source = "PSVita\PSVitaProductCodes.bin"; Dest = "PSVITA_GAME\PSVita\PSVitaProductCodes.bin" },
 	@{ Source = "PSVita\session_image.png";      Dest = "PSVITA_GAME\PSVita\session_image.png" }
 )
@@ -74,7 +72,17 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PSVITA_GAME\Common\Media\font\RU" 
+    "PSVITA_GAME\Common\Media\Sound",
+    "PSVITA_GAME\Common\Media\Graphics",
+	"PSVITA_GAME\Common\Media\de-DE",
+	"PSVITA_GAME\Common\Media\es-ES",
+	"PSVITA_GAME\Common\Media\fr-FR",
+	"PSVITA_GAME\Common\Media\it-IT",
+	"PSVITA_GAME\Common\Media\ja-JP",
+	"PSVITA_GAME\Common\Media\ko-KR",
+	"PSVITA_GAME\Common\Media\pt-BR",
+	"PSVITA_GAME\Common\Media\pt-PT",
+	"PSVITA_GAME\Common\Media\zh-CHT"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -85,15 +93,17 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-	"PSVITA_GAME\Common\Media\font",
+    "PSVITA_GAME\Common\Media",
-	"PSVITA_GAME\Common\Media\font\*"
+    "PSVITA_GAME\Common\Media\font"
 )
 
 foreach ($dir in $delDirs) {
-    $path = Join-Path $OutDir $dir
+    if ($delDirs -contains $dir) {
-    if (Test-Path $path) {
+        $path = Join-Path $OutDir $dir
-        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
+        if (Test-Path $path) {
-            Remove-Item -Force -ErrorAction SilentlyContinue
+            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, MediaWindows64.arc, MediaPS3.arc, MediaOrbis.arc -File |
+                Remove-Item -Force -ErrorAction SilentlyContinue
+        }
     }
 }
 

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

@@ -1,85 +0,0 @@
-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

@@ -7,10 +7,11 @@ Write-Host "Windows64 Postbuild: script started. Output Directory: $OutDir, Proj
 
 $directories = @(
     "music",
-    "Common\Media",
-    "Windows64Media",
     "Windows64\GameHDD",
-	"Windows64\redist64"
+    "Common\Media",
+    "Common\res",
+    "Windows64Media",
+	"redist64"
 )
 
 foreach ($dir in $directories) {
@@ -20,8 +21,9 @@ foreach ($dir in $directories) {
 $folderCopies = @(
     @{ Source = "music";                Dest = "music" },
     @{ Source = "Common\res";      		Dest = "Common\res" },
-    @{ Source = "Common\Media\Font";	Dest = "Common\Media\Font" },
+    @{ Source = "Common\Media";    		Dest = "Common\Media" },
-    @{ Source = "Windows64Media\DLC";  	Dest = "Windows64Media\DLC" },
+    @{ Source = "DurangoMedia";    		Dest = "Windows64Media" },
+    @{ Source = "Windows64Media";  		Dest = "Windows64Media" },
 	@{ 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" }
@@ -44,9 +46,8 @@ foreach ($copy in $folderCopies) {
 
 $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\mss64.dll"; Dest = "mss64.dll" },
-	@{ Source = "Windows64\Iggy\lib\redist64\iggy_w64.dll"; Dest = "iggy_w64.dll" }
+	@{ Source = "Windows64\redist64\iggy_w64.dll"; Dest = "iggy_w64.dll" }
 )
 
 foreach ($copy in $fileCopies) {
@@ -60,7 +61,17 @@ foreach ($copy in $fileCopies) {
 }
 
 $deleteDirs = @(
-    "Common\Media\font\RU" #str1k3r - russian font?
+    "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) {
@@ -71,14 +82,16 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-	"Common\Media\font",
+    "Common\Media",
-	"Common\Media\font\*"
+    "Common\Media\font"
 )
 
 foreach ($dir in $delDirs) {
-    $path = Join-Path $OutDir $dir
+    if ($delDirs -contains $dir) {
-    if (Test-Path $path) {
+        $path = Join-Path $OutDir $dir
-        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 |
+        if (Test-Path $path) {
-            Remove-Item -Force -ErrorAction SilentlyContinue
+            Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "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/Console_Utils.cpp

@@ -1,27 +1,15 @@
 #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, va_list pArgList )
+static VOID DebugSpewV( const CHAR* strFormat, const 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,9 +30,6 @@
 #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"
@@ -233,21 +230,12 @@ void CMinecraftApp::DebugPrintf(const char *szFormat, ...)
 {
 
 #ifndef _FINAL_BUILD
-    va_list ap;
+	char    buf[1024];
-    va_start(ap, szFormat);
+	va_list ap;
-#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+	va_start(ap, szFormat);
-    // Dedicated server routes client debug spew through ServerLogger so CLI output stays prompt-safe.
+	vsnprintf(buf, sizeof(buf), szFormat, ap);
-    if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
+	va_end(ap);
-    {
+	OutputDebugStringA(buf);
-        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
 
 }
@@ -255,22 +243,13 @@ void CMinecraftApp::DebugPrintf(const char *szFormat, ...)
 void CMinecraftApp::DebugPrintf(int user, const char *szFormat, ...)
 {
 #ifndef _FINAL_BUILD
-    if(user == USER_NONE)
+	if(user == USER_NONE)
-        return;
+		return;
-    va_list ap;
+	char    buf[1024];
-    va_start(ap, szFormat);
+	va_list ap;
-#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
+	va_start(ap, szFormat);
-    // Dedicated server routes client debug spew through ServerLogger so CLI output stays prompt-safe.
+	vsnprintf(buf, sizeof(buf), szFormat, ap);
-    if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
+	va_end(ap);
-    {
-        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 );
@@ -785,11 +764,11 @@ 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
+#if defined _WINDOWS64// || defined __PSVITA__
 		C_4JProfile::PROFILESETTINGS *pProfileSettings=ProfileManager.GetDashboardProfileSettings(i);
+		// clear this for now - it will come from reading the system values
+		memset(pProfileSettings,0,sizeof(C_4JProfile::PROFILESETTINGS));
 		SetDefaultOptions(pProfileSettings,i);
-		ProfileManager.LoadSettings(GameSettingsA[i], sizeof(GAME_SETTINGS));
-		ApplyGameSettingsChanged(i);
 #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
@@ -2376,8 +2355,6 @@ void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, int iPa
 			{
 #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__ )
 				StorageManager.WriteToProfile(i,true, bOverride5MinuteTimer);
-#elif _WINDOWS64
-				ProfileManager.SaveSettings(GameSettingsA[i], sizeof(GAME_SETTINGS));
 #else
 				ProfileManager.WriteToProfile(i,true, bOverride5MinuteTimer);
 #endif
@@ -2391,8 +2368,6 @@ void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, int iPa
 		{
 #if ( defined  __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)
 			StorageManager.WriteToProfile(iPad,true, bOverride5MinuteTimer);
-#elif _WINDOWS64
-			ProfileManager.SaveSettings(GameSettingsA[iPad], sizeof(GAME_SETTINGS));
 #else
 			ProfileManager.WriteToProfile(iPad,true, bOverride5MinuteTimer);
 #endif
@@ -2411,7 +2386,7 @@ void CMinecraftApp::ClearGameSettingsChangedFlag(int iPad)
 // Remove the debug settings in the content package build
 //
 ////////////////////////////
-#ifndef _DEBUG_MENUS_ENABLED
+#ifdef _DEBUG_MENUS_ENABLED
 unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
 {
 	return 0;
@@ -2424,7 +2399,9 @@ void CMinecraftApp::SetGameSettingsDebugMask(int iPad, unsigned int uiVal)
 void CMinecraftApp::ActionDebugMask(int iPad,bool bSetAllClear)
 {
 }
+
 #else
+
 unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
 {
 	if(iPad==-1)
@@ -3695,7 +3672,7 @@ void CMinecraftApp::HandleXuiActions(void)
 							pDLCTexPack->m_pSoundBank->Destroy();
 						}
 #endif
-#if (defined _DURANGO || _WINDOWS64)
+#ifdef _DURANGO
 						DWORD result = StorageManager.UnmountInstalledDLC(L"TPACK");
 #else
 						DWORD result = StorageManager.UnmountInstalledDLC("TPACK");
@@ -3867,9 +3844,9 @@ void CMinecraftApp::HandleXuiActions(void)
 			case eAppAction_SetDefaultOptions:
 				SetAction(i,eAppAction_Idle);
 #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)
-					SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);		
+				SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);		
 #else
-					SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);		
+				SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);		
 #endif
 
 				// if the profile data has been changed, then force a profile write
@@ -4060,8 +4037,8 @@ void CMinecraftApp::HandleXuiActions(void)
 
 					ui.SetTooltips(i, -1);
 
-					ui.ReloadSkins();
+					ui.ReloadSkin();
-					ui.StartReloadSkinsThread();
+					ui.StartReloadSkinThread();
 
 					ui.setCleanupOnReload();
 #endif
@@ -4440,7 +4417,9 @@ int CMinecraftApp::EthernetDisconnectReturned(void *pParam,int iPad,const C4JSto
 	else
 	{
 		//  4J-PB - turn off the PSN store icon just in case this happened when we were in one of the DLC menus
-#if defined __PSVITA__ || defined __ORBIS__
+#ifdef __ORBIS__
+		sceNpCommerceHidePsStoreIcon();
+#elif defined __PSVITA__
 		app.GetCommerce()->HidePsStoreIcon();
 #endif
 		app.SetAction(iPad,eAppAction_EthernetDisconnectedReturned_Menus);
@@ -4910,13 +4889,11 @@ 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)
@@ -4981,7 +4958,6 @@ 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() ) )
@@ -4993,7 +4969,6 @@ 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.
@@ -5119,9 +5094,6 @@ void CMinecraftApp::NotificationsCallback(LPVOID pParam,DWORD dwNotification, un
 #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 int CMinecraftApp::MustSignInFullVersionPurchaseReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #ifdef __PS3__
@@ -5134,15 +5106,11 @@ int CMinecraftApp::MustSignInFullVersionPurchaseReturned(void *pParam,int iPad,C
 	}
 
 	return 0;
-#endif
 }
 
 #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
 int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-#ifdef DISABLE_PSN
-	return 0;
-#else
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #ifdef __PS3__
@@ -5158,7 +5126,6 @@ int CMinecraftApp::MustSignInFullVersionPurchaseReturnedExitTrial(void *pParam,i
 	app.SetAction(iPad,eAppAction_ExitWorldTrial);	
 
 	return 0;
-#endif
 }
 #endif
 
@@ -5490,9 +5457,9 @@ void CMinecraftApp::HandleDLC(DLCPack *pack)
 {
 	DWORD dwFilesProcessed = 0;
 #ifndef _XBOX
-#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
+#if defined(__PS3__) || defined(__ORBIS__) || defined(_WINDOWS64) || defined (__PSVITA__)
 	std::vector<std::string> dlcFilenames;
-#elif (defined _DURANGO || _WINDOWS64)
+#elif defined _DURANGO
 	std::vector<std::wstring> dlcFilenames;
 #endif
 	StorageManager.GetMountedDLCFileList("DLCDrive", dlcFilenames);
@@ -6352,31 +6319,27 @@ void CMinecraftApp::InitialiseTips()
 UINT CMinecraftApp::GetNextTip()
 {
 	static bool bShowSkinDLCTip=true;
-	//str1k3r - if uiStringID is IDS_TIPS_GAMETIP_0 then dont do this, fixes a bug with IDS_TIPS_GAMETIP_0 not showing on Windows64 if not high def
+	// don't display the DLC tip in the trial game
-	if(m_GameTipA[0].uiStringID != IDS_TIPS_GAMETIP_0)
+	if(ProfileManager.IsFullVersion() && app.GetNewDLCAvailable() && app.DisplayNewDLCTip())
 	{
-		// don't display the DLC tip in the trial game
+		return IDS_TIPS_GAMETIP_NEWDLC;
-		if(ProfileManager.IsFullVersion() && app.GetNewDLCAvailable() && app.DisplayNewDLCTip())
+	}
+	else
+	{
+		if(bShowSkinDLCTip && ProfileManager.IsFullVersion()) 
 		{
-			return IDS_TIPS_GAMETIP_NEWDLC;
+			bShowSkinDLCTip=false;
-		}
+			if( app.DLCInstallProcessCompleted() )
-		else
-		{
-			if(bShowSkinDLCTip && ProfileManager.IsFullVersion()) 
 			{
-				bShowSkinDLCTip=false;
+				if(app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin)==0)
-				if( app.DLCInstallProcessCompleted() )
-				{
-					if(app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin)==0)
-					{
-						return IDS_TIPS_GAMETIP_SKINPACKS;
-					}
-				}
-				else
 				{
 					return IDS_TIPS_GAMETIP_SKINPACKS;
 				}
 			}
+			else
+			{
+				return IDS_TIPS_GAMETIP_SKINPACKS;
+			}
 		}
 	}
 
@@ -6492,7 +6455,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 _XBOX_ONE || defined __PSVITA__
 	text = replaceAll(text, L"{*CONTROLLER_VK_START*}",			GetVKReplacement(VK_PAD_START		) );
 	text = replaceAll(text, L"{*CONTROLLER_VK_BACK*}",			GetVKReplacement(VK_PAD_BACK		) );
 #endif
@@ -6615,12 +6578,8 @@ wstring CMinecraftApp::GetActionReplacement(int iPad, unsigned char ucAction)
 #ifdef __PS3__
 	int size = 30;
 #elif defined _WIN64
-	int size = 30;
+	int size = 45;
-
+	if(ui.getScreenWidth() < 1920) size = 30;
-	if(ui.getScreenWidth() >= 1920)
-	{
-		size = 45;
-	}
 #else
 	int size = 45;
 #endif
@@ -6732,7 +6691,7 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
 	case VK_PAD_RTHUMB_DOWNLEFT :
 		replacement = L"ButtonRightStick";
 		break;
-#if defined _XBOX_ONE || defined __PSVITA__ || defined _WINDOWS64
+#if defined _XBOX_ONE || defined __PSVITA__
 	case VK_PAD_START:
 		replacement = L"ButtonStart";
 		break;
@@ -6748,12 +6707,8 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
 #ifdef __PS3__
 	int size = 30;
 #elif defined _WIN64
-	int size = 30;
+	int size = 45;
-
+	if(ui.getScreenWidth() < 1920) size = 30;
-	if(ui.getScreenWidth() >= 1920)
-	{
-		size = 45;
-	}
 #else
 	int size = 45;
 #endif
@@ -6783,12 +6738,8 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
 #ifdef __PS3__
 	int size = 22;
 #elif defined _WIN64
-	int size = 22; 
+	int size = 33;
-
+	if(ui.getScreenWidth() < 1920) size = 22;
-	if(ui.getScreenWidth() >= 1920)
-	{
-		size = 33;
-	}
 #else
 	int size = 33;
 #endif
@@ -6810,7 +6761,7 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
 #endif
 }
 
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 unordered_map<PlayerUID, MOJANG_DATA *, PlayerUID::Hash> CMinecraftApp::MojangData;
 unordered_map<int, char * >  CMinecraftApp::DLCTextures_PackID;
 unordered_map<string, DLC_INFO * >  CMinecraftApp::DLCInfo;
@@ -6821,12 +6772,6 @@ unordered_map<int, wstring >  CMinecraftApp::DLCTextures_PackID; // for mash-up
 //unordered_map<ULONGLONG,DLC_INFO * > CMinecraftApp::DLCInfo_Trial; // full offerid, dlc_info
 unordered_map<wstring,DLC_INFO * > CMinecraftApp::DLCInfo_Full; // full offerid, dlc_info
 unordered_map<wstring, wstring >  CMinecraftApp::DLCInfo_SkinName; // skin name, full offer id
-#elif defined(DISABLE_PSN)
-unordered_map<PlayerUID, MOJANG_DATA *, PlayerUID::Hash> CMinecraftApp::MojangData;
-unordered_map<int, ULONGLONG >  CMinecraftApp::DLCTextures_PackID;
-unordered_map<ULONGLONG, DLC_INFO * >  CMinecraftApp::DLCInfo_Trial;
-unordered_map<ULONGLONG, DLC_INFO * >  CMinecraftApp::DLCInfo_Full;
-unordered_map<wstring, ULONGLONG >  CMinecraftApp::DLCInfo_SkinName;
 #else
 unordered_map<PlayerUID, MOJANG_DATA *> CMinecraftApp::MojangData;
 unordered_map<int, ULONGLONG >  CMinecraftApp::DLCTextures_PackID;
@@ -6909,7 +6854,7 @@ HRESULT CMinecraftApp::RegisterConfigValues(WCHAR *pType, int iValue)
 	return hr;
 }
 
-#if (defined _XBOX || defined _WINDOWS64 || defined DISABLE_PSN)
+#if (defined _XBOX || defined _WINDOWS64)
 HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGender, __uint64 ullOfferID_Full, __uint64 ullOfferID_Trial, WCHAR *pFirstSkin, unsigned int uiSortIndex, int iConfig, WCHAR *pDataFile)
 {
 	HRESULT hr=S_OK;
@@ -6926,20 +6871,12 @@ 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
 
@@ -7109,7 +7046,7 @@ HRESULT CMinecraftApp::RegisterDLCData(char *pchDLCName, unsigned int uiSortInde
 
 
 
-#if !defined(DISABLE_PSN) && (defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
+#if defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal)
 {
 	AUTO_VAR(it, DLCInfo_SkinName.find(FirstSkin));
@@ -7377,7 +7314,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForProductName(WCHAR *pwchProductName)
 	return NULL;
 }
 
-#elif !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
+#elif defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 #else
 
 DLC_INFO *CMinecraftApp::GetDLCInfoForFullOfferID(ULONGLONG ullOfferID_Full)
@@ -9488,7 +9425,7 @@ byteArray CMinecraftApp::getArchiveFile(const wstring &filename)
 
 // DLC
 
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 int CMinecraftApp::GetDLCInfoCount() 
 { 
 	return (int)DLCInfo.size();
@@ -9780,6 +9717,7 @@ void CMinecraftApp::getLocale(vector<wstring> &vecWstrLocales)
 		locales.push_back(eMCLang_zhCN);
 		break;
 
+#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined _DURANGO
 	case XC_LANGUAGE_DANISH:
 		locales.push_back(eMCLang_daDA);
 		locales.push_back(eMCLang_daDK);
@@ -9805,6 +9743,7 @@ void CMinecraftApp::getLocale(vector<wstring> &vecWstrLocales)
 		locales.push_back(eMCLang_enGR);
 		locales.push_back(eMCLang_enGB);
 		break;
+#endif
 	}
 #endif
 
@@ -10093,7 +10032,7 @@ enum ETitleUpdateTexturePacks
 };
 
 #ifdef _WINDOWS64
-wstring titleUpdateTexturePackRoot = L"Windows64Media\\DLC\\";
+wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\";
 #elif defined(__ORBIS__)
 wstring titleUpdateTexturePackRoot = L"app0/Orbis/DLC/";
 #elif defined(__PSVITA__)

Minecraft.Client/Common/Consoles_App.h

@@ -594,7 +594,7 @@ public:
 	MOJANG_DATA *GetMojangDataForXuid(PlayerUID xuid);
 	static HRESULT RegisterConfigValues(WCHAR *pType, int iValue);
 
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 	HRESULT RegisterDLCData(char *pchDLCName, unsigned int uiSortIndex, char *pchImageURL);
 	bool GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal);
 	DLC_INFO *GetDLCInfoForTrialOfferID(ULONGLONG ullOfferID_Trial);
@@ -631,7 +631,7 @@ private:
 
 	std::vector <SCreditTextItemDef *> vDLCCredits;
 
-#if !defined(DISABLE_PSN) && (defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
+#if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 	static unordered_map<PlayerUID,MOJANG_DATA *, PlayerUID::Hash > MojangData;
 	static unordered_map<int, char * >  DLCTextures_PackID; // for mash-up packs & texture packs
 	static unordered_map<string,DLC_INFO * > DLCInfo; 
@@ -642,12 +642,6 @@ private:
 	//static unordered_map<wstring,DLC_INFO * > DLCInfo_Trial; // full offerid, dlc_info
 	static unordered_map<wstring,DLC_INFO * > DLCInfo_Full; // full offerid, dlc_info
 	static unordered_map<wstring, wstring >  DLCInfo_SkinName; // skin name, full offer id
-#elif defined(DISABLE_PSN)
-	static unordered_map<PlayerUID,MOJANG_DATA *, PlayerUID::Hash > MojangData;
-	static unordered_map<int, ULONGLONG >  DLCTextures_PackID; // for mash-up packs & texture packs
-	static unordered_map<ULONGLONG,DLC_INFO * > DLCInfo_Trial; // full offerid, dlc_info
-	static unordered_map<ULONGLONG,DLC_INFO * > DLCInfo_Full; // full offerid, dlc_info
-	static unordered_map<wstring, ULONGLONG >  DLCInfo_SkinName; // skin name, full offer id
 #else
 	static unordered_map<PlayerUID,MOJANG_DATA * > MojangData;
 	static unordered_map<int, ULONGLONG >  DLCTextures_PackID; // for mash-up packs & texture packs
@@ -778,7 +772,7 @@ public:
 	void			ClearTMSPPFilesRetrieved();
 	unsigned int	AddTMSPPFileTypeRequest(eDLCContentType eType, bool bPromote=false);
 	int				GetDLCInfoTexturesOffersCount();
-#if !defined(DISABLE_PSN) && (defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__))
+#if defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
 	DLC_INFO *GetDLCInfo(int iIndex);	
 	DLC_INFO *GetDLCInfo(char *);
 	DLC_INFO *GetDLCInfoFromTPackID(int iTPID);
@@ -857,6 +851,15 @@ public:
 	static DWORD getSkinIdFromPath(const wstring &skin);
 	static wstring getSkinPathFromId(DWORD skinId);
 
+	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile)=0;
+	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt)=0;
+	virtual void FreeLocalTMSFiles(eTMSFileType eType)=0;
+	virtual int GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT)=0;
+
+	virtual bool GetTMSGlobalFileListRead() { return true;}
+	virtual bool GetTMSDLCInfoRead() { return true;}
+	virtual bool GetTMSXUIDsFileRead() { return true;}
+
 	bool GetBanListRead(int iPad) { return m_bRead_BannedListA[iPad];}
 	void SetBanListRead(int iPad,bool bVal) { m_bRead_BannedListA[iPad]=bVal;}
 	void ClearBanList(int iPad) { BannedListA[iPad].pBannedList=NULL;BannedListA[iPad].dwBytes=0;}

Minecraft.Client/Common/DLC/DLCManager.cpp

@@ -344,14 +344,14 @@ bool DLCManager::readDLCDataFile(DWORD &dwFilesProcessed, const string &path, DL
 	}
 	else if (fromArchive) return false;
 
-#if (defined _DURANGO || _WINDOWS64)
+#ifdef _WINDOWS64
+	string finalPath = StorageManager.GetMountedPath(path.c_str());
+	if(finalPath.size() == 0) finalPath = path;
+	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+#elif defined(_DURANGO)
 	wstring finalPath = StorageManager.GetMountedPath(wPath.c_str());
 	if(finalPath.size() == 0) finalPath = wPath;
-#ifdef _DURANGO
 	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-#else
-	HANDLE file = CreateFileW(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-#endif
 #else
 	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 #endif
@@ -557,14 +557,14 @@ DWORD DLCManager::retrievePackIDFromDLCDataFile(const string &path, DLCPack *pac
 	DWORD packId = 0;
 	wstring wPath = convStringToWstring(path);
 
-#if (defined _DURANGO || _WINDOWS64)
+#ifdef _WINDOWS64
+	string finalPath = StorageManager.GetMountedPath(path.c_str());
+	if(finalPath.size() == 0) finalPath = path;
+	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+#elif defined(_DURANGO)
 	wstring finalPath = StorageManager.GetMountedPath(wPath.c_str());
 	if(finalPath.size() == 0) finalPath = wPath;
-#ifdef _DURANGO
 	HANDLE file = CreateFile(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-#else
-	HANDLE file = CreateFileW(finalPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-#endif
 #else
 	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 #endif

Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp

@@ -464,7 +464,7 @@ void LevelGenerationOptions::loadBaseSaveData()
 
 	if(mountIndex > -1)
 	{
-#if (defined _DURANGO || _WINDOWS64)
+#ifdef _DURANGO
 		if(StorageManager.MountInstalledDLC(ProfileManager.GetPrimaryPad(),mountIndex,&LevelGenerationOptions::packMounted,this,L"WPACK")!=ERROR_IO_PENDING)
 #else
 		if(StorageManager.MountInstalledDLC(ProfileManager.GetPrimaryPad(),mountIndex,&LevelGenerationOptions::packMounted,this,"WPACK")!=ERROR_IO_PENDING)
@@ -604,7 +604,7 @@ int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD
 			}
 
 		}
-#if (defined _DURANGO || _WINDOWS64)	
+#ifdef _DURANGO			
 		DWORD result = StorageManager.UnmountInstalledDLC(L"WPACK");
 #else
 		DWORD result = StorageManager.UnmountInstalledDLC("WPACK");

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(const std::string& str)
+std::string base64_encode(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(const std::string& str);
+std::string base64_encode(std::string str);
 std::string base64_encode(unsigned char const* , unsigned int len);
 std::string base64_decode(std::string const& s);

Minecraft.Client/Common/Media/4J_strings.resx

@@ -1,171 +1,171 @@
-<root>
+<root>
-
+
-  <data name="IDS_NULL">
+  <data name="IDS_NULL">
-    <value>Not Used</value>
+    <value>Not Used</value>
-  </data>
+  </data>
-
+
-  <data name="IDS_OK">
+  <data name="IDS_OK">
-    <value>OK</value>
+    <value>OK</value>
-  </data>
+  </data>
-  <data name="IDS_BACK">
+  <data name="IDS_BACK">
-    <value>Back</value>
+    <value>Back</value>
-  </data>
+  </data>
-  <data name="IDS_CANCEL">
+  <data name="IDS_CANCEL">
-    <value>Cancel</value>
+    <value>Cancel</value>
-  </data>
+  </data>
-  <data name="IDS_YES">
+  <data name="IDS_YES">
-    <value>Yes</value>
+    <value>Yes</value>
-  </data>
+  </data>
-  <data name="IDS_NO">
+  <data name="IDS_NO">
-    <value>No</value>
+    <value>No</value>
-  </data>
+  </data>
-  <data name="IDS_CORRUPTSAVE_TITLE">
+  <data name="IDS_CORRUPTSAVE_TITLE">
-    <value>Corrupt Save</value>
+    <value>Corrupt Save</value>
-  </data>
+  </data>
-  <data name="IDS_CORRUPTSAVE_TEXT">
+  <data name="IDS_CORRUPTSAVE_TEXT">
-    <value>Your save data appears to be corrupt.  Create a new save and overwrite the corrupt one?</value>
+    <value>Your save data appears to be corrupt.  Create a new save and overwrite the corrupt one?</value>
-  </data>
+  </data>
-  <data name="IDS_NOFREESPACE_TITLE">
+  <data name="IDS_NOFREESPACE_TITLE">
-    <value>No Free Space</value>
+    <value>No Free Space</value>
-  </data>
+  </data>
-  <data name="IDS_NOFREESPACE_TEXT">
+  <data name="IDS_NOFREESPACE_TEXT">
-    <value>Your selected storage device doesn't have enough free space to create a game save.</value>
+    <value>Your selected storage device doesn't have enough free space to create a game save.</value>
-  </data>
+  </data>
-  <data name="IDS_SELECTAGAIN">
+  <data name="IDS_SELECTAGAIN">
-    <value>Select again</value>
+    <value>Select again</value>
-  </data>
+  </data>
-  <data name="IDS_PLAYWITHOUTSAVING">
+  <data name="IDS_PLAYWITHOUTSAVING">
-    <value>Play without saving</value>
+    <value>Play without saving</value>
-  </data>
+  </data>
-  <data name="IDS_CREATEANEWSAVE">
+  <data name="IDS_CREATEANEWSAVE">
-    <value>Create a new save</value>
+    <value>Create a new save</value>
-  </data>
+  </data>
-  <data name="IDS_OVERWRITESAVE_TITLE">
+  <data name="IDS_OVERWRITESAVE_TITLE">
-    <value>Overwrite save?</value>
+    <value>Overwrite save?</value>
-  </data>
+  </data>
-  <data name="IDS_OVERWRITESAVE_TEXT">
+  <data name="IDS_OVERWRITESAVE_TEXT">
-    <value>Your selected storage device already contains this save.  Is it OK to overwrite it?</value>
+    <value>Your selected storage device already contains this save.  Is it OK to overwrite it?</value>
-  </data>
+  </data>
-  <data name="IDS_OVERWRITESAVE_NO">
+  <data name="IDS_OVERWRITESAVE_NO">
-    <value>No - don't overwrite</value>
+    <value>No - don't overwrite</value>
-  </data>
+  </data>
-  <data name="IDS_OVERWRITESAVE_YES">
+  <data name="IDS_OVERWRITESAVE_YES">
-    <value>Overwrite and save</value>
+    <value>Overwrite and save</value>
-  </data>
+  </data>
-  <data name="IDS_FAILED_TO_SAVE_TITLE">
+  <data name="IDS_FAILED_TO_SAVE_TITLE">
-    <value>Save failed</value>
+    <value>Save failed</value>
-  </data>
+  </data>
-  <data name="IDS_STORAGEDEVICEPROBLEM_TITLE">
+  <data name="IDS_STORAGEDEVICEPROBLEM_TITLE">
-    <value>Storage Device Problem</value>
+    <value>Storage Device Problem</value>
-  </data>
+  </data>
-  <data name="IDS_FAILED_TO_SAVE_TEXT">
+  <data name="IDS_FAILED_TO_SAVE_TEXT">
-    <value>Your storage device is unavailable or has an error</value>
+    <value>Your storage device is unavailable or has an error</value>
-  </data>
+  </data>
-  <data name="IDS_FAILED_TO_LOADSAVE_TEXT">
+  <data name="IDS_FAILED_TO_LOADSAVE_TEXT">
-    <value>Your storage device is unavailable or has an error. Please select a new storage device.</value>
+    <value>Your storage device is unavailable or has an error. Please select a new storage device.</value>
-  </data>
+  </data>
-  <data name="IDS_SELECTANEWDEVICE">
+  <data name="IDS_SELECTANEWDEVICE">
-    <value>Select a new storage device</value>
+    <value>Select a new storage device</value>
-  </data>
+  </data>
-<data name="IDS_NODEVICE_TITLE">
+<data name="IDS_NODEVICE_TITLE">
-    <value>No storage device selected</value>
+    <value>No storage device selected</value>
-  </data>
+  </data>
-<data name="IDS_NODEVICE_TEXT">
+<data name="IDS_NODEVICE_TEXT">
-    <value>If you do not select a storage device, game saves will be disabled</value>
+    <value>If you do not select a storage device, game saves will be disabled</value>
-  </data>
+  </data>
-<data name="IDS_NODEVICE_ACCEPT">
+<data name="IDS_NODEVICE_ACCEPT">
-    <value>Select a storage device</value>
+    <value>Select a storage device</value>
-  </data>
+  </data>
-<data name="IDS_NODEVICE_DECLINE">
+<data name="IDS_NODEVICE_DECLINE">
-    <value>Continue without saving</value>
+    <value>Continue without saving</value>
-  </data>
+  </data>
-<data name="IDS_DEVICEGONE_TEXT">
+<data name="IDS_DEVICEGONE_TEXT">
-    <value>Your storage device has been removed.  Please select a new one.</value>
+    <value>Your storage device has been removed.  Please select a new one.</value>
-  </data>
+  </data>
-<data name="IDS_DEVICEGONE_TITLE">
+<data name="IDS_DEVICEGONE_TITLE">
-    <value>Loading failed</value>
+    <value>Loading failed</value>
-  </data>
+  </data>
-  <data name="IDS_KEYBOARDUI_SAVEGAME_TITLE">
+  <data name="IDS_KEYBOARDUI_SAVEGAME_TITLE">
-    <value>Name the save</value>
+    <value>Name the save</value>
-  </data>
+  </data>
-  <data name="IDS_KEYBOARDUI_SAVEGAME_TEXT">
+  <data name="IDS_KEYBOARDUI_SAVEGAME_TEXT">
-    <value>Enter a name for your savegame</value>
+    <value>Enter a name for your savegame</value>
-  </data>
+  </data>
-  <data name="IDS_WARNING_ARCADE_TITLE">
+  <data name="IDS_WARNING_ARCADE_TITLE">
-    <value>Return to Xbox Dashboard</value>
+    <value>Return to Xbox Dashboard</value>
-  </data>
+  </data>
-  <data name="IDS_WARNING_ARCADE_TEXT">
+  <data name="IDS_WARNING_ARCADE_TEXT">
-    <value>Are you sure you want to exit the game?</value>
+    <value>Are you sure you want to exit the game?</value>
-  </data>
+  </data>
-
+
-  <data name="IDS_PRO_RETURNEDTOMENU_TITLE">
+  <data name="IDS_PRO_RETURNEDTOMENU_TITLE">
-    <value>Signed out</value>
+    <value>Signed out</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_RETURNEDTOTITLESCREEN_TEXT">
+  <data name="IDS_PRO_RETURNEDTOTITLESCREEN_TEXT">
-    <value>You have been returned to the title screen because your gamer profile was signed out</value>
+    <value>You have been returned to the title screen because your gamer profile was signed out</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_RETURNEDTOMENU_TEXT">
+  <data name="IDS_PRO_RETURNEDTOMENU_TEXT">
-    <value>The match has ended because a gamer profile was signed out</value>
+    <value>The match has ended because a gamer profile was signed out</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_RETURNEDTOMENU_ACCEPT">
+  <data name="IDS_PRO_RETURNEDTOMENU_ACCEPT">
-    <value>Continue playing</value>
+    <value>Continue playing</value>
-  </data>
+  </data>
-
+
-  <data name="IDS_PRO_NOTONLINE_TITLE">
+  <data name="IDS_PRO_NOTONLINE_TITLE">
-    <value>Gamer profile not online</value>
+    <value>Gamer profile not online</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_NOTONLINE_TEXT">
+  <data name="IDS_PRO_NOTONLINE_TEXT">
-    <value>This game has some features which require an Xbox Live enabled gamer profile, but you are currently offline.</value>
+    <value>This game has some features which require an Xbox Live enabled gamer profile, but you are currently offline.</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_XBOXLIVE_NOTIFICATION">
+  <data name="IDS_PRO_XBOXLIVE_NOTIFICATION">
-    <value>This feature requires a gamer profile which is signed into Xbox Live.</value>
+    <value>This feature requires a gamer profile which is signed into Xbox Live.</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_NOTONLINE_ACCEPT">
+  <data name="IDS_PRO_NOTONLINE_ACCEPT">
-    <value>Connect to Xbox Live</value>
+    <value>Connect to Xbox Live</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_NOTONLINE_DECLINE">
+  <data name="IDS_PRO_NOTONLINE_DECLINE">
-    <value>Continue playing offline</value>
+    <value>Continue playing offline</value>
-  </data>
+  </data>
-
+
- 
+ 
- <data name="IDS_PRO_ACHIEVEMENTPROBLEM_TITLE">
+ <data name="IDS_PRO_ACHIEVEMENTPROBLEM_TITLE">
-    <value>Achievement Award Problem</value>
+    <value>Achievement Award Problem</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_ACHIEVEMENTPROBLEM_TEXT">
+  <data name="IDS_PRO_ACHIEVEMENTPROBLEM_TEXT">
-    <value> There was a problem accessing your gamer profile. Your achievement could not be awarded at this time.</value>
+    <value> There was a problem accessing your gamer profile. Your achievement could not be awarded at this time.</value>
-  </data>
+  </data>
-
+
-
+
-  <data name="IDS_PRO_NOPROFILE_TITLE">
+  <data name="IDS_PRO_NOPROFILE_TITLE">
-    <value>Gamer profile problem</value>
+    <value>Gamer profile problem</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_NOPROFILEOPTIONS_TEXT">
+  <data name="IDS_PRO_NOPROFILEOPTIONS_TEXT">
-    <value>Saving of settings to gamer profile has failed.</value>
+    <value>Saving of settings to gamer profile has failed.</value>
-  </data>
+  </data>
-
+
-  <data name="IDS_PRO_GUESTPROFILE_TITLE">
+  <data name="IDS_PRO_GUESTPROFILE_TITLE">
-    <value>Guest Gamer Profile</value>
+    <value>Guest Gamer Profile</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_GUESTPROFILE_TEXT">
+  <data name="IDS_PRO_GUESTPROFILE_TEXT">
-    <value>Guest gamer profile cannot access this feature. Please use a different gamer profile.</value>
+    <value>Guest gamer profile cannot access this feature. Please use a different gamer profile.</value>
-  </data>
+  </data>
-
+
-  <data name="IDS_STO_SAVING_SHORT">
+  <data name="IDS_STO_SAVING_SHORT">
-    <value>Saving…</value>
+    <value>Saving…</value>
-  </data>
+  </data>
-  <data name="IDS_STO_SAVING_LONG">
+  <data name="IDS_STO_SAVING_LONG">
-    <value>Saving content. Please don't turn off your console.</value>
+    <value>Saving content. Please don't turn off your console.</value>
-  </data>
+  </data>
-  <data name="IDS_PRO_UNLOCKGAME_TITLE">
+  <data name="IDS_PRO_UNLOCKGAME_TITLE">
-    <value>Unlock Full Game</value>
+    <value>Unlock Full Game</value>
-  </data>
+  </data>
- <data name="IDS_PRO_UNLOCKGAME_TEXT">
+ <data name="IDS_PRO_UNLOCKGAME_TEXT">
-    <value>This is the Minecraft trial game. If you had the full game, you would just have earned an achievement! 
+    <value>This is the Minecraft trial game. If you had the full game, you would just have earned an achievement! 
-Unlock the full game to experience the joy of Minecraft and to play with your friends across the globe through Xbox Live.
+Unlock the full game to experience the joy of Minecraft and to play with your friends across the globe through Xbox Live.
-Would you like to unlock the full game?</value>
+Would you like to unlock the full game?</value>
-  </data>
+  </data>
-<data name="IDS_PRO_PROFILEPROBLEM_TEXT"> 
+<data name="IDS_PRO_PROFILEPROBLEM_TEXT"> 
-  <value>You are being returned to the main menu because of a problem reading your profile.</value>
+  <value>You are being returned to the main menu because of a problem reading your profile.</value>
-</data>
+</data>
-
+
-</root>
+</root>