From 4c4ff349a01f0c2005bf747f2cc6baef1a15f89b Mon Sep 17 00:00:00 2001 From: JuiceyDev Date: Wed, 1 Apr 2026 08:49:02 +0200 Subject: [PATCH] New folder & better copyassetstoclient --- .../Common/{music => Music}/cds/11.ogg | Bin .../Common/{music => Music}/cds/13.ogg | Bin .../Common/{music => Music}/cds/blocks.ogg | Bin .../Common/{music => Music}/cds/cat.ogg | Bin .../Common/{music => Music}/cds/chirp.ogg | Bin .../Common/{music => Music}/cds/far.ogg | Bin .../Common/{music => Music}/cds/mall.ogg | Bin .../Common/{music => Music}/cds/mellohi.ogg | Bin .../Common/{music => Music}/cds/stal.ogg | Bin .../Common/{music => Music}/cds/strad.ogg | Bin .../Common/{music => Music}/cds/ward.ogg | Bin .../{music => Music}/cds/where_are_we_now.ogg | Bin .../Common/{music => Music}/music/calm1.ogg | Bin .../Common/{music => Music}/music/calm2.ogg | Bin .../Common/{music => Music}/music/calm3.ogg | Bin .../{music => Music}/music/creative1.ogg | Bin .../{music => Music}/music/creative2.ogg | Bin .../{music => Music}/music/creative3.ogg | Bin .../{music => Music}/music/creative4.ogg | Bin .../{music => Music}/music/creative5.ogg | Bin .../{music => Music}/music/creative6.ogg | Bin .../Common/{music => Music}/music/hal1.ogg | Bin .../Common/{music => Music}/music/hal2.ogg | Bin .../Common/{music => Music}/music/hal3.ogg | Bin .../Common/{music => Music}/music/hal4.ogg | Bin .../Common/{music => Music}/music/menu1.ogg | Bin .../Common/{music => Music}/music/menu2.ogg | Bin .../Common/{music => Music}/music/menu3.ogg | Bin .../Common/{music => Music}/music/menu4.ogg | Bin .../Common/{music => Music}/music/nether1.ogg | Bin .../Common/{music => Music}/music/nether2.ogg | Bin .../Common/{music => Music}/music/nether3.ogg | Bin .../Common/{music => Music}/music/nether4.ogg | Bin .../Common/{music => Music}/music/nuance1.ogg | Bin .../Common/{music => Music}/music/nuance2.ogg | Bin .../Common/{music => Music}/music/piano1.ogg | Bin .../Common/{music => Music}/music/piano2.ogg | Bin .../Common/{music => Music}/music/piano3.ogg | Bin .../music/the_end_dragon_alive.ogg | Bin .../{music => Music}/music/the_end_end.ogg | Bin scripts/copy_assets_to_client.py | 35 +++++++++++------- 41 files changed, 22 insertions(+), 13 deletions(-) rename Minecraft.Assets/Common/{music => Music}/cds/11.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/13.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/blocks.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/cat.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/chirp.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/far.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/mall.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/mellohi.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/stal.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/strad.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/ward.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/cds/where_are_we_now.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/calm1.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/calm2.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/calm3.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/creative1.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/creative2.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/creative3.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/creative4.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/creative5.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/creative6.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/hal1.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/hal2.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/hal3.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/hal4.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/menu1.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/menu2.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/menu3.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/menu4.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/nether1.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/nether2.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/nether3.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/nether4.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/nuance1.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/nuance2.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/piano1.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/piano2.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/piano3.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/the_end_dragon_alive.ogg (100%) rename Minecraft.Assets/Common/{music => Music}/music/the_end_end.ogg (100%) diff --git a/Minecraft.Assets/Common/music/cds/11.ogg b/Minecraft.Assets/Common/Music/cds/11.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/11.ogg rename to Minecraft.Assets/Common/Music/cds/11.ogg diff --git a/Minecraft.Assets/Common/music/cds/13.ogg b/Minecraft.Assets/Common/Music/cds/13.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/13.ogg rename to Minecraft.Assets/Common/Music/cds/13.ogg diff --git a/Minecraft.Assets/Common/music/cds/blocks.ogg b/Minecraft.Assets/Common/Music/cds/blocks.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/blocks.ogg rename to Minecraft.Assets/Common/Music/cds/blocks.ogg diff --git a/Minecraft.Assets/Common/music/cds/cat.ogg b/Minecraft.Assets/Common/Music/cds/cat.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/cat.ogg rename to Minecraft.Assets/Common/Music/cds/cat.ogg diff --git a/Minecraft.Assets/Common/music/cds/chirp.ogg b/Minecraft.Assets/Common/Music/cds/chirp.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/chirp.ogg rename to Minecraft.Assets/Common/Music/cds/chirp.ogg diff --git a/Minecraft.Assets/Common/music/cds/far.ogg b/Minecraft.Assets/Common/Music/cds/far.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/far.ogg rename to Minecraft.Assets/Common/Music/cds/far.ogg diff --git a/Minecraft.Assets/Common/music/cds/mall.ogg b/Minecraft.Assets/Common/Music/cds/mall.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/mall.ogg rename to Minecraft.Assets/Common/Music/cds/mall.ogg diff --git a/Minecraft.Assets/Common/music/cds/mellohi.ogg b/Minecraft.Assets/Common/Music/cds/mellohi.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/mellohi.ogg rename to Minecraft.Assets/Common/Music/cds/mellohi.ogg diff --git a/Minecraft.Assets/Common/music/cds/stal.ogg b/Minecraft.Assets/Common/Music/cds/stal.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/stal.ogg rename to Minecraft.Assets/Common/Music/cds/stal.ogg diff --git a/Minecraft.Assets/Common/music/cds/strad.ogg b/Minecraft.Assets/Common/Music/cds/strad.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/strad.ogg rename to Minecraft.Assets/Common/Music/cds/strad.ogg diff --git a/Minecraft.Assets/Common/music/cds/ward.ogg b/Minecraft.Assets/Common/Music/cds/ward.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/ward.ogg rename to Minecraft.Assets/Common/Music/cds/ward.ogg diff --git a/Minecraft.Assets/Common/music/cds/where_are_we_now.ogg b/Minecraft.Assets/Common/Music/cds/where_are_we_now.ogg similarity index 100% rename from Minecraft.Assets/Common/music/cds/where_are_we_now.ogg rename to Minecraft.Assets/Common/Music/cds/where_are_we_now.ogg diff --git a/Minecraft.Assets/Common/music/music/calm1.ogg b/Minecraft.Assets/Common/Music/music/calm1.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/calm1.ogg rename to Minecraft.Assets/Common/Music/music/calm1.ogg diff --git a/Minecraft.Assets/Common/music/music/calm2.ogg b/Minecraft.Assets/Common/Music/music/calm2.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/calm2.ogg rename to Minecraft.Assets/Common/Music/music/calm2.ogg diff --git a/Minecraft.Assets/Common/music/music/calm3.ogg b/Minecraft.Assets/Common/Music/music/calm3.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/calm3.ogg rename to Minecraft.Assets/Common/Music/music/calm3.ogg diff --git a/Minecraft.Assets/Common/music/music/creative1.ogg b/Minecraft.Assets/Common/Music/music/creative1.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/creative1.ogg rename to Minecraft.Assets/Common/Music/music/creative1.ogg diff --git a/Minecraft.Assets/Common/music/music/creative2.ogg b/Minecraft.Assets/Common/Music/music/creative2.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/creative2.ogg rename to Minecraft.Assets/Common/Music/music/creative2.ogg diff --git a/Minecraft.Assets/Common/music/music/creative3.ogg b/Minecraft.Assets/Common/Music/music/creative3.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/creative3.ogg rename to Minecraft.Assets/Common/Music/music/creative3.ogg diff --git a/Minecraft.Assets/Common/music/music/creative4.ogg b/Minecraft.Assets/Common/Music/music/creative4.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/creative4.ogg rename to Minecraft.Assets/Common/Music/music/creative4.ogg diff --git a/Minecraft.Assets/Common/music/music/creative5.ogg b/Minecraft.Assets/Common/Music/music/creative5.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/creative5.ogg rename to Minecraft.Assets/Common/Music/music/creative5.ogg diff --git a/Minecraft.Assets/Common/music/music/creative6.ogg b/Minecraft.Assets/Common/Music/music/creative6.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/creative6.ogg rename to Minecraft.Assets/Common/Music/music/creative6.ogg diff --git a/Minecraft.Assets/Common/music/music/hal1.ogg b/Minecraft.Assets/Common/Music/music/hal1.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/hal1.ogg rename to Minecraft.Assets/Common/Music/music/hal1.ogg diff --git a/Minecraft.Assets/Common/music/music/hal2.ogg b/Minecraft.Assets/Common/Music/music/hal2.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/hal2.ogg rename to Minecraft.Assets/Common/Music/music/hal2.ogg diff --git a/Minecraft.Assets/Common/music/music/hal3.ogg b/Minecraft.Assets/Common/Music/music/hal3.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/hal3.ogg rename to Minecraft.Assets/Common/Music/music/hal3.ogg diff --git a/Minecraft.Assets/Common/music/music/hal4.ogg b/Minecraft.Assets/Common/Music/music/hal4.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/hal4.ogg rename to Minecraft.Assets/Common/Music/music/hal4.ogg diff --git a/Minecraft.Assets/Common/music/music/menu1.ogg b/Minecraft.Assets/Common/Music/music/menu1.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/menu1.ogg rename to Minecraft.Assets/Common/Music/music/menu1.ogg diff --git a/Minecraft.Assets/Common/music/music/menu2.ogg b/Minecraft.Assets/Common/Music/music/menu2.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/menu2.ogg rename to Minecraft.Assets/Common/Music/music/menu2.ogg diff --git a/Minecraft.Assets/Common/music/music/menu3.ogg b/Minecraft.Assets/Common/Music/music/menu3.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/menu3.ogg rename to Minecraft.Assets/Common/Music/music/menu3.ogg diff --git a/Minecraft.Assets/Common/music/music/menu4.ogg b/Minecraft.Assets/Common/Music/music/menu4.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/menu4.ogg rename to Minecraft.Assets/Common/Music/music/menu4.ogg diff --git a/Minecraft.Assets/Common/music/music/nether1.ogg b/Minecraft.Assets/Common/Music/music/nether1.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/nether1.ogg rename to Minecraft.Assets/Common/Music/music/nether1.ogg diff --git a/Minecraft.Assets/Common/music/music/nether2.ogg b/Minecraft.Assets/Common/Music/music/nether2.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/nether2.ogg rename to Minecraft.Assets/Common/Music/music/nether2.ogg diff --git a/Minecraft.Assets/Common/music/music/nether3.ogg b/Minecraft.Assets/Common/Music/music/nether3.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/nether3.ogg rename to Minecraft.Assets/Common/Music/music/nether3.ogg diff --git a/Minecraft.Assets/Common/music/music/nether4.ogg b/Minecraft.Assets/Common/Music/music/nether4.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/nether4.ogg rename to Minecraft.Assets/Common/Music/music/nether4.ogg diff --git a/Minecraft.Assets/Common/music/music/nuance1.ogg b/Minecraft.Assets/Common/Music/music/nuance1.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/nuance1.ogg rename to Minecraft.Assets/Common/Music/music/nuance1.ogg diff --git a/Minecraft.Assets/Common/music/music/nuance2.ogg b/Minecraft.Assets/Common/Music/music/nuance2.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/nuance2.ogg rename to Minecraft.Assets/Common/Music/music/nuance2.ogg diff --git a/Minecraft.Assets/Common/music/music/piano1.ogg b/Minecraft.Assets/Common/Music/music/piano1.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/piano1.ogg rename to Minecraft.Assets/Common/Music/music/piano1.ogg diff --git a/Minecraft.Assets/Common/music/music/piano2.ogg b/Minecraft.Assets/Common/Music/music/piano2.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/piano2.ogg rename to Minecraft.Assets/Common/Music/music/piano2.ogg diff --git a/Minecraft.Assets/Common/music/music/piano3.ogg b/Minecraft.Assets/Common/Music/music/piano3.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/piano3.ogg rename to Minecraft.Assets/Common/Music/music/piano3.ogg diff --git a/Minecraft.Assets/Common/music/music/the_end_dragon_alive.ogg b/Minecraft.Assets/Common/Music/music/the_end_dragon_alive.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/the_end_dragon_alive.ogg rename to Minecraft.Assets/Common/Music/music/the_end_dragon_alive.ogg diff --git a/Minecraft.Assets/Common/music/music/the_end_end.ogg b/Minecraft.Assets/Common/Music/music/the_end_end.ogg similarity index 100% rename from Minecraft.Assets/Common/music/music/the_end_end.ogg rename to Minecraft.Assets/Common/Music/music/the_end_end.ogg diff --git a/scripts/copy_assets_to_client.py b/scripts/copy_assets_to_client.py index 143942724..c433eb501 100644 --- a/scripts/copy_assets_to_client.py +++ b/scripts/copy_assets_to_client.py @@ -30,23 +30,32 @@ if dest_common.exists(): # shutil.rmtree(client_build_dir / "DurangoMedia", ignore_errors=True) # copy `Minecraft.Assets/Common` into the build directory for the client. -shutil.copytree( - src_assets / "Common", - dest_common, -) +try: + shutil.copytree( + src_assets / "Common", + dest_common, + ) +except FileNotFoundError: + print(f"Error: source Common directory not found: {src_assets / 'Common'}", file=sys.stderr) + raise # 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 with updated paths because putting them in root looks ugly. -shutil.copytree( - src_assets / "Common" / "Music", - dest_common / "Music" -) -shutil.copytree( - src_assets / "DurangoMedia" / "Sound", - dest_common / "Sound" -) +# copy Sound with updated paths because putting them in root looks ugly. + +sound_src = src_assets / "DurangoMedia" / "Sound" +sound_dst = dest_common / "Sound" +if sound_src.exists(): + if sound_dst.exists(): + print(f"Info: destination {sound_dst} already exists; skipping sound copy", file=sys.stderr) + else: + try: + shutil.copytree(sound_src, sound_dst) + except FileExistsError: + print(f"Info: race: {sound_dst} already exists; skipping sound copy", file=sys.stderr) +else: + print(f"Warning: sound source {sound_src} not found!!", file=sys.stderr) # copy DLC # XXX: The DLC path is handled inside of 4JLibs, the Windows64 build expects `DurangoMedia/DLC` to load DLC data from