From eb53a8295759de9f8f92e21abcd3a4390e5df602 Mon Sep 17 00:00:00 2001 From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com> Date: Fri, 7 Jun 2024 23:32:42 -0400 Subject: [PATCH] Updated modules for libWiiPy v0.3.0 compatibility --- modules/nus.py | 2 +- modules/wad.py | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/nus.py b/modules/nus.py index c5ded5e..c5fb4da 100644 --- a/modules/nus.py +++ b/modules/nus.py @@ -13,7 +13,7 @@ def download_title(title_id: str, title_version_input: str = None): print("Enter a valid integer for the Title Version.") return - title = libWiiPy.download_title(title_id, title_version) + title = libWiiPy.title.download_title(title_id, title_version) file_name = title_id + "-v" + str(title.tmd.title_version) + ".wad" diff --git a/modules/wad.py b/modules/wad.py index a7c55fb..7c95e19 100644 --- a/modules/wad.py +++ b/modules/wad.py @@ -15,14 +15,14 @@ def extract_wad_to_folder(in_file: str, out_folder: str): out_folder.mkdir() with open(in_file, "rb") as wad_file: - wad = libWiiPy.WAD() + wad = libWiiPy.title.WAD() wad.load(wad_file.read()) - tmd = libWiiPy.TMD() + tmd = libWiiPy.title.TMD() tmd.load(wad.get_tmd_data()) - ticket = libWiiPy.Ticket() + ticket = libWiiPy.title.Ticket() ticket.load(wad.get_ticket_data()) - content_region = libWiiPy.ContentRegion() + content_region = libWiiPy.title.ContentRegion() content_region.load(wad.get_content_data(), tmd.content_records) title_key = ticket.get_title_key() @@ -81,7 +81,7 @@ def pack_wad_from_folder(in_folder, out_file): raise FileNotFoundError("Cannot find any contents! Exiting...") with open(out_file, "wb") as out_file: - title = libWiiPy.Title() + title = libWiiPy.title.Title() title.load_tmd(open(tmd_file, "rb").read()) title.load_ticket(open(ticket_file, "rb").read()) @@ -106,4 +106,3 @@ def pack_wad_from_folder(in_folder, out_file): pass out_file.write(title.dump_wad()) -