backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix error where old assets weren't being removed

Browse source
This commit is contained in:
Pyogenics 2026-03-09 12:31:17 +00:00
parent 1326e4d344
commit 57d20e351a
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/copy_assets_to_client.py
View file

@ -19,14 +19,19 @@ output_stamp = Path(sys.argv[5])
# #
# this script doesn't handle copying the same way `meson install` does but it should be good enough # 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") dest_common = Path(client_build_dir / "Common")
src_assets = Path(project_source_root / "Minecraft.Assets")
# clear out any old assets # clear out any old assets
if dest_common.exists(): if dest_common.exists():
shutil.rmtree(dest_common) 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 / "DurangMedia")
# copy `Minecraft.Assets/Common` into the build directory for the client. # copy `Minecraft.Assets/Common` into the build directory for the client.
shutil.copytree( shutil.copytree(
project_source_root / "Minecraft.Assets" / "Common", src_assets / "Common",
dest_common, dest_common,
) )
@ -34,12 +39,25 @@ shutil.copytree(
shutil.copy(media_archive, client_build_dir / "Common" / "Media") shutil.copy(media_archive, client_build_dir / "Common" / "Media")
# copy music and Sound # copy music and Sound
shutil.copytree(project_source_root / "Minecraft.Assets" / "Common" / "music", client_build_dir) shutil.copytree(
shutil.copytree(project_source_root / "Minecraft.Assets" / "DurangoMedia" / "Sound", client_build_dir) src_assets / "Common" / "music" / "music",
client_build_dir / "music"
)
shutil.copytree(
src_assets / "Common" / "music" / "cds",
client_build_dir / "music"
)
shutil.copy(
src_assets / "DurangoMedia" / "Sound" / "Minecraft.msscmp",
client_build_dir / "Sound"
)
# copy DLC # copy DLC
# XXX: The DLC path is handled inside of 4JLibs, the Windows64 build expects `DurangoMedia/DLC` to load DLC data from # 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") # shutil.copytree(
# src_assets / "DurangoMedia" / "DLC",
# client_build_dir / "DurangoMedia"
# )
# modify the stamp so this only happens when client or media_archive targets are changed # modify the stamp so this only happens when client or media_archive targets are changed
output_stamp.touch() output_stamp.touch()