diff --git a/Minecraft.Assets/Common/Media/font/CHT/DFHeiMedium-B5.ttf b/Minecraft.Assets/Common/Media/font/CHT/DFHeiMedium-B5.ttf new file mode 100644 index 000000000..f9fb48943 Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/CHT/DFHeiMedium-B5.ttf differ diff --git a/Minecraft.Assets/Common/Media/font/CHT/DFTT_R5.TTC b/Minecraft.Assets/Common/Media/font/CHT/DFTT_R5.TTC new file mode 100644 index 000000000..34839685c Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/CHT/DFTT_R5.TTC differ diff --git a/Minecraft.Assets/Common/Media/font/JPN/DF-DotDotGothic16.ttf b/Minecraft.Assets/Common/Media/font/JPN/DF-DotDotGothic16.ttf new file mode 100644 index 000000000..1be2b4b3c Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/JPN/DF-DotDotGothic16.ttf differ diff --git a/Minecraft.Assets/Common/Media/font/JPN/DFGMaruGothic-Md.ttf b/Minecraft.Assets/Common/Media/font/JPN/DFGMaruGothic-Md.ttf new file mode 100644 index 000000000..4eb4eef73 Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/JPN/DFGMaruGothic-Md.ttf differ diff --git a/Minecraft.Assets/Common/Media/font/KOR/BOKMSD.ttf b/Minecraft.Assets/Common/Media/font/KOR/BOKMSD.ttf new file mode 100644 index 000000000..83fe86997 Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/KOR/BOKMSD.ttf differ diff --git a/Minecraft.Assets/Common/Media/font/KOR/candadite2.ttf b/Minecraft.Assets/Common/Media/font/KOR/candadite2.ttf new file mode 100644 index 000000000..f2ba094ff Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/KOR/candadite2.ttf differ diff --git a/Minecraft.Assets/Common/Media/font/Mojang Font_11.ttf b/Minecraft.Assets/Common/Media/font/Mojang Font_11.ttf new file mode 100644 index 000000000..969cee585 Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/Mojang Font_11.ttf differ diff --git a/Minecraft.Assets/Common/Media/font/Mojang Font_7.ttf b/Minecraft.Assets/Common/Media/font/Mojang Font_7.ttf new file mode 100644 index 000000000..727c5fb6c Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/Mojang Font_7.ttf differ diff --git a/Minecraft.Assets/Common/Media/font/Mojangles.ttf b/Minecraft.Assets/Common/Media/font/Mojangles.ttf new file mode 100644 index 000000000..e7b87e9f5 Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/Mojangles.ttf differ diff --git a/Minecraft.Assets/Common/Media/font/Mojangles_11.abc b/Minecraft.Assets/Common/Media/font/Mojangles_11.abc new file mode 100644 index 000000000..016fdf99c Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/Mojangles_11.abc differ diff --git a/Minecraft.Assets/Common/Media/font/Mojangles_7.abc b/Minecraft.Assets/Common/Media/font/Mojangles_7.abc new file mode 100644 index 000000000..6ce066732 Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/Mojangles_7.abc differ diff --git a/Minecraft.Assets/Common/Media/font/RU/SpaceMace.ttf b/Minecraft.Assets/Common/Media/font/RU/SpaceMace.ttf new file mode 100644 index 000000000..70cd3f7d9 Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/RU/SpaceMace.ttf differ diff --git a/Minecraft.Assets/Common/Media/font/chars.txt b/Minecraft.Assets/Common/Media/font/chars.txt new file mode 100644 index 000000000..f7ba12aea Binary files /dev/null and b/Minecraft.Assets/Common/Media/font/chars.txt differ diff --git a/Minecraft.Assets/Common/music/cds/11.binka b/Minecraft.Assets/Common/music/cds/11.binka new file mode 100644 index 000000000..5e321ec65 Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/11.binka differ diff --git a/Minecraft.Assets/Common/music/cds/13.binka b/Minecraft.Assets/Common/music/cds/13.binka new file mode 100644 index 000000000..e5021e6d1 Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/13.binka differ diff --git a/Minecraft.Assets/Common/music/cds/blocks.binka b/Minecraft.Assets/Common/music/cds/blocks.binka new file mode 100644 index 000000000..d5df69f2c Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/blocks.binka differ diff --git a/Minecraft.Assets/Common/music/cds/cat.binka b/Minecraft.Assets/Common/music/cds/cat.binka new file mode 100644 index 000000000..49ec9b59b Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/cat.binka differ diff --git a/Minecraft.Assets/Common/music/cds/chirp.binka b/Minecraft.Assets/Common/music/cds/chirp.binka new file mode 100644 index 000000000..45733e5ab Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/chirp.binka differ diff --git a/Minecraft.Assets/Common/music/cds/far.binka b/Minecraft.Assets/Common/music/cds/far.binka new file mode 100644 index 000000000..014ca0508 Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/far.binka differ diff --git a/Minecraft.Assets/Common/music/cds/mall.binka b/Minecraft.Assets/Common/music/cds/mall.binka new file mode 100644 index 000000000..d8629c75b Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/mall.binka differ diff --git a/Minecraft.Assets/Common/music/cds/mellohi.binka b/Minecraft.Assets/Common/music/cds/mellohi.binka new file mode 100644 index 000000000..906395e25 Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/mellohi.binka differ diff --git a/Minecraft.Assets/Common/music/cds/stal.binka b/Minecraft.Assets/Common/music/cds/stal.binka new file mode 100644 index 000000000..3d82bf93c Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/stal.binka differ diff --git a/Minecraft.Assets/Common/music/cds/strad.binka b/Minecraft.Assets/Common/music/cds/strad.binka new file mode 100644 index 000000000..2a29ffb2a Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/strad.binka differ diff --git a/Minecraft.Assets/Common/music/cds/ward.binka b/Minecraft.Assets/Common/music/cds/ward.binka new file mode 100644 index 000000000..032a91871 Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/ward.binka differ diff --git a/Minecraft.Assets/Common/music/cds/where_are_we_now.binka b/Minecraft.Assets/Common/music/cds/where_are_we_now.binka new file mode 100644 index 000000000..8168990eb Binary files /dev/null and b/Minecraft.Assets/Common/music/cds/where_are_we_now.binka differ diff --git a/Minecraft.Assets/Common/music/music/calm1.binka b/Minecraft.Assets/Common/music/music/calm1.binka new file mode 100644 index 000000000..990e816a0 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/calm1.binka differ diff --git a/Minecraft.Assets/Common/music/music/calm2.binka b/Minecraft.Assets/Common/music/music/calm2.binka new file mode 100644 index 000000000..9444e2a9a Binary files /dev/null and b/Minecraft.Assets/Common/music/music/calm2.binka differ diff --git a/Minecraft.Assets/Common/music/music/calm3.binka b/Minecraft.Assets/Common/music/music/calm3.binka new file mode 100644 index 000000000..99b171fdf Binary files /dev/null and b/Minecraft.Assets/Common/music/music/calm3.binka differ diff --git a/Minecraft.Assets/Common/music/music/creative1.binka b/Minecraft.Assets/Common/music/music/creative1.binka new file mode 100644 index 000000000..ca3559c46 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/creative1.binka differ diff --git a/Minecraft.Assets/Common/music/music/creative2.binka b/Minecraft.Assets/Common/music/music/creative2.binka new file mode 100644 index 000000000..462fb1e3a Binary files /dev/null and b/Minecraft.Assets/Common/music/music/creative2.binka differ diff --git a/Minecraft.Assets/Common/music/music/creative3.binka b/Minecraft.Assets/Common/music/music/creative3.binka new file mode 100644 index 000000000..9cd64e7ea Binary files /dev/null and b/Minecraft.Assets/Common/music/music/creative3.binka differ diff --git a/Minecraft.Assets/Common/music/music/creative4.binka b/Minecraft.Assets/Common/music/music/creative4.binka new file mode 100644 index 000000000..921a5b137 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/creative4.binka differ diff --git a/Minecraft.Assets/Common/music/music/creative5.binka b/Minecraft.Assets/Common/music/music/creative5.binka new file mode 100644 index 000000000..167ab36c3 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/creative5.binka differ diff --git a/Minecraft.Assets/Common/music/music/creative6.binka b/Minecraft.Assets/Common/music/music/creative6.binka new file mode 100644 index 000000000..b31eb99eb Binary files /dev/null and b/Minecraft.Assets/Common/music/music/creative6.binka differ diff --git a/Minecraft.Assets/Common/music/music/hal1.binka b/Minecraft.Assets/Common/music/music/hal1.binka new file mode 100644 index 000000000..949420f26 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/hal1.binka differ diff --git a/Minecraft.Assets/Common/music/music/hal2.binka b/Minecraft.Assets/Common/music/music/hal2.binka new file mode 100644 index 000000000..58bf56ed2 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/hal2.binka differ diff --git a/Minecraft.Assets/Common/music/music/hal3.binka b/Minecraft.Assets/Common/music/music/hal3.binka new file mode 100644 index 000000000..bf6a76e0d Binary files /dev/null and b/Minecraft.Assets/Common/music/music/hal3.binka differ diff --git a/Minecraft.Assets/Common/music/music/hal4.binka b/Minecraft.Assets/Common/music/music/hal4.binka new file mode 100644 index 000000000..541128a4e Binary files /dev/null and b/Minecraft.Assets/Common/music/music/hal4.binka differ diff --git a/Minecraft.Assets/Common/music/music/menu1.binka b/Minecraft.Assets/Common/music/music/menu1.binka new file mode 100644 index 000000000..b0ea4240e Binary files /dev/null and b/Minecraft.Assets/Common/music/music/menu1.binka differ diff --git a/Minecraft.Assets/Common/music/music/menu2.binka b/Minecraft.Assets/Common/music/music/menu2.binka new file mode 100644 index 000000000..d5f61ab6e Binary files /dev/null and b/Minecraft.Assets/Common/music/music/menu2.binka differ diff --git a/Minecraft.Assets/Common/music/music/menu3.binka b/Minecraft.Assets/Common/music/music/menu3.binka new file mode 100644 index 000000000..97d37292e Binary files /dev/null and b/Minecraft.Assets/Common/music/music/menu3.binka differ diff --git a/Minecraft.Assets/Common/music/music/menu4.binka b/Minecraft.Assets/Common/music/music/menu4.binka new file mode 100644 index 000000000..0f40cd663 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/menu4.binka differ diff --git a/Minecraft.Assets/Common/music/music/nether1.binka b/Minecraft.Assets/Common/music/music/nether1.binka new file mode 100644 index 000000000..034bab5f5 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/nether1.binka differ diff --git a/Minecraft.Assets/Common/music/music/nether2.binka b/Minecraft.Assets/Common/music/music/nether2.binka new file mode 100644 index 000000000..a065e659e Binary files /dev/null and b/Minecraft.Assets/Common/music/music/nether2.binka differ diff --git a/Minecraft.Assets/Common/music/music/nether3.binka b/Minecraft.Assets/Common/music/music/nether3.binka new file mode 100644 index 000000000..4c42a6e22 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/nether3.binka differ diff --git a/Minecraft.Assets/Common/music/music/nether4.binka b/Minecraft.Assets/Common/music/music/nether4.binka new file mode 100644 index 000000000..870007173 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/nether4.binka differ diff --git a/Minecraft.Assets/Common/music/music/nuance1.binka b/Minecraft.Assets/Common/music/music/nuance1.binka new file mode 100644 index 000000000..ff776a044 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/nuance1.binka differ diff --git a/Minecraft.Assets/Common/music/music/nuance2.binka b/Minecraft.Assets/Common/music/music/nuance2.binka new file mode 100644 index 000000000..2ceac4870 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/nuance2.binka differ diff --git a/Minecraft.Assets/Common/music/music/piano1.binka b/Minecraft.Assets/Common/music/music/piano1.binka new file mode 100644 index 000000000..7170108f3 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/piano1.binka differ diff --git a/Minecraft.Assets/Common/music/music/piano2.binka b/Minecraft.Assets/Common/music/music/piano2.binka new file mode 100644 index 000000000..9983f94b3 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/piano2.binka differ diff --git a/Minecraft.Assets/Common/music/music/piano3.binka b/Minecraft.Assets/Common/music/music/piano3.binka new file mode 100644 index 000000000..befbf102e Binary files /dev/null and b/Minecraft.Assets/Common/music/music/piano3.binka differ diff --git a/Minecraft.Assets/Common/music/music/the_end_dragon_alive.binka b/Minecraft.Assets/Common/music/music/the_end_dragon_alive.binka new file mode 100644 index 000000000..700a1c309 Binary files /dev/null and b/Minecraft.Assets/Common/music/music/the_end_dragon_alive.binka differ diff --git a/Minecraft.Assets/Common/music/music/the_end_end.binka b/Minecraft.Assets/Common/music/music/the_end_end.binka new file mode 100644 index 000000000..24b45108f Binary files /dev/null and b/Minecraft.Assets/Common/music/music/the_end_end.binka differ diff --git a/Minecraft.Assets/meson.build b/Minecraft.Assets/meson.build index 95e190225..25744d0cf 100644 --- a/Minecraft.Assets/meson.build +++ b/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/res') +install_subdir('Common/Trial', install_dir : get_option('prefix') / 'Trial') +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,7 +35,7 @@ colour_table = custom_target('Minecraft.Assets_Colour_Table', ) archive_sources = [ - localisation[0], # client_platform_path / 'Windows64Media/Media/languages.loc', + localisation[0], # 'Windows64Media/Media/languages.loc', colour_table, 'Common/Media/splashes.txt', 'Common/Media/Graphics/SaveChest.png', @@ -424,6 +426,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('.') ) \ No newline at end of file diff --git a/scripts/copy_assets_to_client.py b/scripts/copy_assets_to_client.py index 54df3b44a..c30bdb937 100644 --- a/scripts/copy_assets_to_client.py +++ b/scripts/copy_assets_to_client.py @@ -16,6 +16,8 @@ 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") # clear out any old assets @@ -31,5 +33,13 @@ shutil.copytree( # 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(project_source_root / "Minecraft.Assets" / "Common" / "music", client_build_dir) +shutil.copytree(project_source_root / "Minecraft.Assets" / "DurangoMedia" / "Sound", client_build_dir) + +# copy DLC +# XXX: The DLC path is handled inside of 4JLibs, the Windows64 build expects `DurangoMedia/DLC` to load DLC data from +# shutil.copytree(project_source_root / "Minecraft.Assets" / "DurangoMedia" / "DLC", client_build_dir / "DurangoMedia") + # modify the stamp so this only happens when client or media_archive targets are changed output_stamp.touch() \ No newline at end of file