From f33b571e9e2018783b4281f0cc966d39c0d1ebba Mon Sep 17 00:00:00 2001
From: str1k3r <115313679+S1l3ntStr1ke87@users.noreply.github.com>
Date: Thu, 7 May 2026 14:11:57 -0700
Subject: [PATCH 1/2] Point Music folder to platforms media folder, add xbox &
 orbis to this list aswell

---
 Minecraft.Client/Common/Audio/SoundEngine.cpp | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp
index b4210b178..b65e3010f 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp
@@ -65,13 +65,29 @@ void SoundEngine::playMusicTick() {};
 
 #ifdef _WINDOWS64
 char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"};
-char SoundEngine::m_szMusicPath[]={"music\\"};
+char SoundEngine::m_szMusicPath[]={"Windows64Media\\Music\\"};
 char SoundEngine::m_szRedistName[]={"redist64"};
 #elif defined _DURANGO
-char SoundEngine::m_szSoundPath[]={"Sound\\"};
-char SoundEngine::m_szMusicPath[]={"music\\"};
+char SoundEngine::m_szSoundPath[]={"Durango\\Sound\\"};
+char SoundEngine::m_szMusicPath[]={"DurangoMedia\\Music\\"};
 char SoundEngine::m_szRedistName[]={"redist64"};
 #elif defined __ORBIS__
+char SoundEngine::m_szSoundPath[]={"Orbis\\Sound\\"};
+char SoundEngine::m_szMusicPath[]={"OrbisMedia\\Music\\"};
+char SoundEngine::m_szRedistName[]={"redist64"};
+#elif defined _XBOX
+char SoundEngine::m_szSoundPath[]={"Xbox\\Sound\\"};
+char SoundEngine::m_szMusicPath[]={"XboxMedia\\Music\\"};
+char SoundEngine::m_szRedistName[]={"redist"};
+#elif defined __PSVITA__
+char SoundEngine::m_szSoundPath[]={"PSVita\\Sound\\"};
+char SoundEngine::m_szMusicPath[]={"PSVitaMedia\\Music\\"};
+char SoundEngine::m_szRedistName[]={"redist"};
+#elif defined __PS3__
+//extern const char* getPS3HomePath();
+char SoundEngine::m_szSoundPath[]={"PS3\\Sound\\"};
+char SoundEngine::m_szMusicPath[]={"PS3Media\\Music\\"};
+char SoundEngine::m_szRedistName[]={"redist"};
 
 #ifdef _CONTENT_PACKAGE
 char SoundEngine::m_szSoundPath[]={"Sound/"};
@@ -81,17 +97,6 @@ char SoundEngine::m_szSoundPath[]={"Sound/"};
 // 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_szMusicPath[]={"music/"};
-char SoundEngine::m_szRedistName[]={"redist64"};
-#elif defined __PSVITA__
-char SoundEngine::m_szSoundPath[]={"PSVita/Sound/"};
-char SoundEngine::m_szMusicPath[]={"music/"};
-char SoundEngine::m_szRedistName[]={"redist"};
-#elif defined __PS3__
-//extern const char* getPS3HomePath();
-char SoundEngine::m_szSoundPath[]={"PS3/Sound/"};
-char SoundEngine::m_szMusicPath[]={"music/"};
-char SoundEngine::m_szRedistName[]={"redist"};
 
 #define USE_SPURS
 
@@ -1500,4 +1505,4 @@ char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpac
 	return buf;
 }
 
-#endif
\ No newline at end of file
+#endif

From 0fc81f0fe9ea10ad41090df269aedb0d12e449c9 Mon Sep 17 00:00:00 2001
From: str1k3r <115313679+S1l3ntStr1ke87@users.noreply.github.com>
Date: Thu, 7 May 2026 14:16:15 -0700
Subject: [PATCH 2/2] Move the music folder out of root and into the platforms
 media folder

---
 Minecraft.Client/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt
index dca60173c..0b880d5ad 100644
--- a/Minecraft.Client/CMakeLists.txt
+++ b/Minecraft.Client/CMakeLists.txt
@@ -72,7 +72,7 @@ endforeach()
 # ---
 include("${CMAKE_SOURCE_DIR}/cmake/CopyAssets.cmake")
 set(ASSET_FOLDER_PAIRS
-  "${CMAKE_CURRENT_SOURCE_DIR}/music"                  "music"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Music"                  "${PLATFORM_NAME}Media/Music"
   "${CMAKE_CURRENT_SOURCE_DIR}/Common/Media"           "Common/Media"
   "${CMAKE_CURRENT_SOURCE_DIR}/Common/res"             "Common/res"
   "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media"  "${PLATFORM_NAME}Media"