Skip to content

Commit eabd79f

Browse files
MagicSweepyMagicSweepy
committed
Merge branch 'refs/heads/main' into ms/mui-update
# Conflicts: # pack.toml
2 parents 237e93a + 75cb677 commit eabd79f

26 files changed

Lines changed: 80 additions & 79 deletions

‎.github/scripts/archive.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
archive_dir="archive"
6+
7+
mkdir -p "$archive_dir"
8+
cp pack.toml index.toml "$archive_dir/"
9+
10+
while IFS= read -r archive_file; do
11+
[ -n "$archive_file" ] || continue
12+
mkdir -p "${archive_dir}/$(dirname "$archive_file")"
13+
cp "$archive_file" "${archive_dir}/$archive_file"
14+
done < <(tomlq -r '.files[].file' < index.toml)

‎.github/scripts/manifest.sh‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎.github/workflows/nightly.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ on:
1313
- '.github/ISSUE_TEMPLATE/**'
1414

1515
env:
16-
MANIFEST_REPO: GregTechLite/gregtechlite.github.io
17-
MANIFEST_BRANCH: main
18-
MANIFEST_BASE_URL: https://gregtechlite.github.io
16+
ARCHIVE_REPO: GregTechLite/website
17+
ARCHIVE_BRANCH: main
18+
ARCHIVE_BASE_URL: https://gregtechlite.morphismmc.com/archives
1919

2020
permissions:
2121
contents: write
@@ -52,25 +52,25 @@ jobs:
5252
- name: Resolve metadata
5353
run: bash .github/scripts/meta.sh
5454

55-
- name: Prepare manifest
56-
run: bash .github/scripts/manifest.sh
55+
- name: Prepare archive
56+
run: bash .github/scripts/archive.sh
5757

5858
- name: Package client
5959
id: package
6060
run: bash .github/scripts/client.sh "${SLUG}-nightly"
6161

6262
- name: Package server
6363
id: package_server
64-
run: bash .github/scripts/server.sh "${SLUG}-nightly" "${MANIFEST_BASE_URL}/nightly/pack.toml"
64+
run: bash .github/scripts/server.sh "${SLUG}-nightly" "${ARCHIVE_BASE_URL}/nightly/pack.toml"
6565

66-
- name: Deploy nightly manifest
66+
- name: Deploy nightly archive
6767
uses: peaceiris/actions-gh-pages@v4
6868
with:
69-
deploy_key: ${{ secrets.MANIFEST_DEPLOY_KEY }}
70-
external_repository: ${{ env.MANIFEST_REPO }}
71-
publish_branch: ${{ env.MANIFEST_BRANCH }}
72-
publish_dir: dist/manifest
73-
destination_dir: nightly
69+
deploy_key: ${{ secrets.ARCHIVE_DEPLOY_KEY }}
70+
external_repository: ${{ env.ARCHIVE_REPO }}
71+
publish_branch: ${{ env.ARCHIVE_BRANCH }}
72+
publish_dir: archive
73+
destination_dir: archives/nightly
7474
user_name: 'github-actions[bot]'
7575
user_email: 'github-actions[bot]@users.noreply.github.com'
7676
commit_message: "Nightly ${{ env.SHORT_SHA }}"

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ on:
66
- 'v*'
77

88
env:
9-
MANIFEST_REPO: GregTechLite/gregtechlite.github.io
10-
MANIFEST_BRANCH: main
11-
MANIFEST_BASE_URL: https://gregtechlite.github.io
9+
ARCHIVE_REPO: GregTechLite/website
10+
ARCHIVE_BRANCH: main
11+
ARCHIVE_BASE_URL: https://gregtechlite.morphismmc.com/archives
1212

1313
permissions:
1414
contents: write
@@ -53,25 +53,25 @@ jobs:
5353
exit 1
5454
fi
5555
56-
- name: Prepare manifest
57-
run: bash .github/scripts/manifest.sh
56+
- name: Prepare archive
57+
run: bash .github/scripts/archive.sh
5858

5959
- name: Package client
6060
id: package
6161
run: bash .github/scripts/client.sh "${SLUG}-${VERSION}"
6262

