cafeberry/cafeberry-dev
3
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

chore: Final postbuilds & update soundengine paths

Browse Source 
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.
This commit is contained in:
str1k3r
2026-07-06 07:48:26 -04:00
parent 2d1e13a0e1
commit 601b12ebb5
7 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/Audio/SoundEngine.cpp
+8 -10
View File
@@ -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
Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1
+5 -5
View File
@@ -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
Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1
+5 -3
View File
@@ -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" }
)
Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1
+2 -2
View File
@@ -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" },
)
Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1
+9 -11
View File
@@ -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
Minecraft.Client/Durango/Durango_Minecraft.cpp
+1 -1
View File
@@ -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,
Minecraft.Client/Orbis/Orbis_Minecraft.cpp
+2 -2
View File
@@ -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,