Skip to content

Commit

Permalink
override remove using project ID to block adding, mkdirs for overrides/
Browse files Browse the repository at this point in the history
  • Loading branch information
sisby-folk committed Jun 26, 2024
1 parent bc554e7 commit 330ddbb
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
17 changes: 11 additions & 6 deletions pack/index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ metafile = true

[[files]]
file = "mods/circus-deco.pw.toml"
hash = "f5f69460dd4a7d6e5ce2b4413a2f6f6030f85c65383da6367bd8cf03d80b6bce"
hash = "5f6c05ac9fd1fe0a2d766988434300f57fafd1c24489db5b5807bf3e5000359b"
metafile = true

[[files]]
Expand Down Expand Up @@ -489,6 +489,11 @@ file = "mods/crypt-mimic.pw.toml"
hash = "21ba3332f886bed4f70cca22e245541bb3fa62be1ffc888687ec2030054a3d63"
metafile = true

[[files]]
file = "mods/crystal-fortunes.pw.toml"
hash = "34a04f5564ba6025bd1d67f275b78da8f79149bb77e30fd6be48ae8a05e513dc"
metafile = true

[[files]]
file = "mods/customizable-carts.pw.toml"
hash = "5a7be1bc39aa0a43e4a83a2fe79b9ee0945010d3d4d9776069b58651b3338c09"
Expand Down Expand Up @@ -526,7 +531,7 @@ metafile = true

[[files]]
file = "mods/fabric-api.pw.toml"
hash = "e9870688b5c78a9cc50f79922fdac81e1999279f5567cd5092952adaf6471313"
hash = "fc96b91acafcbaf76bf94d2dff7d53a53fdbf52ccc6030acbfffe13a365cc982"
metafile = true

[[files]]
Expand Down Expand Up @@ -596,7 +601,7 @@ metafile = true

[[files]]
file = "mods/mirthdew-encore.pw.toml"
hash = "0e8352e1c34fbff5fc6d0d289da9329401b6bdb28e3605cd95706587761c1c43"
hash = "9e72e72f38de72460cfea8e17fdbe81e5cd01fa3e925df1ce293967f753f528e"
metafile = true

[[files]]
Expand Down Expand Up @@ -656,7 +661,7 @@ metafile = true

[[files]]
file = "mods/rounded_mod.pw.toml"
hash = "cc11514333c841bb89479780546b5db05d9ab17ea51982b00cdc4a4c41319dc9"
hash = "7e88369b7ae49680a78bd06014b7fb0d5b7498fd0d4c6b81f622e17de377cf64"
metafile = true

[[files]]
Expand Down Expand Up @@ -711,7 +716,7 @@ metafile = true

[[files]]
file = "mods/styledplayerlist.pw.toml"
hash = "f163850cb5a2544393b14b9d6cdc4e173efc1dc90aeb82fdf1d095339c0ad682"
hash = "a4fc712afb566a3964468c0df86eabce031ec9b844d7f42abf79e05de73b4591"
metafile = true

[[files]]
Expand Down Expand Up @@ -746,7 +751,7 @@ metafile = true

[[files]]
file = "mods/vainglory.pw.toml"
hash = "a2e65fd02ef76e721890d9d51cb37731e36f556231d4a2fd26151a75fae2ed71"
hash = "cbe00098d6f0c7c108fb67429276bfb2b4b6b94a827238a86074eddf135c8cda"
metafile = true

[[files]]
Expand Down
2 changes: 1 addition & 1 deletion pack/pack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "4dd2c3b98906b5601ee9dcc84a9d02462448ce403903c373de1055b6e04aa2ef"
hash = "8dbe27928da66629d97f4ce8c875b7b5b7b50e36c33815d80e501eacde2ad08d"

[versions]
fabric = "0.15.11"
Expand Down
2 changes: 1 addition & 1 deletion scripts/override_remove.json5
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
{"project_id": "emi"}, // crashes (might be incompat)
{"project_id": "crystal-fortunes"}, // server crash
{"project_id": "mid-journey"}, // server crash
{"project_id": "Yaz9NVDK"}, // balloons away! - bad modrinth metadata
]
15 changes: 10 additions & 5 deletions scripts/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def main():
event = 'carnival'
mods_path = './mods/'
pack_toml_path = './pack.toml'
overrides_path = '../scripts/overrides'
override_add_path = '../scripts/override_add.json5'
override_remove_path = '../scripts/override_remove.json5'
min_install_time = 0.1
Expand All @@ -55,6 +56,9 @@ def main():
shutil.rmtree(mods_path)
os.makedirs(mods_path)

if not os.path.exists(overrides_path):
os.makedirs(overrides_path)

# Refresh to keep log clean
os.system('packwiz refresh')

Expand All @@ -71,6 +75,8 @@ def main():
# Install mods based on slugs and versions
for mod in overrides_add + submissions:
platform = mod['platform'] if 'platform' in mod else mod
if platform['project_id'] in [x['project_id'] for x in overrides_remove]:
continue
before_time = time.time()
if not packwiz_pretty_print('packwiz mr add ' + (platform['project_id'] if 'version_id' not in platform else 'https://modrinth.com/mod/' + platform['project_id'] + '/version/' + platform['version_id']) + ' -y'):
print('Update failed. Please see above for error.')
Expand All @@ -82,17 +88,16 @@ def main():
packwiz_pretty_print('packwiz remove ' + mod['project_id'], ignore_errors=True)

# Copy in overriding jar files, you heretic
shutil.copytree('../scripts/overrides', './mods', dirs_exist_ok=True) # Python 3.8 :pineapple:
shutil.copytree(overrides_path, './mods', dirs_exist_ok=True) # Python 3.8 :pineapple:

# Refresh just in case
os.system('packwiz refresh')

# Prompt
print('Update successful! Next Steps:')
print('1. Bump pack version in pack.toml')
print('2. `packwiz serve` and smoke test using local client+server')
print('3. commit and push')
print('4. test on production client+server')
print('- `packwiz serve` and smoke test using local client+server')
print('- commit and push')
print('- restart server')


if __name__ == "__main__":
Expand Down

0 comments on commit 330ddbb

Please sign in to comment.