6363
- name: Package server
6464
id: package_server
65-
run: bash .github/scripts/server.sh "${SLUG}-${VERSION}" "${MANIFEST_BASE_URL}/releases/${VERSION}/pack.toml"
65+
run: bash .github/scripts/server.sh "${SLUG}-${VERSION}" "${ARCHIVE_BASE_URL}/releases/${VERSION}/pack.toml"
6666

67-
- name: Deploy release manifest
67+
- name: Deploy release archive
6868
uses: peaceiris/actions-gh-pages@v4
6969
with:
70-
deploy_key: ${{ secrets.MANIFEST_DEPLOY_KEY }}
71-
external_repository: ${{ env.MANIFEST_REPO }}
72-
publish_branch: ${{ env.MANIFEST_BRANCH }}
73-
publish_dir: dist/manifest
74-
destination_dir: releases/${{ env.VERSION }}
70+
deploy_key: ${{ secrets.ARCHIVE_DEPLOY_KEY }}
71+
external_repository: ${{ env.ARCHIVE_REPO }}
72+
publish_branch: ${{ env.ARCHIVE_BRANCH }}
73+
publish_dir: archive
74+
destination_dir: archives/releases/${{ env.VERSION }}
7575
user_name: 'github-actions[bot]'
7676
user_email: 'github-actions[bot]@users.noreply.github.com'
7777
commit_message: "Release ${{ env.VERSION }}"
@@ -85,4 +85,4 @@ jobs:
8585
artifacts: |
8686
${{ steps.package.outputs.curseforge_zip }}
8787
${{ steps.package_server.outputs.server_zip }}
88-
generateReleaseNotes: true
88+
generateReleaseNotes: true

‎.packwizignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ NOTICE.md
1515
*.zip
1616
*.mrpack
1717
/dist/
18+
/archive/
1819

1920
# packwiz
2021
packwiz.exe

‎index.toml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2589,12 +2589,12 @@ metafile = true
25892589

25902590
[[files]]
25912591
file = "mods/better-chat.pw.toml"
2592-
hash = "c2142332f5f82ffb342efa5bcc05a2fecc423283f088f73e8537ce5e413a9136"
2592+
hash = "399839d6169e48b9e5f1bf11ea089e0b1b43e712779269317416519b95014726"
25932593
metafile = true
25942594

25952595
[[files]]
25962596
file = "mods/better-loading-screen.pw.toml"
2597-
hash = "3abd6a8dfce1bc884331585d55c6e73c40d6a04d46ad0b8c54c44a099173c42a"
2597+
hash = "fd185384164980248d7439d0c3b8efb8769036bfa773edea5ed9d0d17030ddb9"
25982598
metafile = true
25992599

26002600
[[files]]
@@ -2619,7 +2619,7 @@ metafile = true
26192619

26202620
[[files]]
26212621
file = "mods/blur.pw.toml"
2622-
hash = "b574d81bfb57d2d9013b7fc02cd0b5728a4cde7205430742003096ff261007cd"
2622+
hash = "29309912a644f1bf1ad434ae7b51bb111a33c5d119a7fb8f73309154ae93b6ee"
26232623
metafile = true
26242624

26252625
[[files]]
@@ -2634,7 +2634,7 @@ metafile = true
26342634

26352635
[[files]]
26362636
file = "mods/catalogue-vintage.pw.toml"
2637-
hash = "373dbcfdc4f1630ca415a7e3b9388eae5a4e6de53bf8c0614c90bd9d2f26d9af"
2637+
hash = "6a8d21cbfa0562382494a495c5c1dfab4b2c3ae7c8ea57e50e719916b840018c"
26382638
metafile = true
26392639

26402640
[[files]]
@@ -2669,7 +2669,7 @@ metafile = true
26692669

26702670
[[files]]
26712671
file = "mods/controlling.pw.toml"
2672-
hash = "ac423dbdf07ee4c91d05fdebfd3e0849ae9602925a39cac3dac0a35fd742c290"
2672+
hash = "252e337cc66d7a8f1d2ec3e51f72be6b4198ecf8781cda6a1cbf8c4cffd93f58"
26732673
metafile = true
26742674

