diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89baa23a6..af6b9f916 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,13 +14,13 @@ env: RELEASE_TYPE: "RELEASE" jobs: - modpack-info: - name: Modpack Info + info: + name: Project Info runs-on: ubuntu-latest outputs: - project_name: ${{ steps.info.outputs.project_name }} - project_version: ${{ steps.info.outputs.project_version }} - mc_version: ${{ steps.info.outputs.mc_version }} + project_name: ${{ steps.project_name.outputs.value }} + project_version: ${{ steps.project_version.outputs.value }} + mc_version: ${{ steps.mc_version.outputs.value }} changelog: ${{ steps.changelog.outputs.description }} steps: @@ -33,28 +33,26 @@ jobs: with: fallback: tag_not_found - - name: Modpack info - id: info - shell: bash - run: | - set +e + - name: Get project name + id: project_name + uses: ActionsTools/read-json-action@main + with: + file_path: ".github/buildtools/modpack/manifest.json" + prop_path: "name" - if [ ! -f ./.github/buildtools/modpack/manifest.json ]; then - echo "::error::Could not find manifest.json" && exit 1 - fi - manifestjson=`cat ./.github/buildtools/modpack/manifest.json` + - name: Get project name + id: project_version + uses: ActionsTools/read-json-action@main + with: + file_path: ".github/buildtools/modpack/manifest.json" + prop_path: "name" - project_name=`echo $(jq -r '.name' <<< "$manifestjson")` - echo "project_name=$project_name" >> $GITHUB_OUTPUT - - mc_version=`echo $(jq -r '.minecraft.version' <<< "$manifestjson")` - echo "mc_version=$mc_version" >> $GITHUB_OUTPUT - - if [[ ${{ startsWith(github.ref, 'refs/tags/') }} == true ]]; then - echo "project_version=${{ steps.version.outputs.tag }}" >> $GITHUB_OUTPUT - else - echo "project_version=build.${{ github.run_number }}" >> $GITHUB_OUTPUT - fi + - name: Get project name + id: mc_version + uses: ActionsTools/read-json-action@main + with: + file_path: ".github/buildtools/modpack/manifest.json" + prop_path: "minecraft.version" - name: Changelog Parser id: changelog @@ -65,15 +63,18 @@ jobs: build-cf-modpack: name: Build CF Modpack runs-on: ubuntu-latest - needs: [modpack-info] + needs: [info] steps: - name: Checkout uses: actions/checkout@v4.1.1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + submodules: true - name: Replace strings shell: bash run: | - VERSION=${{ needs.modpack-info.outputs.project_version }} + VERSION=${{ needs.info.outputs.project_version }} sed -i -e "s/DEV/${VERSION}/g" .github/buildtools/modpack/manifest.json sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt @@ -83,27 +84,30 @@ jobs: mv -vf {config,defaultconfigs,kubejs} overrides/ mv -vf .github/buildtools/modpack/manifest.json ./ mv -vf .github/buildtools/modpack/modlist.html ./ - zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides + zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides - name: Upload zip cf uses: actions/upload-artifact@v4.0.0 with: - name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf - path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip + name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-cf + path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-cf.zip retention-days: 5 build-mmc-modpack: name: Build MMC Modpack runs-on: ubuntu-latest - needs: [modpack-info] + needs: [info] steps: - name: Checkout uses: actions/checkout@v4.1.1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + submodules: true - name: Replace strings shell: bash run: | - VERSION=${{ needs.modpack-info.outputs.project_version }} + VERSION=${{ needs.info.outputs.project_version }} sed -i -e "s/DEV/${VERSION}/g" .github/buildtools/modpack/instance.cfg sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt @@ -111,9 +115,8 @@ jobs: run: | git submodule init cd mods - git config --global credential.helper '!f() { - echo "username=Xikaro"; - echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' + git config user.name github-actions + git config user.email github-actions@github.com git submodule update --recursive - name: Export MMC @@ -127,36 +130,38 @@ jobs: mv -vf .github/buildtools/modpack/manifest.json flame/ find .minecraft/mods -name "probejs-*" -delete; find .minecraft/mods -name ".git" -delete; - zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ + zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-mmc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/ - name: Upload zip mmc uses: actions/upload-artifact@v4.0.0 with: - name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc - path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip + name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-mmc + path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-mmc.zip retention-days: 5 build-serverpack: name: Build Serverpack runs-on: ubuntu-latest - needs: [modpack-info] + needs: [info] steps: - name: Checkout uses: actions/checkout@v4.1.1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + submodules: true - name: Download Mods run: | git submodule init cd mods - git config --global credential.helper '!f() { - echo "username=Xikaro"; - echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' + git config user.name github-actions + git config user.email github-actions@github.com git submodule update --recursive - name: Replace strings shell: bash run: | - VERSION=${{ needs.modpack-info.outputs.project_version }} + VERSION=${{ needs.info.outputs.project_version }} sed -i -e "s/DEV/${VERSION}/g" .github/buildtools/modpack/manifest.json sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt @@ -165,19 +170,18 @@ jobs: mkdir -p .minecraft mv -vf {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done - find .minecraft/mods -name "SimpleLogin-*" -delete; - zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip .minecraft/* + zip -r ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server.zip .minecraft/* - name: Upload zip uses: actions/upload-artifact@v4.0.0 with: - name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server - path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip + name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server + path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server.zip retention-days: 5 release-curseforge: name: Deploy to CurseForge - needs: [modpack-info, build-cf-modpack, build-serverpack] + needs: [info, build-cf-modpack, build-serverpack] runs-on: ubuntu-latest outputs: cf_release_id: ${{ steps.cf_release.outputs.id }} @@ -192,12 +196,12 @@ jobs: - name: Download cf modpack uses: actions/download-artifact@v4.1.0 with: - name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf + name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-cf - name: Download serverpack uses: actions/download-artifact@v4.1.0 with: - name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server + name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server - name: Upload Curseforge id: cf_release @@ -205,13 +209,13 @@ jobs: with: api-token: ${{ secrets.CF_API_TOKEN }} project-id: ${{ vars.CF_MODPACK_ID }} - modpack-path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip - modpack-server-path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip - changelog: ${{ needs.modpack-info.outputs.changelog }} + modpack-path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-cf.zip + modpack-server-path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server.zip + changelog: ${{ needs.info.outputs.changelog }} changelog-format: markdown - game-version: ${{ needs.modpack-info.outputs.mc_version }} - display-name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }} - server-display-name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server + game-version: ${{ needs.info.outputs.mc_version }} + display-name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }} + server-display-name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server release-type: ${{ env.RELEASE_TYPE }} # release-modrinth: @@ -241,18 +245,18 @@ jobs: # with: # api-token: ${{ secrets.MODRINTH_API_TOKEN }} # project-id: ${{ vars.MODRINTH_MODPACK_ID }} - # modpack-path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mrd.zip - # modpack-server-path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip - # changelog: ${{ needs.modpack-info.outputs.changelog }} + # modpack-path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-mrd.zip + # modpack-server-path: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server.zip + # changelog: ${{ needs.info.outputs.changelog }} # changelog-format: markdown - # game-version: ${{ needs.modpack-info.outputs.mc_version }} - # display-name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }} - # server-display-name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server + # game-version: ${{ needs.info.outputs.mc_version }} + # display-name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }} + # server-display-name: ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server # release-type: ${{ env.RELEASE_TYPE }} release-github: name: Deploy to GitHub - needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack] + needs: [info, build-cf-modpack, build-mmc-modpack, build-serverpack] runs-on: ubuntu-latest steps: - name: Download modpack @@ -265,19 +269,19 @@ jobs: with: prerelease: false generate_release_notes: true - name: ${{ needs.modpack-info.outputs.project_version }} - body: ${{ needs.modpack-info.outputs.changelog }} + name: ${{ needs.info.outputs.project_version }} + body: ${{ needs.info.outputs.changelog }} files: | - ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip - ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip - ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip - tag_name: ${{ needs.modpack-info.outputs.project_version }} + ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-cf.zip + ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-mmc.zip + ${{ needs.info.outputs.project_name }}-${{ needs.info.outputs.project_version }}-server.zip + tag_name: ${{ needs.info.outputs.project_version }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} discord-message: name: Discord Message - needs: [modpack-info, release-github, release-curseforge] + needs: [info, release-github, release-curseforge] runs-on: ubuntu-latest steps: - name: Send Discord message @@ -286,22 +290,22 @@ jobs: webhook-url: ${{secrets.RELEASES_1_20}} username: "TerraFirmaGreg" avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge.png" - embed-title: Release ${{ needs.modpack-info.outputs.project_version }} - embed-url: https://github.com/${{ github.repository }}/releases/tag/${{ needs.modpack-info.outputs.project_version }} + embed-title: Release ${{ needs.info.outputs.project_version }} + embed-url: https://github.com/${{ github.repository }}/releases/tag/${{ needs.info.outputs.project_version }} embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo.png embed-description: | **Release Type**: `${{ env.RELEASE_TYPE }}` - **GameVersion**: `${{ needs.modpack-info.outputs.mc_version }}` + **GameVersion**: `${{ needs.info.outputs.mc_version }}` **Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/${{ needs.release-curseforge.outputs.cf_release_id }}) ** Сhangelog ** - ```${{ needs.modpack-info.outputs.changelog }}``` + ```${{ needs.info.outputs.changelog }}``` ** [More details...](https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x/blob/main/CHANGELOG.md) ** embed-color: 5814783 # close-fixed-issues: # name: Close Fixed Issues - # needs: [modpack-info, release-github, release-curseforge] + # needs: [info, release-github, release-curseforge] # runs-on: ubuntu-latest # steps: # - name: Checkout @@ -311,7 +315,7 @@ jobs: # uses: juraj-hrivnak/close-issues-based-on-label@master # env: # LABEL: "2. Status: Fixed in Dev" - # VERSION: ${{ needs.modpack-info.outputs.project_version }} + # VERSION: ${{ needs.info.outputs.project_version }} # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml index 1498b0d12..e4c7c7752 100644 --- a/config/chiselsandbits-client.toml +++ b/config/chiselsandbits-client.toml @@ -103,7 +103,7 @@ [performance.model-building] #mod.scena.config.performance.model-building.thread-count.comment - #Range: 1 ~ 20 + #Range: 1 ~ 32 thread-count = 16 [gui] diff --git a/config/chiselsandbits-common.toml b/config/chiselsandbits-common.toml index 654e7ff07..108554acc 100644 --- a/config/chiselsandbits-common.toml +++ b/config/chiselsandbits-common.toml @@ -17,6 +17,6 @@ [performance.saving] #mod.scena.config.performance.saving.thread-count.comment - #Range: 1 ~ 20 + #Range: 1 ~ 32 thread-count = 16 diff --git a/config/craftpresence.json b/config/craftpresence.json index 18740029c..15bbf56e9 100644 --- a/config/craftpresence.json +++ b/config/craftpresence.json @@ -173,6 +173,7 @@ } }, "dynamicIcons": { + "Xikaro": "https://mc-heads.net/avatar/57b3dfb5f8a649e28b544e4ffc63256f", "default": "https://via.placeholder.com/256.png" }, "dynamicVariables": { diff --git a/config/embeddium-fingerprint.json b/config/embeddium-fingerprint.json index fac422287..618c3676b 100644 --- a/config/embeddium-fingerprint.json +++ b/config/embeddium-fingerprint.json @@ -1 +1 @@ -{"v":1,"s":"e80d4e33dc5622ca65a9e134e000742e22216bba8e238b7c0681557239868cf203d48cf2f3594d0743b08d49a21ae8a2f644edb92194ed2dc97f70924850c500","u":"b7bba198381eade42d5a491d6bb178dfb20dda94f4f5fc9ac18a09a52b95a7d74b8e6180bae8ebf92487dc3e3d169a63d665c1f1700e67744ebfd05a2bf3d03f","p":"745629df290fb686877f1ec62949dbd57f254c9b03000ee887f5190577f55bea274a9f270ae6573a325c61d9bc3762c12f91a00321a4762e3670767200c91197","t":1713784702} \ No newline at end of file +{"v":1,"s":"c0b34a5e7fe2306365598eb027e8815f373072d20ef2e26717874e8e30594b9bbd068eba006de61846d89591a025981c2b98df37cbacfacf4e13db9f73038778","u":"2dbcf038c3ef19d1f5a31ac3148b5afa2b60297c006096fe3e227ad4f46fc1fe455cab09ab37a47d1538232228964d418e9c638a2d950a7018139f111df590d0","p":"0c28fe5e1ff70726b8b0b8a606841056ca88e827c25f5a417a21fa3ee7d47a3f48fc7071f8a97b66842401effe31260e7380dcae3c6fe5f0decc3800ed1d3db5","t":1714472035} \ No newline at end of file diff --git a/config/embeddium-options.json b/config/embeddium-options.json index ff443abf5..8166d7c0e 100644 --- a/config/embeddium-options.json +++ b/config/embeddium-options.json @@ -23,7 +23,7 @@ }, "notifications": { "force_disable_donation_prompts": false, - "has_cleared_donation_button": true, - "has_seen_donation_prompt": true + "has_cleared_donation_button": false, + "has_seen_donation_prompt": false } } \ No newline at end of file