diff --git a/.git_hooks/Readme.md b/.git_hooks/Readme.md deleted file mode 100644 index 49097d9..0000000 --- a/.git_hooks/Readme.md +++ /dev/null @@ -1,2 +0,0 @@ -## Git hooks -This folder contains the git hooks I use, so that they end up commited to the repo. I symlink these into the actual hooks dir diff --git a/.git_hooks/pre-commit b/.git_hooks/pre-commit deleted file mode 100644 index 0551c6e..0000000 --- a/.git_hooks/pre-commit +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -if [ -f .env/Scripts/activate ]; then - source .env/Scripts/activate -fi -python zipper.py --git-staged -code=$? -if [ $code != 0 ]; then - exit $code -fi -git add */*.zip -exit $? diff --git a/AltUseVendors/AltUseVendors.zip b/.legacy/AltUseVendors.zip similarity index 100% rename from AltUseVendors/AltUseVendors.zip rename to .legacy/AltUseVendors.zip diff --git a/ApplesBorderlandsCheats/ApplesBorderlandsCheats.zip b/.legacy/ApplesBorderlandsCheats.zip similarity index 100% rename from ApplesBorderlandsCheats/ApplesBorderlandsCheats.zip rename to .legacy/ApplesBorderlandsCheats.zip diff --git a/CommandExtensions/CommandExtensions.zip b/.legacy/CommandExtensions.zip similarity index 100% rename from CommandExtensions/CommandExtensions.zip rename to .legacy/CommandExtensions.zip diff --git a/EnemyLevelRandomizer/EnemyLevelRandomizer.zip b/.legacy/EnemyLevelRandomizer.zip similarity index 100% rename from EnemyLevelRandomizer/EnemyLevelRandomizer.zip rename to .legacy/EnemyLevelRandomizer.zip diff --git a/Enums/Enums.zip b/.legacy/Enums.zip similarity index 100% rename from Enums/Enums.zip rename to .legacy/Enums.zip diff --git a/EquipLocker/EquipLocker.zip b/.legacy/EquipLocker.zip similarity index 100% rename from EquipLocker/EquipLocker.zip rename to .legacy/EquipLocker.zip diff --git a/HideUndiscoveredMissions/HideUndiscoveredMissions.zip b/.legacy/HideUndiscoveredMissions.zip similarity index 100% rename from HideUndiscoveredMissions/HideUndiscoveredMissions.zip rename to .legacy/HideUndiscoveredMissions.zip diff --git a/ItemLevelUncapper/ItemLevelUncapper.zip b/.legacy/ItemLevelUncapper.zip similarity index 100% rename from ItemLevelUncapper/ItemLevelUncapper.zip rename to .legacy/ItemLevelUncapper.zip diff --git a/Mario/Mario.zip b/.legacy/Mario.zip similarity index 100% rename from Mario/Mario.zip rename to .legacy/Mario.zip diff --git a/NoAds/NoAds.zip b/.legacy/NoAds.zip similarity index 100% rename from NoAds/NoAds.zip rename to .legacy/NoAds.zip diff --git a/OHKO/OHKO.zip b/.legacy/OHKO.zip similarity index 100% rename from OHKO/OHKO.zip rename to .legacy/OHKO.zip diff --git a/OfflineHelpers/OfflineHelpers.zip b/.legacy/OfflineHelpers.zip similarity index 100% rename from OfflineHelpers/OfflineHelpers.zip rename to .legacy/OfflineHelpers.zip diff --git a/Onezerker/Onezerker.zip b/.legacy/Onezerker.zip similarity index 100% rename from Onezerker/Onezerker.zip rename to .legacy/Onezerker.zip diff --git a/PythonPartNotifier/PythonPartNotifier.zip b/.legacy/PythonPartNotifier.zip similarity index 100% rename from PythonPartNotifier/PythonPartNotifier.zip rename to .legacy/PythonPartNotifier.zip diff --git a/RoundsPerMinute/RoundsPerMinute.zip b/.legacy/RoundsPerMinute.zip similarity index 100% rename from RoundsPerMinute/RoundsPerMinute.zip rename to .legacy/RoundsPerMinute.zip diff --git a/SanitySaver/SanitySaver.zip b/.legacy/SanitySaver.zip similarity index 100% rename from SanitySaver/SanitySaver.zip rename to .legacy/SanitySaver.zip diff --git a/ScalingAdjuster/ScalingAdjuster.zip b/.legacy/ScalingAdjuster.zip similarity index 100% rename from ScalingAdjuster/ScalingAdjuster.zip rename to .legacy/ScalingAdjuster.zip diff --git a/SpawnMultiplier/SpawnMultiplier.zip b/.legacy/SpawnMultiplier.zip similarity index 100% rename from SpawnMultiplier/SpawnMultiplier.zip rename to .legacy/SpawnMultiplier.zip diff --git a/Structs/Structs.zip b/.legacy/Structs.zip similarity index 100% rename from Structs/Structs.zip rename to .legacy/Structs.zip diff --git a/TextModLoader/TextModLoader.zip b/.legacy/TextModLoader.zip similarity index 100% rename from TextModLoader/TextModLoader.zip rename to .legacy/TextModLoader.zip diff --git a/TrueDamageLogger/TrueDamageLogger.zip b/.legacy/TrueDamageLogger.zip similarity index 100% rename from TrueDamageLogger/TrueDamageLogger.zip rename to .legacy/TrueDamageLogger.zip diff --git a/UserFeedback/UserFeedback.zip b/.legacy/UserFeedback.zip similarity index 100% rename from UserFeedback/UserFeedback.zip rename to .legacy/UserFeedback.zip diff --git a/CommandExtensions/_zipper.py b/CommandExtensions/_zipper.py deleted file mode 100644 index ba7662a..0000000 --- a/CommandExtensions/_zipper.py +++ /dev/null @@ -1,43 +0,0 @@ -import os -import shutil -from distutils.core import run_setup -from zipfile import ZIP_DEFLATED, ZipFile - -MODULE_NAME = "file_parser.pyd" -MODULE_DIR_NAME = "file_parser_src" - -folder_path = os.path.abspath(os.path.dirname(__file__)) -folder_name = os.path.basename(folder_path) - -module_setup_path = os.path.join(folder_path, MODULE_DIR_NAME, "setup.py") -run_setup(module_setup_path, ["build"]) - -zip_path = os.path.join(folder_path, folder_name + ".zip") -ignored_files = ( - zip_path, - os.path.abspath(__file__) -) - -with ZipFile(zip_path, "w", ZIP_DEFLATED, compresslevel=9) as zip_file: - for dir_path, dir_names, file_names in os.walk(folder_path): - current_dir = os.path.basename(dir_path) - if current_dir == "__pycache__": - shutil.rmtree(dir_path) - continue - elif current_dir == MODULE_DIR_NAME: - dir_names[:] = [] - continue - - for file in file_names: - file_path = os.path.join(dir_path, file) - if file_path in ignored_files: - continue - - rel_path = os.path.relpath(file_path, os.path.join(folder_path, "..")) - zip_file.write(file_path, rel_path) - - license_path = os.path.join(folder_path, "..", "LICENSE") - license_zip_path = os.path.join(folder_name, "LICENSE") - zip_file.write(license_path, license_zip_path) - -os.system(f"git add {os.path.join(folder_path, MODULE_NAME)}") diff --git a/TextModLoader/_zipper.py b/TextModLoader/_zipper.py deleted file mode 100644 index 099c510..0000000 --- a/TextModLoader/_zipper.py +++ /dev/null @@ -1,44 +0,0 @@ -import os -import shutil -from distutils.core import run_setup -from zipfile import ZIP_DEFLATED, ZipFile - -MODULE_NAME = "tml_parser.pyd" -MODULE_DIR_NAME = "tml_parser_src" - -folder_path = os.path.abspath(os.path.dirname(__file__)) -folder_name = os.path.basename(folder_path) - -module_setup_path = os.path.join(folder_path, MODULE_DIR_NAME, "setup.py") -run_setup(module_setup_path, ["build"]) - -zip_path = os.path.join(folder_path, folder_name + ".zip") -ignored_files = ( - zip_path, - os.path.abspath(__file__), - os.path.join(folder_path, "mod_info.json"), -) - -with ZipFile(zip_path, "w", ZIP_DEFLATED, compresslevel=9) as zip_file: - for dir_path, dir_names, file_names in os.walk(folder_path): - current_dir = os.path.basename(dir_path) - if current_dir == "__pycache__": - shutil.rmtree(dir_path) - continue - elif current_dir == MODULE_DIR_NAME: - dir_names[:] = [] - continue - - for file in file_names: - file_path = os.path.join(dir_path, file) - if file_path in ignored_files: - continue - - rel_path = os.path.relpath(file_path, os.path.join(folder_path, "..")) - zip_file.write(file_path, rel_path) - - license_path = os.path.join(folder_path, "..", "LICENSE") - license_zip_path = os.path.join(folder_name, "LICENSE") - zip_file.write(license_path, license_zip_path) - -os.system(f"git add {os.path.join(folder_path, MODULE_NAME)}") diff --git a/modinfo.json b/modinfo.json index 3732a21..9c6fc69 100644 --- a/modinfo.json +++ b/modinfo.json @@ -1,7 +1,7 @@ { "defaults": { "authors": "apple1417", - "source": "https://github.com/apple1417/bl-sdk-mods/", + "source": "https://github.com/apple1417/willow2-sdk-mods/", "supports": ["BL2", "TPS", "AoDK"], "license": "GNU GPLv3" }, @@ -17,12 +17,12 @@ "types": ["Utility"], "latest": "2.2", "versions": { - "1.5": "https://github.com/apple1417/bl-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/AltUseVendors/AltUseVendors.zip", - "1.6": "https://github.com/apple1417/bl-sdk-mods/raw/8273080a0bfcc922f0edaffb84bec4a9ca044b54/AltUseVendors/AltUseVendors.zip", - "1.7": "https://github.com/apple1417/bl-sdk-mods/raw/704664da48f8403e34e64ea0edef543e2bcdd544/AltUseVendors/AltUseVendors.zip", - "2.0": "https://github.com/apple1417/bl-sdk-mods/raw/b25d5ff91ebab5dc88035018813c6474e4556e74/AltUseVendors/AltUseVendors.zip", - "2.1": "https://github.com/apple1417/bl-sdk-mods/raw/016c9cabd93fb003ead99d32859aed7234f1ed51/AltUseVendors/AltUseVendors.zip", - "2.2": "https://github.com/apple1417/bl-sdk-mods/raw/master/AltUseVendors/AltUseVendors.zip" + "1.5": "https://github.com/apple1417/willow2-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/AltUseVendors/AltUseVendors.zip", + "1.6": "https://github.com/apple1417/willow2-sdk-mods/raw/8273080a0bfcc922f0edaffb84bec4a9ca044b54/AltUseVendors/AltUseVendors.zip", + "1.7": "https://github.com/apple1417/willow2-sdk-mods/raw/704664da48f8403e34e64ea0edef543e2bcdd544/AltUseVendors/AltUseVendors.zip", + "2.0": "https://github.com/apple1417/willow2-sdk-mods/raw/b25d5ff91ebab5dc88035018813c6474e4556e74/AltUseVendors/AltUseVendors.zip", + "2.1": "https://github.com/apple1417/willow2-sdk-mods/raw/016c9cabd93fb003ead99d32859aed7234f1ed51/AltUseVendors/AltUseVendors.zip", + "2.2": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/AltUseVendors.zip" }, "requirements": { "Enums": ">=1.0" @@ -49,7 +49,7 @@ "types": ["Utility"], "latest": "1.12", "versions": { - "1.12": "https://github.com/apple1417/bl-sdk-mods/raw/master/ApplesBorderlandsCheats/ApplesBorderlandsCheats.zip" + "1.12": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/ApplesBorderlandsCheats.zip" }, "requirements": { "UserFeedback": ">=1.3" @@ -64,17 +64,17 @@ " it all just keeps working fine.\n", "\n", "[See here for info on the builtin commands and how to write mods using them.]", - "(https://github.com/apple1417/bl-sdk-mods/blob/master/CommandExtensions/Writing-Mods.md)" + "(https://github.com/apple1417/willow2-sdk-mods/blob/master/.legacy/Writing-Mods.md)" ], "tagline": "Adds a few new console commands, which are fully compatible with blcmm files.", "types": ["Library"], "latest": "1.9", "versions": { - "1.5": "https://github.com/apple1417/bl-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/CommandExtensions/CommandExtensions.zip", - "1.6": "https://github.com/apple1417/bl-sdk-mods/raw/0c3096fb91ed3157557106b2e742a14c8b328c5c/CommandExtensions/CommandExtensions.zip", - "1.7": "https://github.com/apple1417/bl-sdk-mods/raw/745a8880c414e8f1bd8e697dcd7cb7d9496d45ad/CommandExtensions/CommandExtensions.zip", - "1.8": "https://github.com/apple1417/bl-sdk-mods/raw/2bd81dffeee193b61c96ca04690f436f15783ad0/CommandExtensions/CommandExtensions.zip", - "1.9": "https://github.com/apple1417/bl-sdk-mods/raw/master/CommandExtensions/CommandExtensions.zip" + "1.5": "https://github.com/apple1417/willow2-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/CommandExtensions/CommandExtensions.zip", + "1.6": "https://github.com/apple1417/willow2-sdk-mods/raw/0c3096fb91ed3157557106b2e742a14c8b328c5c/CommandExtensions/CommandExtensions.zip", + "1.7": "https://github.com/apple1417/willow2-sdk-mods/raw/745a8880c414e8f1bd8e697dcd7cb7d9496d45ad/CommandExtensions/CommandExtensions.zip", + "1.8": "https://github.com/apple1417/willow2-sdk-mods/raw/2bd81dffeee193b61c96ca04690f436f15783ad0/CommandExtensions/CommandExtensions.zip", + "1.9": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/CommandExtensions.zip" }, "requirements": {} }, @@ -91,7 +91,7 @@ "types": ["Gameplay"], "latest": "1.4", "versions": { - "1.4": "https://github.com/apple1417/bl-sdk-mods/raw/master/EnemyLevelRandomizer/EnemyLevelRandomizer.zip" + "1.4": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/EnemyLevelRandomizer.zip" }, "requirements": {} }, @@ -106,8 +106,8 @@ "types": ["Library"], "latest": "1.1", "versions": { - "1.1": "https://github.com/apple1417/bl-sdk-mods/raw/master/Enums/Enums.zip", - "1.0": "https://github.com/apple1417/bl-sdk-mods/raw/1a6247d33c537051706ca021a5d02c05f7ec06ff/Enums/Enums.zip" + "1.1": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/Enums.zip", + "1.0": "https://github.com/apple1417/willow2-sdk-mods/raw/1a6247d33c537051706ca021a5d02c05f7ec06ff/Enums/Enums.zip" }, "requirements": {} }, @@ -136,8 +136,8 @@ "types": ["Gameplay", "Utility"], "latest": "1.4", "versions": { - "1.3": "https://github.com/apple1417/bl-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/EquipLocker/EquipLocker.zip", - "1.4": "https://github.com/apple1417/bl-sdk-mods/raw/master/EquipLocker/EquipLocker.zip" + "1.3": "https://github.com/apple1417/willow2-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/EquipLocker/EquipLocker.zip", + "1.4": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/EquipLocker.zip" }, "requirements": {} }, @@ -151,7 +151,7 @@ "types": ["Utility"], "latest": "1.2", "versions": { - "1.2": "https://github.com/apple1417/bl-sdk-mods/raw/master/HideUndiscoveredMissions/HideUndiscoveredMissions.zip" + "1.2": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/HideUndiscoveredMissions.zip" }, "requirements": {} }, @@ -172,7 +172,7 @@ "types": ["Utility"], "latest": "1.3", "versions": { - "1.3": "https://github.com/apple1417/bl-sdk-mods/raw/master/ItemLevelUncapper/ItemLevelUncapper.zip" + "1.3": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/ItemLevelUncapper.zip" }, "requirements": {} }, @@ -183,7 +183,7 @@ "types": ["Gameplay"], "latest": "2.0", "versions": { - "2.0": "https://github.com/apple1417/bl-sdk-mods/raw/master/Mario/Mario.zip" + "2.0": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/Mario.zip" }, "requirements": {} }, @@ -199,7 +199,7 @@ "types": ["Utility"], "latest": "1.3", "versions": { - "1.3": "https://github.com/apple1417/bl-sdk-mods/raw/master/NoAds/NoAds.zip" + "1.3": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/NoAds.zip" }, "requirements": {} }, @@ -220,7 +220,7 @@ "types": ["Utility"], "latest": "1.3", "versions": { - "1.3": "https://github.com/apple1417/bl-sdk-mods/raw/master/OfflineHelpers/OfflineHelpers.zip" + "1.3": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/OfflineHelpers.zip" }, "requirements": {} }, @@ -231,7 +231,7 @@ "types": ["Gameplay"], "latest": "1.0", "versions": { - "1.0": "https://github.com/apple1417/bl-sdk-mods/raw/master/OHKO/OHKO.zip" + "1.0": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/OHKO.zip" }, "requirements": {} }, @@ -249,7 +249,7 @@ "supports": ["BL2"], "latest": "1.8", "versions": { - "1.8": "https://github.com/apple1417/bl-sdk-mods/raw/master/Onezerker/Onezerker.zip" + "1.8": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/Onezerker.zip" }, "requirements": {} }, @@ -277,9 +277,9 @@ "types": ["Utility"], "latest": "1.9", "versions": { - "1.9": "https://github.com/apple1417/bl-sdk-mods/raw/master/PythonPartNotifier/PythonPartNotifier.zip", - "1.8": "https://github.com/apple1417/bl-sdk-mods/raw/ce064304366975d465d24a447b40cbeff5504c72/PythonPartNotifier/PythonPartNotifier.zip", - "1.7": "https://github.com/apple1417/bl-sdk-mods/raw/bcd5b7a2d92e2b8af9ded5de00117775d17e7078/PythonPartNotifier/PythonPartNotifier.zip" + "1.9": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/PythonPartNotifier.zip", + "1.8": "https://github.com/apple1417/willow2-sdk-mods/raw/ce064304366975d465d24a447b40cbeff5504c72/PythonPartNotifier/PythonPartNotifier.zip", + "1.7": "https://github.com/apple1417/willow2-sdk-mods/raw/bcd5b7a2d92e2b8af9ded5de00117775d17e7078/PythonPartNotifier/PythonPartNotifier.zip" }, "requirements": {} }, @@ -297,8 +297,8 @@ "types": ["Utility"], "latest": "1.3", "versions": { - "1.2": "https://github.com/apple1417/bl-sdk-mods/raw/bcd5b7a2d92e2b8af9ded5de00117775d17e7078/RoundsPerMinute/RoundsPerMinute.zip", - "1.3": "https://github.com/apple1417/bl-sdk-mods/raw/master/RoundsPerMinute/RoundsPerMinute.zip" + "1.2": "https://github.com/apple1417/willow2-sdk-mods/raw/bcd5b7a2d92e2b8af9ded5de00117775d17e7078/RoundsPerMinute/RoundsPerMinute.zip", + "1.3": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/RoundsPerMinute.zip" }, "requirements": {} }, @@ -309,7 +309,7 @@ " deleted even with it off.\n", "\n", "See the", - " [readme](https://github.com/apple1417/bl-sdk-mods/tree/master/SanitySaver#save-editing)", + " [readme](https://github.com/apple1417/willow2-sdk-mods/tree/master/SanitySaver#save-editing)", " for some extra information on how to save edit while using this." ], "tagline": [ @@ -319,11 +319,11 @@ "types": ["Utility"], "latest": "2.2", "versions": { - "1.1": "https://github.com/apple1417/bl-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/SanitySaver/SanitySaver.zip", - "2.0": "https://github.com/apple1417/bl-sdk-mods/raw/dad0cbc6bb500ae0d6b2a2305e51a85a4bb4d6ec/SanitySaver/SanitySaver.zip", - "2.1": "https://github.com/apple1417/bl-sdk-mods/raw/52549cc534d4d8b702940978b3208cb402a0c929/SanitySaver/SanitySaver.zip", - "2.2": "https://github.com/apple1417/bl-sdk-mods/raw/c631c70226fe05e0209c34cd4f4e489a0c7154ce/SanitySaver/SanitySaver.zip", - "2.3": "https://github.com/apple1417/bl-sdk-mods/raw/master/SanitySaver/SanitySaver.zip" + "1.1": "https://github.com/apple1417/willow2-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/SanitySaver/SanitySaver.zip", + "2.0": "https://github.com/apple1417/willow2-sdk-mods/raw/dad0cbc6bb500ae0d6b2a2305e51a85a4bb4d6ec/SanitySaver/SanitySaver.zip", + "2.1": "https://github.com/apple1417/willow2-sdk-mods/raw/52549cc534d4d8b702940978b3208cb402a0c929/SanitySaver/SanitySaver.zip", + "2.2": "https://github.com/apple1417/willow2-sdk-mods/raw/c631c70226fe05e0209c34cd4f4e489a0c7154ce/SanitySaver/SanitySaver.zip", + "2.3": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/SanitySaver.zip" }, "requirements": {} }, @@ -337,8 +337,8 @@ "types": ["Utility"], "latest": "1.7", "versions": { - "1.6": "https://github.com/apple1417/bl-sdk-mods/raw/bcd5b7a2d92e2b8af9ded5de00117775d17e7078/ScalingAdjuster/ScalingAdjuster.zip", - "1.7": "https://github.com/apple1417/bl-sdk-mods/raw/master/ScalingAdjuster/ScalingAdjuster.zip" + "1.6": "https://github.com/apple1417/willow2-sdk-mods/raw/bcd5b7a2d92e2b8af9ded5de00117775d17e7078/ScalingAdjuster/ScalingAdjuster.zip", + "1.7": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/ScalingAdjuster.zip" }, "requirements": {} }, @@ -352,7 +352,7 @@ "types": ["Gameplay"], "latest": "1.5", "versions": { - "1.5": "https://github.com/apple1417/bl-sdk-mods/raw/master/SpawnMultiplier/SpawnMultiplier.zip" + "1.5": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/SpawnMultiplier.zip" }, "requirements": {} }, @@ -367,8 +367,8 @@ "types": ["Library"], "latest": "1.1", "versions": { - "1.1": "https://github.com/apple1417/bl-sdk-mods/raw/master/Structs/Structs.zip", - "1.0": "https://github.com/apple1417/bl-sdk-mods/raw/9b7025d970ec9b9132abac8d433d44e1e4388e96/Structs/Structs.zip" + "1.1": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/Structs.zip", + "1.0": "https://github.com/apple1417/willow2-sdk-mods/raw/9b7025d970ec9b9132abac8d433d44e1e4388e96/Structs/Structs.zip" }, "requirements": {} }, @@ -383,11 +383,11 @@ "types": ["Library"], "latest": "1.4", "versions": { - "1.4": "https://github.com/apple1417/bl-sdk-mods/raw/master/TextModLoader/TextModLoader.zip", - "1.3": "https://github.com/apple1417/bl-sdk-mods/raw/3aa1fd801c623c9330382d9e60b22d2383a53f3e/TextModLoader/TextModLoader.zip", - "1.2": "https://github.com/apple1417/bl-sdk-mods/raw/f6bf3ae8db4754aa17fdc7d2f33bc42252c3f7b1/TextModLoader/TextModLoader.zip", - "1.1": "https://github.com/apple1417/bl-sdk-mods/raw/ede5da85559b0a2a9aabc2638f0e5eb1a8eef9b8/TextModLoader/TextModLoader.zip", - "1.0": "https://github.com/apple1417/bl-sdk-mods/raw/9578e50c9f21e9ecebadbde1a91aef7dd035e9fe/TextModLoader/TextModLoader.zip" + "1.4": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/TextModLoader.zip", + "1.3": "https://github.com/apple1417/willow2-sdk-mods/raw/3aa1fd801c623c9330382d9e60b22d2383a53f3e/TextModLoader/TextModLoader.zip", + "1.2": "https://github.com/apple1417/willow2-sdk-mods/raw/f6bf3ae8db4754aa17fdc7d2f33bc42252c3f7b1/TextModLoader/TextModLoader.zip", + "1.1": "https://github.com/apple1417/willow2-sdk-mods/raw/ede5da85559b0a2a9aabc2638f0e5eb1a8eef9b8/TextModLoader/TextModLoader.zip", + "1.0": "https://github.com/apple1417/willow2-sdk-mods/raw/9578e50c9f21e9ecebadbde1a91aef7dd035e9fe/TextModLoader/TextModLoader.zip" }, "requirements": {} }, @@ -405,7 +405,7 @@ "types": ["Utility"], "latest": "1.3", "versions": { - "1.3": "https://github.com/apple1417/bl-sdk-mods/raw/master/TrueDamageLogger/TrueDamageLogger.zip" + "1.3": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/TrueDamageLogger.zip" }, "requirements": {} }, @@ -430,8 +430,8 @@ "types": ["Library"], "latest": "1.6", "versions": { - "1.6": "https://github.com/apple1417/bl-sdk-mods/raw/master/UserFeedback/UserFeedback.zip", - "1.5": "https://github.com/apple1417/bl-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/UserFeedback/UserFeedback.zip" + "1.6": "https://github.com/apple1417/willow2-sdk-mods/raw/master/.legacy/UserFeedback.zip", + "1.5": "https://github.com/apple1417/willow2-sdk-mods/raw/a45fde7c5edc2224c15ac0a775076aacd3d40a0a/UserFeedback/UserFeedback.zip" }, "requirements": {} } diff --git a/zipper.ini b/zipper.ini deleted file mode 100644 index f0b9f15..0000000 --- a/zipper.ini +++ /dev/null @@ -1,36 +0,0 @@ -[AAA_OptionsWrapper] -dont_zip = True - -[AsyncUtil] -dont_zip = True - -[CommandExtensions] -custom_script = python CommandExtensions\_zipper.py - -[CrowdControl] -ignore = config.json,token.txt,listener.log - -[FixHotfixes] -dont_zip = True -include_settings = True - -[ILUGen] -dont_zip = True - -[NoAds] -include_settings = True - -[SanitySaver] -ignore = Saves/* - -[SDKAutorun] -dont_zip = True - -[SideMissionRandomizer] -ignore = seeds.json,*.txt - -[TextImages] -dont_zip = True - -[TextModLoader] -custom_script = python TextModLoader\_zipper.py diff --git a/zipper.py b/zipper.py deleted file mode 100644 index 619409b..0000000 --- a/zipper.py +++ /dev/null @@ -1,110 +0,0 @@ -import os -import shutil -import subprocess -from argparse import ArgumentParser -from collections import OrderedDict -from configparser import ConfigParser -from fnmatch import fnmatch -from zipfile import ZIP_DEFLATED, ZipFile - -""" -This is a quick helper script I use to add the zips into each folder - It is *not* meant to be run - by the sdk, it's external. -""" - -parser = ArgumentParser(description="Cleanup and zip all mod folders.") -parser.add_argument( - "--git-staged", - action="store_true", - help="Only zip folders that contain files currently staged in git." -) -parser.add_argument( - "--dont-zip", - action="store_true", - help="Don't create any zip files, just clean out the folders." -) -args = parser.parse_args() - -config = ConfigParser(defaults=OrderedDict( - dont_zip="false", - include_settings="false", - ignore="", - custom_script="" -)) -config.read("zipper.ini") - -git_whitelist = set() -if args.git_staged: - proc = subprocess.run( - ["git", "diff", "--name-only", "--staged"], - stdout=subprocess.PIPE, - encoding="utf8" - ) - - for file in proc.stdout.splitlines(): - curr_path = os.path.normpath(file) - new_path = os.path.dirname(curr_path) - if new_path == "": - continue - while new_path != "": - curr_path = new_path - new_path = os.path.dirname(curr_path) - git_whitelist.add(curr_path) - - -for dir_entry in os.scandir(): - if not dir_entry.is_dir(): - continue - - if dir_entry.name[0] == ".": - continue - if args.git_staged and dir_entry.name not in git_whitelist: - continue - - dont_zip = args.dont_zip - ignores = ["settings.json"] - if dir_entry.name in config: - if config[dir_entry.name]["custom_script"]: - os.system(config[dir_entry.name]["custom_script"]) - continue - - dont_zip = dont_zip or config[dir_entry.name].getboolean("dont_zip") - - if config[dir_entry.name].getboolean("include_settings"): - ignores.remove("settings.json") - ignores += [x for x in config[dir_entry.name]["ignore"].split(",") if len(x) > 0] - - zip_name = dir_entry.name + ".zip" - zip_path = os.path.join(dir_entry.path, zip_name) - zip_file = None - if not dont_zip: - try: - os.remove(zip_path) - except FileNotFoundError: - pass - - zip_file = ZipFile(zip_path, "w", ZIP_DEFLATED, compresslevel=9) - - license_path = os.path.join(os.path.basename(dir_entry.path), "LICENSE") - zip_file.write("LICENSE", license_path) - - for dir_path, _, file_names in os.walk(dir_entry.path): - if os.path.basename(dir_path) == "__pycache__": - shutil.rmtree(dir_path) - continue - for file in file_names: - if file == zip_name: - continue - file_path = os.path.join(dir_path, file) - rel_path = os.path.relpath(file_path, dir_entry.path) - - for ig in ignores: - if file == ig or fnmatch(rel_path, ig): - os.remove(file_path) - break - else: - if not dont_zip: - zip_file.write(file_path) # type: ignore - - if not dont_zip: - zip_file.close() # type: ignore