From 01d525ae87b28c6d4dc5e54a593de42a8bde523c Mon Sep 17 00:00:00 2001 From: Jade Date: Mon, 27 Nov 2023 20:39:21 -0600 Subject: [PATCH] Add fixes resource pack (+ CI) --- .editorconfig | 7 +++++++ .github/workflows/release.yml | 4 ++++ .gitignore | 3 +++ .packwizignore | 12 ++++++++++++ README.md | 6 +++--- config/yosbr/options.txt | 2 +- index.toml | 10 +++++++++- pack.toml | 2 +- .../assets/yigd/lang/en_us.json | 3 +++ resourcepacks/mission-to-mars-fixes/pack.mcmeta | 6 ++++++ resourcepacks/mission-to-mars-fixes/pack.png | Bin 0 -> 261 bytes scripts/export_resource_pack.sh | 5 +++++ 12 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 .editorconfig create mode 100644 resourcepacks/mission-to-mars-fixes/assets/yigd/lang/en_us.json create mode 100644 resourcepacks/mission-to-mars-fixes/pack.mcmeta create mode 100644 resourcepacks/mission-to-mars-fixes/pack.png create mode 100755 scripts/export_resource_pack.sh diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..ba7c1e7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +[*] +end_of_line = lf +charset = utf-8 + +[*.{json,mcmeta}] +indent_style = tab +indent_size = 4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 27773a4..618a361 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,5 +29,9 @@ jobs: tag: 0.2.0-223e662 - name: Checkout Repository Files uses: actions/checkout@v4 + - name: Export fixes resource pack + run: chmod +x ./scripts/export_resource_pack.sh && ./scripts/export_resource_pack.sh + - name: Clean up fixes resource pack + uses: rm -r ./resourcepacks/mission-to-mars-fixes - name: Create Release run: peony modpack -dv ${{ github.event.inputs.version }} diff --git a/.gitignore b/.gitignore index d782f25..2c6b55e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ # exclude Affinity Photo lock files **/*.afphoto~lock~ + +# ignore resource pack icon +**/icon.png diff --git a/.packwizignore b/.packwizignore index ca84242..e607145 100644 --- a/.packwizignore +++ b/.packwizignore @@ -15,3 +15,15 @@ project_files /.github .prettierrc mrpack.toml + +# exclude scripts +/scripts + +# exclude unzipped resource pack +/resourcepacks/mission-to-mars-fixes + +# allow resource packs in /resourcepacks +!/resourcepacks/**.zip + +# ignore resource pack icon +**/icon.png diff --git a/README.md b/README.md index 2b74885..afe113e 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ Mission to Mars icon @@ -14,4 +14,4 @@ and [Create](https://modrinth.com/mod/ad-astra), focused on getting to Mars and ## License -Mission to Mars is licensed under the [MIT License](/LICENSE) +Mission to Mars and [its assets](https://github.com/LilydevMC/assets/tree/main/MissionToMars) are licensed under the [MIT License](/LICENSE). diff --git a/config/yosbr/options.txt b/config/yosbr/options.txt index f4d34af..0b08f27 100644 --- a/config/yosbr/options.txt +++ b/config/yosbr/options.txt @@ -1,7 +1,7 @@ version:3465 quilt_available_resource_packs:["axolotlbuckets/axolotl-buckets-small","black_icons","classic_icons","continuity/default","continuity/glass_pane_culling_fix","create/legacy_copper","enchancement/alternate_dash","file/cubic-sun-moon-v1-6-1.zip","high_contrast","itemswapper/classic","itemswapper/default","lambdabettergrass/default","programmer_art","vanilla","white_icons"] -resourcePacks:["vanilla","itemswapper/default","lambdabettergrass/default","axolotlbuckets/axolotl-buckets-small","continuity/default","continuity/glass_pane_culling_fix","file/cubic-sun-moon-v1-6-1.zip"] +resourcePacks:["vanilla","itemswapper/default","lambdabettergrass/default","axolotlbuckets/axolotl-buckets-small","continuity/default","continuity/glass_pane_culling_fix","file/cubic-sun-moon-v1-7a.zip","file/mission-to-mars-fixes.zip"] enableVsync:false fullscreen:true diff --git a/index.toml b/index.toml index 3857449..06214f7 100644 --- a/index.toml +++ b/index.toml @@ -1,5 +1,9 @@ hash-format = "sha256" +[[files]] +file = ".editorconfig" +hash = "fa3a6169d0b4d64d6cb11e906d0c26c344d2167cded44768ccfe9ed4e9dde47d" + [[files]] file = "LICENSE" hash = "ad2c7b9c8586565885e1df2f484d7c9e1f99a734aaa432183856551900448474" @@ -38,7 +42,7 @@ hash = "a04078f51bde9c60ffc8b4c3c1f1828849ab473df58b40d0de825ff8371fd345" [[files]] file = "config/yosbr/options.txt" -hash = "ecdc91e802c3f648478660fba08111a8ec24205c81f6f47760ca2d8450d40a3f" +hash = "3ec674a51608aebddfb35ceb816fab5f0d80d98ca86d88c1a22e789069a1d80c" [[files]] file = "config/yosbr/shaderpacks/ComplementaryUnbound_r5.0.1.zip.txt" @@ -624,6 +628,10 @@ file = "resourcepacks/cubic-sun-moon.pw.toml" hash = "35119a0dd84806ea5baa5adcdf4c3e61351e6c8b21bae0055024fad3b439f4f6" metafile = true +[[files]] +file = "resourcepacks/mission-to-mars-fixes.zip" +hash = "ad517fb10c55bae7288558c8111c0d74b061350fdc813a59a6761e605d189ea8" + [[files]] file = "shaderpacks/complementary-unbound.pw.toml" hash = "5b488fd021ad1d6195dfdb63ca361be0d7a0941d0ffc6b31f31c53eccd623554" diff --git a/pack.toml b/pack.toml index 18bb910..4ec8c27 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "01d92cb4860e808f0e725b5c4e3f7125f2c50177ce1be3ad28d868c133c292df" +hash = "524a37f9356d67807dc6356c8388afa66228472f6ec349fcf975d8d5c909fd33" [versions] minecraft = "1.20.1" diff --git a/resourcepacks/mission-to-mars-fixes/assets/yigd/lang/en_us.json b/resourcepacks/mission-to-mars-fixes/assets/yigd/lang/en_us.json new file mode 100644 index 0000000..ae2a21b --- /dev/null +++ b/resourcepacks/mission-to-mars-fixes/assets/yigd/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "enchantment.yigd.soulbound": "Soulbound" +} diff --git a/resourcepacks/mission-to-mars-fixes/pack.mcmeta b/resourcepacks/mission-to-mars-fixes/pack.mcmeta new file mode 100644 index 0000000..1269d60 --- /dev/null +++ b/resourcepacks/mission-to-mars-fixes/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 15, + "description": "Fixes for the Mission to Mars modpack!" + } +} diff --git a/resourcepacks/mission-to-mars-fixes/pack.png b/resourcepacks/mission-to-mars-fixes/pack.png new file mode 100644 index 0000000000000000000000000000000000000000..7ccacc3a57898266ea55c6a3aace7e5f7cfdd920 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|iwXR#roMt7NA9XdJZm#L(<}NKQJwIXE8=%Umo-U3d6}R@Da};Ve;BgMz z-WUDypSYf1Ld>F%)AlnQtKxpMa6|1$(H)h0Pu+`QjASV(Ov~M~$$x9(_tk2QFBmQ5 zbrYDrH7NAHVcFcy@a{piThZ^6*((?>L^KI$IQ(LN-0|e6mVn_V=8(#6)@Lya$ENk> zFvgo6ux(A-Sj75SW}BP1K>DKL%BqLDe_~PncpaU5^UHx3v IIVCg!0Er4@k^lez literal 0 HcmV?d00001 diff --git a/scripts/export_resource_pack.sh b/scripts/export_resource_pack.sh new file mode 100755 index 0000000..66ad5f6 --- /dev/null +++ b/scripts/export_resource_pack.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +wget https://cdn.jsdelivr.net/gh/LilydevMC/assets/MissionToMars/assets/icon/small.png -O resourcepacks/mission-to-mars-fixes/pack.png +cd resourcepacks/mission-to-mars-fixes +zip -r ../mission-to-mars-fixes.zip ./