diff --git a/assets/PackMaker.exe b/assets/PackMaker.exe new file mode 100644 index 00000000..22ecdbdc Binary files /dev/null and b/assets/PackMaker.exe differ diff --git a/assets/PackMakerLite.exe b/assets/PackMakerLite.exe deleted file mode 100644 index e3d4b57d..00000000 Binary files a/assets/PackMakerLite.exe and /dev/null differ diff --git a/assets/PackMakerLite.json b/assets/PackMakerLite.json deleted file mode 100644 index e6dba293..00000000 --- a/assets/PackMakerLite.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - //"log_name":"PackMakerLite", - //"cs_name":"", - "ignore_full_name": [".git", ".svn", ".vs", "desktop.ini"], - "ignore_file_extension": ["bak", "db", "wdp"], - "force_filename_lowercase": false, - "default_pack_type": 2, - "pack_type_by_list": [], - /*"pack_type_by_list": [ - ["mss", 0], - ["mse", 1], - ["msf", 2], - ["spt", 0], - ["atr", 1], - ["dds", 2], - ["raw", 0], - ["wtr", 1], - ["mde", 2], - ["tga", 0], - ["txt", 1], - ["msk", 2], - ["msa", 0], - ["msm", 1], - ["py", 2] - ],*/ - //"eter_magic_mcoz":"MCOZ", - //"eter_magic_epkd":"EPKD", - //"eter_magic_mcsp":"MCSP", - //"parallel":true, - "eter_pack_index_ext":".eix", - "eter_pack_data_ext":".epk", - "eter_pack_index_key": [ - 45129401, - 92367215, - 681285731, - 1710201 - ], - "eter_pack_data_key": [ - 78952482, - 527348324, - 1632942, - 486274726 - ] -} diff --git a/assets/pack.py b/assets/pack.py index b94636f6..cbc0b977 100644 --- a/assets/pack.py +++ b/assets/pack.py @@ -18,26 +18,11 @@ def pack_folder(folder_path): return try: - result = subprocess.run(["PackMakerLite.exe", "--nolog", "--parallel", "-p", folder_name], check=True) - # print(f"Packing completed for: {folder_name}") + result = subprocess.run(["PackMaker.exe", "--input", folder_name, "--output", output_folder_path], check=True) except subprocess.CalledProcessError as e: print(f"Error occurred while packing {folder_name}: {e}") return - eix_file = f"{folder_name}.eix" - epk_file = f"{folder_name}.epk" - - if not os.path.exists(eix_file) or not os.path.exists(epk_file): - print(f"Packing failed: {eix_file} or {epk_file} not found.") - return - - try: - shutil.move(eix_file, os.path.join(output_folder_path, eix_file)) - shutil.move(epk_file, os.path.join(output_folder_path, epk_file)) - print(f"Moved {eix_file} and {epk_file} to {output_folder_path}") - except Exception as e: - print(f"Error occurred while moving files: {e}") - def pack_all_folders(): all_folders = [f for f in os.listdir() if os.path.isdir(f) and f not in IGNORE_FOLDERS]