kill reliquery and add whitelist.txt

4 files changed, 16 insertions, 8 deletions

diff --git a/mods.txt b/mods.txt
index 124ccc3..8bd5a3f 100644
--- a/mods.txt
+++ b/mods.txt
@@ -34,7 +34,7 @@ treecapitator.jar https://minecraft.curseforge.com/projects/treecapitator-port/f
 ironchests.jar https://minecraft.curseforge.com/projects/iron-chests/files/latest
 ironbackpacks.jar https://minecraft.curseforge.com/projects/iron-backpacks/files/latest
 hwyla.jar https://minecraft.curseforge.com/projects/hwyla/files/latest
-# don't work right now.
+# doesn't work right now.
 #dynamictrees-traverse-compat.jar https://minecraft.curseforge.com/projects/dynamic-trees-traverse-compat/files/latest
 dynamictrees-thaum-compat.jar https://minecraft.curseforge.com/projects/dttc/files/latest
 dynamictrees-pams-compat.jar https://minecraft.curseforge.com/projects/dtphc/files/latest
@@ -65,7 +65,6 @@ jer.jar https://minecraft.curseforge.com/projects/just-enough-resources-jer/file
 roots.jar https://minecraft.curseforge.com/projects/roots/files/latest
 lightlevel.jar https://minecraft.curseforge.com/projects/light-level-overlay-reloaded/files/latest
 morph-o-tool.jar https://minecraft.curseforge.com/projects/morph-o-tool/files/latest
-reliquary.jar https://minecraft.curseforge.com/projects/reliquary-v1-3/files/latest
 botania.jar https://minecraft.curseforge.com/projects/botania/files/latest
 storage-drawers.jar https://minecraft.curseforge.com/projects/storage-drawers/files/latest
 chameleon.jar https://minecraft.curseforge.com/projects/chameleon/files/latest
