Merge pull request #122 from Pyogenics/asset-cleanup

Cleanup after the last Minecraft.Assets pr

Minecraft.Assets/meson.build

@@ -2,10 +2,12 @@
 # Asset copy
 #
 
-
-client_platform_path = meson.project_source_root() / 'Minecraft.Client/Platform'
-
-install_subdir('Common', install_dir : get_option('prefix'))
+install_subdir('Common/res', install_dir : get_option('prefix') / 'Common')
+install_subdir('Common/Trial', install_dir : get_option('prefix') / 'Common')
+install_subdir('Common/music', install_dir : get_option('prefix'))
+install_subdir('DurangoMedia/Sound', install_dir : get_option('prefix'))
+# XXX: The DLC path is handled inside of 4JLibs but Windows64 expects a Windows64Media/DLC folder to exist to load DLC from
+# install_subdir('DurangoMedia/DLC', install_dir : get_option('prefix') / 'DurangoMedia') 
 
 #
 # Asset build
@@ -33,12 +35,14 @@ colour_table = custom_target('Minecraft.Assets_Colour_Table',
 )
 
 archive_sources = [ 
-  localisation[0], # client_platform_path / 'Windows64Media/Media/languages.loc',
+  localisation[0],
   colour_table,
   'Common/Media/splashes.txt',
   'Common/Media/Graphics/SaveChest.png',
   'Common/Media/Graphics/MinecraftIcon.png',
   'Common/Media/Graphics/TexturePackIcon.png',
+]
+archive_sources_windows64 = [
   'Windows64Media/Media/Tutorial.pck',
   'Windows64Media/Media/skinWin.swf',
   'Windows64Media/Media/skinHDWin.swf',
@@ -404,10 +408,68 @@ archive_sources_moviesVita = [
   'Common/Media/DebugUIConsoleComponent720.swf',
   'Common/Media/DebugUIMarketingGuide720.swf'
 ]
+# Platform Media
+archive_sources_windows64 = [
+  # 'Windows64Media/Media/languages.loc',
+  'Windows64Media/Media/DLCOffersMenu1080.swf',
+  'Windows64Media/Media/DLCOffersMenu480.swf',
+  'Windows64Media/Media/DLCOffersMenu720.swf',
+  'Windows64Media/Media/DLCOffersMenuVita.swf',
+  'Windows64Media/Media/Tutorial.pck',
+  'Windows64Media/Media/skinHDWin.swf',
+  'Windows64Media/Media/skinWin.swf'
+]
+archive_sources_linux = [
+  # 'Windows64Media/Media/languages.loc',
+  'Windows64Media/Media/DLCOffersMenu1080.swf',
+  'Windows64Media/Media/DLCOffersMenu480.swf',
+  'Windows64Media/Media/DLCOffersMenu720.swf',
+  'Windows64Media/Media/DLCOffersMenuVita.swf',
+  'Windows64Media/Media/Tutorial.pck',
+  'Windows64Media/Media/skinHDWin.swf',
+  'Windows64Media/Media/skinWin.swf'
+]
+archive_sources_durango = [
+  # 'DurangoMedia/Media/languages.loc',
+  'DurangoMedia/Media/Tutorial.pck',
+  'DurangoMedia/Media/skinDurango.swf',
+  'DurangoMedia/Media/skinHDDurango.swf',
+  'DurangoMedia/Media/DLCOffersMenu1080.swf',
+  'DurangoMedia/Media/DefaultSaveThumbnail64x64.png'
+]
+archive_sources_orbis = [
+  # 'OrbisMedia/Media/languages.loc',
+  'OrbisMedia/Media/Tutorial.pck',
+  'OrbisMedia/Media/skinHDOrbis.swf',
+  'OrbisMedia/Media/skinOrbis.swf',
+  'OrbisMedia/Media/DefaultOptionsImage228x128.png',
+  'OrbisMedia/Media/DefaultSaveImage228x128.png',
+  'OrbisMedia/Media/DefaultSaveThumbnail64x64.png',
+  'OrbisMedia/Media/DLCOffersMenu1080.swf'
+]
+archive_sources_ps3 = [
+  # 'PS3Media/Media/languages.loc',
+  'PS3Media/Media/Tutorial.pck',
+  'PS3Media/Media/skinPS3.swf',
+  'PS3Media/Media/DLCOffersMenu480.swf',
+  'PS3Media/Media/DLCOffersMenu720.swf',
+  'PS3Media/Media/DefaultOptionsImage320x176.png',
+  'PS3Media/Media/DefaultSaveImage320x176.png',
+  'PS3Media/Media/DefaultSaveThumbnail64x64.png'
+]
+archive_sources_psvita = [
+  # 'PSVitaMedia/Media/languages.loc',
+  'PSVitaMedia/Media/Tutorial.pck',
+  'PSVitaMedia/Media/skinVita.swf',
+  'PSVitaMedia/Media/DLCOffersMenuVita.swf',
+  'PSVitaMedia/Media/DefaultOptionsImage320x176.png',
+  'PSVitaMedia/Media/DefaultSaveImage320x176.png',
+  'PSVitaMedia/Media/DefaultSaveThumbnail64x64.png'
+]
 
 media_archive = custom_target('Minecraft.Media_Archive',
   output : 'MediaLinux.arc',
-  input : archive_sources + archive_sources_movies1080 + archive_sources_movies720,
+  input : archive_sources + archive_sources_movies1080 + archive_sources_movies720 + archive_sources_linux,
   command : [
     python, meson.project_source_root() / 'scripts/pack_arc.py',
     '@OUTPUT@',
@@ -424,6 +486,6 @@ media_archive = custom_target('Minecraft.Media_Archive',
 
 assets_localisation_dep = declare_dependency(
   sources : localisation[1],
-  # sources : client_platform_path / 'Windows64Media/strings.h', 
+  # sources : 'Windows64Media/strings.h', 
   include_directories : include_directories('.')
 )

scripts/copy_assets_to_client.py

@@ -16,20 +16,44 @@ output_stamp = Path(sys.argv[5])
 #
 # `meson install` also handles this, but installs it to system folders, which can be annoying for
 # testing. Since we want a way to run it straight from `/build` when debugging, we do this instead.
+#
+# this script doesn't handle copying the same way `meson install` does but it should be good enough
 dest_common = Path(client_build_dir / "Common")
+src_assets = Path(project_source_root / "Minecraft.Assets")
 
 # clear out any old assets
 if dest_common.exists():
     shutil.rmtree(dest_common)
+    shutil.rmtree(client_build_dir / "music")
+    shutil.rmtree(client_build_dir / "Sound")
+    # XXX: Check "copy DLC" bellow for info
+    # shutil.rmtree(client_build_dir / "DurangoMedia")
 
 # copy `Minecraft.Assets/Common` into the build directory for the client.
 shutil.copytree(
-    project_source_root / "Minecraft.Assets" / "Common",
+    src_assets / "Common",
     dest_common,
 )
 
 # copy the media archive to `Common/Media` inside the folder we just copied.
 shutil.copy(media_archive, client_build_dir / "Common" / "Media")
 
+# copy music and Sound
+shutil.copytree(
+    src_assets / "Common" / "music",
+    client_build_dir / "music"
+)
+shutil.copytree(
+    src_assets / "DurangoMedia" / "Sound", 
+    client_build_dir / "Sound"
+)
+
+# copy DLC
+# XXX: The DLC path is handled inside of 4JLibs, the Windows64 build expects `DurangoMedia/DLC` to load DLC data from
+# shutil.copytree(
+#     src_assets / "DurangoMedia" / "DLC", 
+#     client_build_dir / "DurangoMedia" / "DLC"
+# )
+
 # modify the stamp so this only happens when client or media_archive targets are changed
 output_stamp.touch()