26752675
[[files]]
@@ -2689,7 +2689,7 @@ metafile = true
26892689

26902690
[[files]]
26912691
file = "mods/ctm.pw.toml"
2692-
hash = "430820ab4fc97024a7c5c188555c57e6fa22f33fe3d5f98d2a75254a0bd07633"
2692+
hash = "1d529eda949507fa4491da34cda9c048aa146e7360323f45e50d8f2d4dca2f13"
26932693
metafile = true
26942694

26952695
[[files]]
@@ -2749,7 +2749,7 @@ metafile = true
27492749

27502750
[[files]]
27512751
file = "mods/gnetum.pw.toml"
2752-
hash = "8f137ee8120548601de516ef55eff0c4a499a924dd2cce53b3fb702634bb920c"
2752+
hash = "8b975d442a979a8a07b2438314ca98047e987c13bc4852f9bee119b545467aa8"
27532753
metafile = true
27542754

27552755
[[files]]
@@ -2767,7 +2767,7 @@ hash = "2cb94f15464958e9f153f870d0a4b28be2c9d47a0c38573b50cd8908ea6c6ed5"
27672767

27682768
[[files]]
27692769
file = "mods/had-enough-characters.pw.toml"
2770-
hash = "cb5c1d6083e3ac971680859584b6b70356f17c4c5e5df906cc5079b9c95d59ee"
2770+
hash = "f919492acb964eeed45b6089cfc3171d4a1c8580a734d5411f2534729613970e"
27712771
metafile = true
27722772

27732773
[[files]]
@@ -2787,7 +2787,7 @@ metafile = true
27872787

27882788
[[files]]
27892789
file = "mods/item-borders.pw.toml"
2790-
hash = "634fdd89d4acf2ee1702f8eed0e5c088691850297366a3762ce548a16a55799f"
2790+
hash = "5f20b9775326e6a42764c206d1aee287807acf7383becf2822aff87c82afdff1"
27912791
metafile = true
27922792

27932793
[[files]]
@@ -2797,7 +2797,7 @@ metafile = true
27972797

27982798
[[files]]
27992799
file = "mods/jei-utilities.pw.toml"
2800-
hash = "5c459f9826df3f680475288cec929226a73f06989275d29c6e53f78808fb979c"
2800+
hash = "cf29925261f34b4f695c93595345ea85f928b17fde7436949dd387201d83ba0b"
28012801
metafile = true
28022802

28032803
[[files]]
@@ -2812,12 +2812,12 @@ metafile = true
28122812

28132813
[[files]]
28142814
file = "mods/just-enough-characters.pw.toml"
2815-
hash = "2076abed696e5f140ea634e501482708204a68253b92b6a3fa8e39a796a7246b"
2815+
hash = "073783bfacb2c1b8062ae9bca20b49022689f89dcddf0437d7cf6b434d27acaa"
28162816
metafile = true
28172817

28182818
[[files]]
28192819
file = "mods/keyboard-wizard.pw.toml"
2820-
hash = "9f2991da95b34d0bfa5cc49840ea9cee54d021eeafe04d503d074429c42255d1"
2820+
hash = "a164a60516560f39f937dbbff5905483128b1def283c34062dbd510830e6d16e"
28212821
metafile = true
28222822

28232823
[[files]]
@@ -2837,7 +2837,7 @@ metafile = true
28372837

28382838
[[files]]
28392839
file = "mods/minieffects-legacy-extended-life.pw.toml"
2840-
hash = "61223d38ebe4fa770cc5c32dd8edd15649dbe7cd40968372ac183ce2c02af724"
2840+
hash = "942fb0648ea19d448a2258ffb00042b02b30d170021ff2bfb5a72151a2a2898e"
28412841
metafile = true
28422842

28432843
[[files]]
@@ -2847,7 +2847,7 @@ metafile = true
28472847