diff --git a/update.py b/update.py
index 2622c8b..876d3e4 100755
--- a/update.py
+++ b/update.py
@@ -33,6 +33,10 @@ parser.add_argument('--version-file',
 parser.add_argument('--pack-location',
     type=str,
     help="Optional custom modpack folder location (default: read from pack-location.txt)")
+parser.add_argument('--whitelist-file',
+    type=str,
+    default="whitelist.txt",
+    help="Optional custom whitelist file that tells 'install' which files not to remove (default: whitelist.txt)")
 
 ## loaded from version.txt
 VERSION = 0
@@ -56,6 +60,8 @@ def install(args):
     # (fname, checksum, url)
     mods = read_file(args.version_file)
     names = [mod[0] for mod in mods]
+    # whitelist client mods (e.g. optifine)
+    names += [line[0] for line in read_file(args.whitelist_file)]
 
     for mod in mods:
         mod_path = os.path.join(args.pack_location, mod[0])
@@ -71,7 +77,6 @@ def install(args):
 
     print()
     print("Removing old mods...")
-    
     for jar in os.listdir(args.pack_location):
         if jar not in names and os.path.splitext(jar)[1] == ".jar":
             os.remove(os.path.join(args.pack_location, jar))
@@ -146,6 +151,9 @@ if __name__ == "__main__":
         print("Error: mod folder \"" + args.pack_location + "\" is not actually a folder.")
         parser.print_help()
         sys.exit(1)
+    if not os.path.exists(args.whitelist_file):
+        print("Error: whitelist file \"" + args.whitelist_file + "\" does not exist.")
+        sys.exit(1)
         
     if not (args.command in COMMAND_MAP):
         print("Error: command \"" + args.command + "\" does not exist")
diff --git a/version.txt b/version.txt
index 78f2ca7..7f4beaf 100644
--- a/version.txt
+++ b/version.txt
@@ -1,5 +1,5 @@
 # Format: <jarname> <hex digested sha1> <direct download url>
-#VERSION 5
+#VERSION 6
 thaumcraft.jar fe0899048f1796df04e9727bbf1898df30492a00 https://media.forgecdn.net/files/2629/23/Thaumcraft-1.12.2-6.1.BETA26.jar
 baubles.jar cb13fcfb18a9cb0cbd825fd5fe8d813c77368549 https://media.forgecdn.net/files/2518/667/Baubles-1.12-1.5.2.jar
 opencomputers.jar 70feadd549255477810dff7145cade9d507b2dec https://media.forgecdn.net/files/2638/675/OpenComputers-MC1.12.2-1.7.3.146.jar
@@ -52,7 +52,7 @@ foamfix.jar 69a9086f2084d3cbc3a410ee64369d719a212330 https://media.forgecdn.net/
 autoreglib.jar 4811b5df37fafdf6d4df6db5fe9ef71081e4b5ee https://media.forgecdn.net/files/2652/766/AutoRegLib-1.3-24.jar
 inventory-tweaks.jar 6e00827d1a009da39fa6db5afd2a3d6b024abfe9 https://media.forgecdn.net/files/2482/481/InventoryTweaks-1.63.jar
 cyclops-core.jar 5a13673be4f1e9b758e6a36f1f0bd654f41b5b5a https://media.forgecdn.net/files/2663/989/CyclopsCore-1.12.2-1.0.2.jar
-common-capabilities.jar 560a3c0c731d37b83feecbfa9d91548f542cb3db https://media.forgecdn.net/files/2661/753/CommonCapabilities-1.12.2-2.0.0.jar
+common-capabilities.jar 79e3348256e9fd98aa697e118831f7254a424485 https://media.forgecdn.net/files/2668/515/CommonCapabilities-1.12.2-2.0.1.jar
 integrated-dynamics.jar a1e50b705c3faba4c1fb079dc65643131a93508f https://media.forgecdn.net/files/2666/913/IntegratedDynamics-1.12.2-1.0.3.jar
 integrated-tunnels.jar 3fdb9ac2e55a809aa8858da0861b6d0722cce117 https://media.forgecdn.net/files/2665/608/IntegratedTunnels-1.12.2-1.6.2.jar
 integrated-crafting.jar b83b04d93c802b4a4aebe87e0c0dc0595266f616 https://media.forgecdn.net/files/2665/580/IntegratedCrafting-1.12.2-1.0.1.jar
@@ -60,12 +60,11 @@ jer.jar b42563003baf61d8e5eb1c24b59cf21988ff4616 https://media.forgecdn.net/file
 roots.jar 994c1cc8e79d027c4232533984bb89225b89eb50 https://media.forgecdn.net/files/2510/836/roots-2-0.104.jar
 lightlevel.jar 38de949c94ac06b2fce94e642b729568ce7788af https://media.forgecdn.net/files/2563/430/LLOverlayReloaded-1.1.6-mc1.12.2.jar
 morph-o-tool.jar 55a363ccd8e0614229991cd1f6bf831eaf874ff7 https://media.forgecdn.net/files/2658/176/Morph-o-Tool-1.2-21.jar
-reliquary.jar 7f14a28e01baec08d8bc06dd759e540cceaefb27 https://media.forgecdn.net/files/2624/74/Reliquary-1.12.2-1.3.4.780.jar
 botania.jar 137c3ff04b030ad28a8e2cb8a27ddd6002f2865c https://media.forgecdn.net/files/2642/650/Botania+r1.10-358.jar
 storage-drawers.jar 7a5ad491379a53cd45eced598c2ece3155bffb51 https://media.forgecdn.net/files/2642/386/StorageDrawers-1.12.2-5.3.8.jar
 chameleon.jar 5ed3dd5fd1ebded57bfe525b4ece11232bd14e5e https://media.forgecdn.net/files/2450/900/Chameleon-1.12-4.1.3.jar
 xnet.jar dc64dd5c444acf1365c6e036fc29f694571a264f https://media.forgecdn.net/files/2660/172/xnet-1.12-1.7.6.jar
-yabba.jar 9db54b0e4a684209835dd91e18d5df22f1ce87e7 https://media.forgecdn.net/files/2666/479/YABBA-1.1.2.39.jar
+yabba.jar aabe49218ae686f33607016f2f49bb0d4f63771c https://media.forgecdn.net/files/2668/499/YABBA-1.1.2.40.jar
 wanionlib.jar bbee84cafbbc72b24ee987fda668b3ee48ced74a https://media.forgecdn.net/files/2651/482/WanionLib-1.12.2-2.2.jar
 unidict.jar 3708fce1adc2c90e2b488402eeffcc6ca6e7d533 https://media.forgecdn.net/files/2652/588/UniDict-1.12.2-2.9.2.jar
 reauth.jar be3dedc6a808f13828373176d653d2e0bb629eeb https://media.forgecdn.net/files/2560/638/reauth-3.6.0.jar
@@ -74,7 +73,7 @@ psi.jar 8b84d21c2013fffc42ad99d7ccf98a9c01e8b71b https://media.forgecdn.net/file
 thaumic-jei.jar ea147ca1fb8a83c5094a383ededf0296460ef83f https://media.forgecdn.net/files/2637/182/ThaumicJEI-1.12.2-1.5.5-23.jar
 simply-jetpacks.jar 91e9d4f5a3352499af306bc0cb55dc10c9c399e0 https://media.forgecdn.net/files/2635/221/SimplyJetpacks2-1.12.2-2.2.10.63.jar
 quark.jar 1bf41a7696d7692ef7f4042fed50e3f7440685e4 https://media.forgecdn.net/files/2663/450/Quark-r1.5-145.jar
-ftblib.jar dd6e72235cfd0133f56439ef929dbfd93d99df11 https://media.forgecdn.net/files/2663/884/FTBLib-5.4.1.80.jar
+ftblib.jar 300dfdebdc9282a7bba7a92b90a77ee56d431dca https://media.forgecdn.net/files/2668/495/FTBLib-5.4.1.81.jar
 redstone-flux.jar ed67a4ce69c8831b7536b2623a857fefc8257e62 https://media.forgecdn.net/files/2623/90/RedstoneFlux-1.12-2.1.0.6-universal.jar
 brandonscore.jar 9c263bdff2aa545ac9e7dc53e36c45e980c6da8e https://media.forgecdn.net/files/2649/656/BrandonsCore-1.12.2-2.4.9.195-universal.jar
 nowither.jar ce2dab31ee8c732cda6fdd67289da1189e9fbcb1 https://media.forgecdn.net/files/2638/317/badwithernocookiereloaded-1.12.2-3.3.16.jar
diff --git a/whitelist.txt b/whitelist.txt
new file mode 100644
index 0000000..9ff8625
--- /dev/null
+++ b/whitelist.txt
@@ -0,0 +1,2 @@
+# file names in here are NOT removed from mods folder during 'install'
+optifine.jar