Merge remote-tracking branch 'origin/main' into networking

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.ReloadSkin();
+	ui.ReloadSkins();
 #endif
 }
 

Minecraft.Client/ClientConnection.cpp

@@ -1825,10 +1825,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

Minecraft.Client/Common/App_enums.h

@@ -875,7 +875,8 @@ 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/Audio/SoundEngine.cpp

@@ -22,44 +22,13 @@
 #ifdef __ORBIS__
 #include <audioout.h>
 //#define __DISABLE_MILES__			// MGH disabled for now as it crashes if we call sceNpMatching2Initialize
-#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
+#endif
 
 // 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[]={"redist64"};
+char SoundEngine::m_szRedistName[]={"Windows64\\redist64"}; //str1k3r - moved this to the Windows64 dir so its out of plain view
 #elif defined _DURANGO
 char SoundEngine::m_szSoundPath[]={"Sound\\"};
 char SoundEngine::m_szMusicPath[]={"music\\"};
@@ -79,7 +48,7 @@ char SoundEngine::m_szMusicPath[]={"music/"};
 char SoundEngine::m_szRedistName[]={"redist"};
 #endif
 
-/*#ifdef _CONTENT_PACKAGE // strk1k3r - not needed use default paths instead.
+/*#ifdef _CONTENT_PACKAGE // str1k3r - not needed use default paths instead.
 char SoundEngine::m_szSoundPath[]={"Sound/"};
 #elif defined _ART_BUILD
 char SoundEngine::m_szSoundPath[]={"Sound/"};
@@ -111,7 +80,6 @@ char *SoundEngine::m_szStreamFileA[eStream_Max]=
 	"hal4",
 	"nuance1",
 	"nuance2",
-#ifndef _XBOX
 	// add the new music tracks
 	"creative1",
 	"creative2",
@@ -123,11 +91,9 @@ char *SoundEngine::m_szStreamFileA[eStream_Max]=
 	"menu2",
 	"menu3",
 	"menu4",
-#endif	
 	"piano1",
 	"piano2",
 	"piano3",
-
 	// Nether
 	"nether1",
 	"nether2",
@@ -308,9 +274,7 @@ void SoundEngine::init(Options *pOptions)
 		sprintf(szBankName,"%s/%s",getUsrDirPath(), m_szSoundPath );
 	}
 	
-#elif defined __PSVITA__
-	sprintf(szBankName,"%s/%s",getUsrDirPath(), m_szSoundPath );
-#elif defined __ORBIS__
+#elif (defined __PSVITA__ || __ORBIS__)
 	sprintf(szBankName,"%s/%s",getUsrDirPath(), m_szSoundPath );
 #else
 	strcpy((char *)szBankName,m_szSoundPath);
@@ -791,7 +755,9 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
 	char *SoundName = (char *)ConvertSoundPathToName(name);
 	strcat((char *)szSoundName,SoundName);
 
-//	app.DebugPrintf(6,"PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch %f)\n",iSound, SoundName, szSoundName,x,y,z,volume,pitch);
+#ifdef _DEBUG
+	app.DebugPrintf(6,"PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch %f)\n",iSound, SoundName, szSoundName,x,y,z,volume,pitch);
+#endif
 
 	AUDIO_INFO AudioInfo;
 	AudioInfo.x=x;
@@ -846,9 +812,11 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
 
 	char *SoundName = (char *)ConvertSoundPathToName(name);
 	strcat((char *)szSoundName,SoundName);
-//	app.DebugPrintf("UI: Playing %s, volume %f, pitch %f\n",SoundName,volume,pitch);
 
-	//app.DebugPrintf("PlaySound - %d - %s\n",iSound, SoundName);
+#ifdef _DEBUG
+	app.DebugPrintf("UI: Playing %s, volume %f, pitch %f\n",SoundName,volume,pitch);
+	app.DebugPrintf("PlaySound - %d - %s\n",iSound, SoundName);
+#endif
 
 	AUDIO_INFO AudioInfo;
 	memset(&AudioInfo,0,sizeof(AUDIO_INFO));
@@ -1136,10 +1104,12 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 	SoundEngine *soundEngine = (SoundEngine *)lpParameter;
 	soundEngine->m_hStream = AIL_open_stream(soundEngine->m_hDriver,soundEngine->m_szStreamName,0);
 
+#ifdef _DEBUG
 	if(soundEngine->m_hStream==0)
 	{
 		app.DebugPrintf("SoundEngine::OpenStreamThreadProc - Could not open - %s\n",soundEngine->m_szStreamName);
 	}
+#endif
 	return 0;
 }
 
@@ -1160,13 +1130,17 @@ void SoundEngine::playMusicTick()
 void SoundEngine::playMusicUpdate() 
 {
 	//return;
-	static bool firstCall = true;
 	static float fMusicVol = 0.0f;
+#ifndef _WINDOWS64 //str1k3r - if used on windows64 volume doesnt update
+	static bool firstCall = true;
 	if( firstCall )
 	{
 		fMusicVol = getMasterMusicVolume();
 		firstCall = false;
 	}
+#else
+	fMusicVol = getMasterMusicVolume();
+#endif
 
 	switch(m_StreamState)
 	{
@@ -1226,7 +1200,7 @@ void SoundEngine::playMusicUpdate()
 					m_MusicType=eMusicType_Game;
 					m_StreamingAudioInfo.bIs3D=false;
 				
-#ifdef _XBOX_ONE
+#if (defined _XBOX_ONE || _WINDOWS64)
 					wstring &wstrSoundName=dlcAudioFile->GetSoundName(m_musicID);
 					wstring wstrFile=L"TPACK:\\Data\\" + wstrSoundName +L".binka";
 					std::wstring mountedPath = StorageManager.GetMountedPath(wstrFile);
@@ -1235,12 +1209,7 @@ 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
@@ -1514,7 +1483,9 @@ void SoundEngine::playMusicUpdate()
 				}
 
 				// volume change required?
-				if(fMusicVol!=getMasterMusicVolume())
+#ifndef _WINDOWS64
+				if(fMusicVol!=getMasterMusicVolume()) //str1k3r - if used on windows64 music doesnt update its volume
+#endif
 				{
 					fMusicVol=getMasterMusicVolume();
 					HSAMPLE hSample = AIL_stream_sample_handle( m_hStream); 
@@ -1656,8 +1627,6 @@ char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpac
 	return buf;
 }
 
-#endif
-
 
 F32 AILCALLBACK custom_falloff_function (HSAMPLE   S, 
 										 F32       distance,

Minecraft.Client/Common/Buildsteps/4JLibs.ps1

@@ -0,0 +1,80 @@
+param(
+    [string]$ProjectDir,
+    [string]$Platform,
+    [string]$Configuration
+)
+
+if ($ProjectDir -match "Minecraft.World") {
+    $BaseDir = "$ProjectDir..\Minecraft.Client\"
+} elseif ($ProjectDir -match "Minecraft.Client") {
+    $BaseDir = $ProjectDir
+} else {
+    Write-Host "4JLibs: Unknown project directory: '$ProjectDir'"
+    exit 1
+}
+
+switch ($Platform) {
+    "x64"       { $LibsDir = Join-Path $BaseDir "Windows64\4JLibs\"; $ExpectedCount = 4; $PlatformName = "Windows64" }
+    "Durango"   { $LibsDir = Join-Path $BaseDir "Durango\4JLibs\";   $ExpectedCount = 4; $PlatformName = "Durango" }
+    "Xbox 360"  { $LibsDir = Join-Path $BaseDir "Xbox\4JLibs\";      $ExpectedCount = 5; $PlatformName = "Xbox" }
+    "PS3"       { $LibsDir = Join-Path $BaseDir "PS3\4JLibs\";       $ExpectedCount = 4; $PlatformName = "PS3" }
+    "Orbis"     { $LibsDir = Join-Path $BaseDir "Orbis\4JLibs\";     $ExpectedCount = 4; $PlatformName = "Orbis" }
+    "PSVita"    { $LibsDir = Join-Path $BaseDir "PSVita\4JLibs\";    $ExpectedCount = 4; $PlatformName = "PSVita" }
+    default     { Write-Host "4JLibs: Unknown platform: '$Platform'";   exit 1 }
+}
+
+if ($Configuration -match "ContentPackage" -or $Configuration -match "Release") {
+    $BuildConfig = "Release"
+} elseif ($Configuration -match "Debug") {
+    $BuildConfig = "Debug"
+} else {
+    Write-Host "4JLibs: Configuration did not match any known patterns, defaulting to Debug"
+    $BuildConfig = "Debug"
+}
+
+if (-not (Test-Path $LibsDir)) {
+    Write-Host "4JLibs: $PlatformName 4JLibs directory not found"
+    exit 1
+} elseif (-not (Test-Path "$LibsDir\Headers\$PlatformName")) {
+    Write-Host "4JLibs: $PlatformName 4JLibs Headers directory not found"
+    exit 1
+} elseif (-not (Test-Path "$LibsDir\Headers")) {
+    Write-Host "4JLibs: Headers directory not found"
+    exit 1
+}
+
+$incPath  = Join-Path $LibsDir "inc"
+$libsPath = Join-Path $LibsDir "libs"
+
+$incCount  = (Get-ChildItem -Path $incPath -Filter "*.h" -ErrorAction SilentlyContinue).Count
+
+if ($BuildConfig -eq "Release") {
+    $libCount = (Get-ChildItem -Path $libsPath -Filter "*_r.lib" -ErrorAction SilentlyContinue).Count
+} else {
+    $libCount = (Get-ChildItem -Path $libsPath -Filter "*_d.lib" -ErrorAction SilentlyContinue).Count
+}
+
+if ($incCount -lt $ExpectedCount) {
+    Write-Host "4JLibs: Copying header files for $PlatformName"
+    xcopy "$LibsDir\Headers\$PlatformName\*" "$incPath" /E /I /Y
+} else {
+    Write-Host "4JLibs: inc files already present, skipping copy."
+}
+
+if ($libCount -lt $ExpectedCount) {
+    Write-Host "4JLibs: Building 4JLibs for $PlatformName in $BuildConfig"
+
+    & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" `
+        (Join-Path $LibsDir "4JLibs.sln") `
+        /p:Configuration=$BuildConfig `
+        /p:Platform=$PlatformName `
+        /v:minimal `
+        /m
+    
+    if ($LASTEXITCODE -ne 0) {
+        Write-Host "4JLibs: Build failed with exit code: $LASTEXITCODE"
+        exit $LASTEXITCODE
+    }
+} else {
+    Write-Host "4JLibs: libs already present, skipping build."
+}