From 601b12ebb588cc314c9c3c880781f679667f8cf1 Mon Sep 17 00:00:00 2001 From: str1k3r <115313679+S1l3ntStr1ke87@users.noreply.github.com> Date: Mon, 6 Jul 2026 07:48:26 -0400 Subject: [PATCH] chore: Final postbuilds & update soundengine paths This gives the final postbuilds (for now) and updates the soundengine paths to use orbis & windows64 respective paths ontop of this it fixes a small issue with durango & orbis. --- Minecraft.Client/Common/Audio/SoundEngine.cpp | 18 ++++++++--------- .../Common/Postbuilds/Orbis-postbuild.ps1 | 10 +++++----- .../Common/Postbuilds/PS3-postbuild.ps1 | 8 +++++--- .../Common/Postbuilds/PSVita-postbuild.ps1 | 4 ++-- .../Common/Postbuilds/Windows64-postbuild.ps1 | 20 +++++++++---------- .../Durango/Durango_Minecraft.cpp | 2 +- Minecraft.Client/Orbis/Orbis_Minecraft.cpp | 4 ++-- 7 files changed, 32 insertions(+), 34 deletions(-) diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 443a7721..6be1a03c 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -55,8 +55,9 @@ 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[]={"Durango\\Sound\\"}; +char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"}; char SoundEngine::m_szMusicPath[]={"music\\"}; char SoundEngine::m_szRedistName[]={"redist64"}; #elif defined _DURANGO @@ -64,15 +65,7 @@ char SoundEngine::m_szSoundPath[]={"Sound\\"}; char SoundEngine::m_szMusicPath[]={"music\\"}; char SoundEngine::m_szRedistName[]={"redist64"}; #elif defined __ORBIS__ - -#ifdef _CONTENT_PACKAGE -char SoundEngine::m_szSoundPath[]={"Sound/"}; -#elif defined _ART_BUILD -char SoundEngine::m_szSoundPath[]={"Sound/"}; -#else -// just use the host Durango folder for the sound. In the content package, we'll have moved this in the .gp4 file -char SoundEngine::m_szSoundPath[]={"Durango/Sound/"}; -#endif +char SoundEngine::m_szSoundPath[]={"PS4/Sound/"}; char SoundEngine::m_szMusicPath[]={"music/"}; char SoundEngine::m_szRedistName[]={"redist64"}; #elif defined __PSVITA__ @@ -84,6 +77,11 @@ char SoundEngine::m_szRedistName[]={"redist"}; char SoundEngine::m_szSoundPath[]={"PS3/Sound/"}; char SoundEngine::m_szMusicPath[]={"music/"}; char SoundEngine::m_szRedistName[]={"redist"}; +#ifdef _CONTENT_PACKAGE +char SoundEngine::m_szSoundPath[]={"Sound/"}; +#elif defined _ART_BUILD +char SoundEngine::m_szSoundPath[]={"Sound/"}; +#endif #define USE_SPURS diff --git a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 index 79bd615e..2ab68f12 100644 --- a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 +++ b/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 @@ -10,6 +10,7 @@ $directories = @( "Orbis", "Common", "Common\Media", + "Common\Tutorial", "Common\res", "Sound" ) @@ -22,12 +23,11 @@ $folderCopies = @( @{ Source = "music"; Dest = "PS4_GAME\music" }, @{ Source = "Common\Media"; Dest = "PS4_GAME\Common\Media" }, @{ Source = "Common\res"; Dest = "PS4_GAME\Common\res" }, - @{ Source = "Common\Tutorial"; Dest = "PS4_GAME\Common\Tutorial" }, - @{ Source = "Common\Tutorial"; Dest = "PS4_GAME\Common\Tutorial" }, + @{ Source = "PSVita\Tutorial"; Dest = "PS4_GAME\Common\Tutorial" }, @{ Source = "PS3\Sound"; Dest = "PS4_GAME\Sound" }, @{ Source = "Common\Postbuilds\Contents\Orbis\sce_module"; Dest = "PS4_GAME\sce_module" }, - @{ Source = "Common\Postbuilds\Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" }, - @{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" }, + @{ Source = "Common\Postbuilds\Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" }, + @{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" }, ) foreach ($copy in $folderCopies) { @@ -52,7 +52,7 @@ foreach ($copy in $fileCopies) { } } -$builtFile = Join-Path $OutDir "Minecraft.Client.self" +$builtFile = Join-Path $OutDir "Minecraft.Client.elf" $newName = "eboot.bin" $destDir = Join-Path $OutDir "PS4_GAME" $destPath = Join-Path $destDir $newName diff --git a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 index e75baa88..f7daee91 100644 --- a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 +++ b/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 @@ -9,7 +9,8 @@ $directories = @( "PS3_GAME\USRDIR\music", "PS3_GAME\USRDIR\DLC", "PS3_GAME\USRDIR\Common\Media", - "PS3_GAME\USRDIR\Common\res", + "PS3_GAME\USRDIR\Common\res", + "PS3_GAME\USRDIR\PS3\Tutorial", "PS3_GAME\USRDIR\PS3\Sound" ) @@ -21,9 +22,10 @@ $folderCopies = @( @{ Source = "music"; Dest = "PS3_GAME\USRDIR\music" }, @{ 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\DLC"; Dest = "PS3_GAME\USRDIR\DLC" }, @{ Source = "PS3\Sound"; Dest = "PS3_GAME\USRDIR\PS3\Sound" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\LICDIR"; Dest = "PS3_GAME\LICDIR" }, + @{ Source = "PSVita\Tutorial"; Dest = "PS3_GAME\USRDIR\PS3\Tutorial" } + @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\LICDIR"; Dest = "PS3_GAME\LICDIR" }, @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\TROPDIR"; Dest = "PS3_GAME\TROPDIR" } ) diff --git a/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 index 7eea0e4f..bfd67f51 100644 --- a/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 +++ b/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 @@ -24,7 +24,7 @@ $folderCopies = @( @{ Source = "Common\res"; Dest = "PSVITA_GAME\Common\res" }, @{ Source = "PSVita\Sound"; Dest = "PSVITA_GAME\Sound" }, @{ Source = "Common\Postbuilds\Contents\PSVita\sce_module"; Dest = "PSVITA_GAME\sce_module" }, - @{ Source = "Common\Postbuilds\Contents\PSVita\sce_sys"; Dest = "PSVITA_GAME\sce_sys" } + @{ Source = "Common\Postbuilds\Contents\PSVita\sce_sys"; Dest = "PSVITA_GAME\sce_sys" } ) foreach ($copy in $folderCopies) { @@ -38,7 +38,7 @@ foreach ($copy in $folderCopies) { $fileCopies = @( @{ Source = "PSVita\PSVitaProductCodes.bin"; Dest = "PSVITA_GAME\PSVita\PSVitaProductCodes.bin" }, - @{ Source = "PSVita\session_image.png"; Dest = "PSVITA_GAME\PSVita\session_image.png" }, + @{ Source = "PSVita\session_image.png"; Dest = "PSVITA_GAME\PSVita\session_image.png" }, @{ Source = "Common\Postbuilds\Contents\PSVita\icon.png"; Dest = "PSVITA_GAME\icon.png" }, ) diff --git a/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 index 623981f6..bad16d61 100644 --- a/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 +++ b/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 @@ -10,7 +10,6 @@ $directories = @( "Windows64\GameHDD", "Common\Media", "Common\res", - "Common\Tutorial", "Windows64Media", "redist64" ) @@ -19,19 +18,18 @@ foreach ($dir in $directories) { New-Item -ItemType Directory -Path (Join-Path $OutDir $dir) -Force | Out-Null } -$copies = @( - @{ Source = "music"; Dest = "music" }, - @{ Source = "Common\Media"; Dest = "Common\Media" }, - @{ Source = "Common\res"; Dest = "Common\res" }, - @{ Source = "Common\Tutorial"; Dest = "Common\Tutorial" }, - @{ Source = "Windows64\GameHDD"; Dest = "Windows64\GameHDD" }, - @{ Source = "Windows64\Sound"; Dest = "Windows64\Sound" }, - @{ Source = "DurangoMedia"; Dest = "Windows64Media" }, - @{ Source = "Windows64Media"; Dest = "Windows64Media" }, +$folderCopies = @( + @{ Source = "Common\Media"; Dest = "Common\Media" }, + @{ Source = "Common\res"; Dest = "Common\res" }, + @{ Source = "DurangoMedia"; Dest = "Windows64Media" }, + @{ Source = "Windows64Media"; Dest = "Windows64Media" }, + @{ Source = "PSVita\Tutorial"; Dest = "Windows64Media\Tutorial" }, + @{ Source = "Windows64Media\music"; Dest = "Windows64Media\music" }, + @{ Source = "Windows64Media\Sound"; Dest = "Windows64Media\Sound" }, @{ Source = "Common\Postbuilds\Contents\Windows64\redist64"; Dest = "redist64" } ) -foreach ($copy in $copies) { +foreach ($copy in $folderCopies) { $src = Join-Path $ProjectDir $copy.Source $dst = Join-Path $OutDir $copy.Dest diff --git a/Minecraft.Client/Durango/Durango_Minecraft.cpp b/Minecraft.Client/Durango/Durango_Minecraft.cpp index 6df6db66..83264ae0 100644 --- a/Minecraft.Client/Durango/Durango_Minecraft.cpp +++ b/Minecraft.Client/Durango/Durango_Minecraft.cpp @@ -588,7 +588,7 @@ void oldWinMainInit() byteArray baSaveThumbnail = app.getArchiveFile(L"DefaultSaveThumbnail64x64.png"); - StorageManager.InitialiseProfileData(PROFILE_VERSION_BUILD_JUNE14, + StorageManager.InitialiseProfileData(PROFILE_VERSION_11, NUM_PROFILE_VALUES, NUM_PROFILE_SETTINGS, dwProfileSettingsA, diff --git a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp index f2166597..b6224bd2 100644 --- a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp +++ b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp @@ -969,7 +969,7 @@ int main(int argc, const char *argv[] ) ProfileManager.Initialise( &commsId, //SQRNetworkManager::GetSceNpCommsId(), &commsSig, //SQRNetworkManager::GetSceNpCommsSig(), - PROFILE_VERSION_BUILD_JUNE14, + PROFILE_VERSION_11, NUM_PROFILE_VALUES, NUM_PROFILE_SETTINGS, dwProfileSettingsA, @@ -1003,7 +1003,7 @@ int main(int argc, const char *argv[] ) byteArray baSaveThumbnail = app.getArchiveFile(L"DefaultSaveThumbnail64x64.png"); byteArray baSaveImage = app.getArchiveFile(L"DefaultSaveImage228x128.png"); - StorageManager.InitialiseProfileData(PROFILE_VERSION_BUILD_JUNE14, + StorageManager.InitialiseProfileData(PROFILE_VERSION_11, NUM_PROFILE_VALUES, NUM_PROFILE_SETTINGS, dwProfileSettingsA,