diff --git a/MDG.py b/MDG.py index 6c4cfe4..30d4db1 100644 --- a/MDG.py +++ b/MDG.py @@ -8,16 +8,14 @@ from MDGUtil.MDGLogger import MDGLogger if __name__ == '__main__': - if not PathUtils.check_pyinstaller_env(): - faulthandler.enable() + faulthandler.enable() + if not PathUtils.check_pyinstaller_env(): generate_ui() - """generate_ui() can change ui so,we need to import MDGMainWindow only after that line""" from MDGWindow.MDGMainWindow import MDGMainWindow MDGLogger() - app = QApplication(sys.argv) widget = MDGMainWindow() widget.show() diff --git a/MDGLogic/CopyThread.py b/MDGLogic/CopyThread.py index 4c67584..e21dd55 100644 --- a/MDGLogic/CopyThread.py +++ b/MDGLogic/CopyThread.py @@ -25,7 +25,7 @@ def run(self) -> None: continue FileUtils.extract_jars_from_jar(os.path.join(mods_path, mod), PathUtils.TMP_MODS_PATH) jar_in_jar_mods_list += os.listdir(PathUtils.TMP_MODS_PATH) - logging.info('Finished analysing mods for jar in jar.' + logging.info('Finished analysing mods for jar in jar. ' f'Found and extracted: {len(jar_in_jar_mods_list)}.') mods_list = list(filter(lambda x: x.endswith('.jar'), os.listdir(mods_path))) diff --git a/README.md b/README.md index e34ba5d..48b74f8 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ deobfuscate -> decompile -> merge to mdk * Despite other decompiler/deobf tools this is independent from apis. It uses mdk to deobf mods. So it won't break after mappings api changes like most of other deobf tools. * Caching. If you use this tool regularly for same modpack. You don't need to wait while all mods will be decompiled and deobfuscated. Tool will decompile/deobfuscate only changed mods. Other will be taken from cache. +* Jar in jar support. MDG will analyse mods for jar in jar with super effective algorithm and process them with other mods. So you will be able to see jar in jar code too. (configure) ## Instruction: diff --git a/built_to_exe.py b/built_to_exe.py index c312a81..ca044e1 100644 --- a/built_to_exe.py +++ b/built_to_exe.py @@ -3,7 +3,7 @@ from MDGUtil import PathUtils, FileUtils -VERSION = '2.2.2' +VERSION = '2.2.3' def main(): @@ -13,7 +13,7 @@ def main(): FileUtils.remove_folder(PathUtils.TMP_FOLDER_PATH) file_name = f'MDG_{VERSION}' file_name_with_extension = file_name + '.exe' - os.system(f'.venv\\Scripts\\activate && pyinstaller.exe MDG.py --onefile --windowed --name {file_name}') + os.system(f'.venv\\Scripts\\activate && pyinstaller.exe MDG.py --onefile --name {file_name}') shutil.copytree(PathUtils.DECOMPILER_FOLDER_PATH, os.path.join('dist', 'MDG', 'decompiler')) shutil.move(os.path.join('dist', file_name_with_extension), os.path.join('dist', 'MDG', file_name_with_extension)) shutil.make_archive(f'mods_decompiler_GUI_{VERSION}', 'zip', os.path.join('dist'))