28482848
[[files]]
28492849
file = "mods/mod-name-tooltip.pw.toml"
2850-
hash = "33797f106d7f44073865b9c54e8f62c50162e9415bc66b4dd9305d947527f39e"
2850+
hash = "3734d70704626c28a955744664944226e5d31b397b54967a12e0013cedaf6762"
28512851
metafile = true
28522852

28532853
[[files]]
@@ -2857,7 +2857,7 @@ metafile = true
28572857

28582858
[[files]]
28592859
file = "mods/more-overlays.pw.toml"
2860-
hash = "99d1fe22e1ddc58a0a43f64a18a4e06298ef76c9f7608f57a7f0cee0d64fecaa"
2860+
hash = "d9dbc8ced8fcfe4c0b04e8e7c13cc65f53ce499539d495ae0dc04f0d9e870631"
28612861
metafile = true
28622862

28632863
[[files]]
@@ -2876,7 +2876,7 @@ hash = "39e6271853929d13a73e62dea72bb13392bf3c35734b37d518fc5d98bba3b233"
28762876

28772877
[[files]]
28782878
file = "mods/mouse-tweaks-unofficial.pw.toml"
2879-
hash = "97afad43aab051629f2e0dddcd0aa9909b94b616642a5c5cd0ab1754e8cf9c9e"
2879+
hash = "478e8dc41c1387d145dd42cf3f2cc681df78c94c9826ad1655906789d799a7bf"
28802880
metafile = true
28812881

28822882
[[files]]
@@ -2891,7 +2891,7 @@ metafile = true
28912891

28922892
[[files]]
28932893
file = "mods/neonium.pw.toml"
2894-
hash = "258f4b824039de32284d22c109153db219e6badee62363e18354f3b29e0ae466"
2894+
hash = "3ec598f42db8381f9df050de4ffc6d9214355ff80c95fa32ea970591e9d8671f"
28952895
metafile = true
28962896

28972897
[[files]]
@@ -2936,12 +2936,12 @@ metafile = true
29362936

29372937
[[files]]
29382938
file = "mods/scalingguis.pw.toml"
2939-
hash = "77409dab9f58a882b334ef38e3f98961b6c47eae12480c097d2478d30d57f87c"
2939+
hash = "5f855e5ef3ee4ee596a781763416a2859a20e360a680d24c79dddbd9300a32e7"
29402940
metafile = true
29412941

29422942
[[files]]
29432943
file = "mods/shut-up-model-loader.pw.toml"
2944-
hash = "0300d1dada7a218fe61e1b2816a8c3af13e04d685e07b2fa3aeae2073688c36b"
2944+
hash = "80b1091dc9c2932d4e8ad3786c5a290a36ef7f3cf02896e42a132bbb2c8fe9c9"
29452945
metafile = true
29462946

29472947
[[files]]
@@ -3006,7 +3006,7 @@ metafile = true
30063006

30073007
[[files]]
30083008
file = "mods/vintagedisplay.pw.toml"
3009-
hash = "9cbf670e334ecef266d0dfb9332b22f950739ba3e324364befeed02f975f1ab0"
3009+
hash = "80058938ea66e6e06c7c46263a7d052cd2972e2b948f440a422c664b0b8f2e33"
30103010
metafile = true
30113011

30123012
[[files]]

‎mods/better-chat.pw.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "Better Chat"
22
filename = "betterchat-1.4.jar"
3-
side = "both"
3+
side = "client"
44

55
[download]
66
hash-format = "sha1"

‎mods/better-loading-screen.pw.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "Custom Loading Screen"
22
filename = "CustomLoadingScreen-1.12.2-1.5.9.jar"
3-
side = "both"
3+
side = "client"
44

55
[download]
66
hash-format = "sha1"

‎mods/blur.pw.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "Blur"
22
filename = "Blur-1.0.4-14.jar"
3-
side = "both"
3+
side = "client"
44

55
[download]
66
hash-format = "sha1"

‎mods/catalogue-vintage.pw.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "Catalogue Vintage"
22
filename = "catalogue-1.0.1-1.12.2.jar"
3-
side = "both"
3+
side = "client"
44

55
[download]
66
hash-format = "sha1"

0 commit comments

Comments
 (0)