diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json index cfdbe50e1..65c6f23bc 100644 --- a/.github/buildtools/modpack/manifest.json +++ b/.github/buildtools/modpack/manifest.json @@ -15,264 +15,99 @@ "author": "Exception, Xikaro", "projectID": 385053, "files": [ - { - "projectID": 333287, - "fileID": 4833106, - "required": true - }, - { - "projectID": 257814, - "fileID": 4968955, - "required": true - }, - { - "projectID": 410295, - "fileID": 4583492, - "required": true - }, - { - "projectID": 404465, - "fileID": 4864329, - "required": true - }, - { - "projectID": 351441, - "fileID": 4613538, - "required": true - }, - { - "projectID": 272335, - "fileID": 4906607, - "required": true - }, - { - "projectID": 844019, - "fileID": 4893142, - "required": true - }, - { - "projectID": 60089, - "fileID": 4581240, - "required": true - }, - { - "projectID": 889915, - "fileID": 4932157, - "required": true - }, - { - "projectID": 354353, - "fileID": 4891706, - "required": true - }, - { - "projectID": 927874, - "fileID": 4968758, - "required": true - }, - { - "projectID": 289412, - "fileID": 4929479, - "required": true - }, - { - "projectID": 871755, - "fileID": 4979438, - "required": true - }, - { - "projectID": 422301, - "fileID": 4950566, - "required": true - }, - { - "projectID": 818089, - "fileID": 4872397, - "required": true - }, - { - "projectID": 551894, - "fileID": 4688940, - "required": true - }, - { - "projectID": 237307, - "fileID": 4600191, - "required": true - }, - { - "projectID": 459929, - "fileID": 4936437, - "required": true - }, - { - "projectID": 823106, - "fileID": 4906217, - "required": true - }, - { - "projectID": 401648, - "fileID": 4863626, - "required": true - }, - { - "projectID": 223794, - "fileID": 4857895, - "required": true - }, - { - "projectID": 256717, - "fileID": 4614555, - "required": true - }, - { - "projectID": 665658, - "fileID": 4982356, - "required": true - }, - { - "projectID": 634062, - "fileID": 4610474, - "required": true - }, - { - "projectID": 940350, - "fileID": 4922586, - "required": true - }, - { - "projectID": 251407, - "fileID": 4751740, - "required": true - }, - { - "projectID": 306770, - "fileID": 4966125, - "required": true - }, - { - "projectID": 450659, - "fileID": 4645815, - "required": true - }, - { - "projectID": 538149, - "fileID": 4620037, - "required": true - }, - { - "projectID": 316582, - "fileID": 4973430, - "required": true - }, - { - "projectID": 302973, - "fileID": 4976574, - "required": true - }, - { - "projectID": 260262, - "fileID": 4581167, - "required": true - }, - { - "projectID": 232131, - "fileID": 4635878, - "required": true - }, - { - "projectID": 583345, - "fileID": 4925840, - "required": true - }, - { - "projectID": 254284, - "fileID": 4887789, - "required": true - }, - { - "projectID": 704113, - "fileID": 4831434, - "required": true - }, { "projectID": 636608, "fileID": 4982660, "required": true }, - { - "projectID": 790626, - "fileID": 4980929, - "required": true - }, - { - "projectID": 299540, - "fileID": 4711441, - "required": true - }, { "projectID": 495476, "fileID": 4924184, "required": true }, { - "projectID": 714158, - "fileID": 4957376, + "projectID": 223794, + "fileID": 4997114, "required": true }, { - "projectID": 233019, - "fileID": 4578262, + "projectID": 410811, + "fileID": 4896152, "required": true }, { - "projectID": 314905, - "fileID": 4596742, + "projectID": 237307, + "fileID": 4600191, "required": true }, { - "projectID": 365281, - "fileID": 4612683, + "projectID": 943925, + "fileID": 4926070, "required": true }, { - "projectID": 324717, - "fileID": 4973483, + "projectID": 429371, + "fileID": 4884096, "required": true }, { - "projectID": 880532, - "fileID": 4895948, + "projectID": 908741, + "fileID": 4984832, "required": true }, { - "projectID": 387638, - "fileID": 4691333, + "projectID": 663477, + "fileID": 4826822, "required": true }, { - "projectID": 288885, - "fileID": 4711423, + "projectID": 283644, + "fileID": 4913663, "required": true }, { - "projectID": 308240, - "fileID": 4820041, + "projectID": 351441, + "fileID": 4613538, "required": true }, { - "projectID": 570073, - "fileID": 4973823, + "projectID": 890405, + "fileID": 5000343, "required": true }, { - "projectID": 618298, - "fileID": 4950546, + "projectID": 404468, + "fileID": 4623116, "required": true }, { - "projectID": 475117, - "fileID": 4711435, + "projectID": 309927, + "fileID": 4985525, + "required": true + }, + { + "projectID": 511770, + "fileID": 4606615, + "required": true + }, + { + "projectID": 844019, + "fileID": 4893142, + "required": true + }, + { + "projectID": 688231, + "fileID": 4836196, + "required": true + }, + { + "projectID": 581495, + "fileID": 4952626, + "required": true + }, + { + "projectID": 263420, + "fileID": 4933782, "required": true }, { @@ -286,13 +121,8 @@ "required": true }, { - "projectID": 410811, - "fileID": 4896152, - "required": true - }, - { - "projectID": 635042, - "fileID": 4894852, + "projectID": 927874, + "fileID": 4968758, "required": true }, { @@ -301,68 +131,33 @@ "required": true }, { - "projectID": 890405, - "fileID": 4968835, + "projectID": 302973, + "fileID": 4976574, "required": true }, { - "projectID": 633412, - "fileID": 4685319, + "projectID": 634062, + "fileID": 4610474, "required": true }, { - "projectID": 283644, - "fileID": 4913663, + "projectID": 255389, + "fileID": 4798205, "required": true }, { - "projectID": 495693, - "fileID": 4870168, + "projectID": 551894, + "fileID": 4688940, "required": true }, { - "projectID": 513402, - "fileID": 4984527, + "projectID": 570630, + "fileID": 4936333, "required": true }, { - "projectID": 326652, - "fileID": 4979375, - "required": true - }, - { - "projectID": 433760, - "fileID": 4573913, - "required": true - }, - { - "projectID": 292038, - "fileID": 4594106, - "required": true - }, - { - "projectID": 270441, - "fileID": 4578892, - "required": true - }, - { - "projectID": 662156, - "fileID": 4944918, - "required": true - }, - { - "projectID": 328085, - "fileID": 4835191, - "required": true - }, - { - "projectID": 663477, - "fileID": 4826822, - "required": true - }, - { - "projectID": 551736, - "fileID": 4731947, + "projectID": 233019, + "fileID": 4578262, "required": true }, { @@ -371,83 +166,23 @@ "required": true }, { - "projectID": 238086, - "fileID": 4948967, + "projectID": 662156, + "fileID": 4944918, "required": true }, { - "projectID": 943925, - "fileID": 4926070, + "projectID": 306770, + "fileID": 4966125, "required": true }, { - "projectID": 419699, - "fileID": 4663010, + "projectID": 818089, + "fileID": 4872397, "required": true }, { - "projectID": 531761, - "fileID": 4943500, - "required": true - }, - { - "projectID": 511770, - "fileID": 4606615, - "required": true - }, - { - "projectID": 881248, - "fileID": 4874233, - "required": true - }, - { - "projectID": 348521, - "fileID": 4973441, - "required": true - }, - { - "projectID": 309927, - "fileID": 4960408, - "required": true - }, - { - "projectID": 416294, - "fileID": 4944325, - "required": true - }, - { - "projectID": 263420, - "fileID": 4933782, - "required": true - }, - { - "projectID": 367706, - "fileID": 4776833, - "required": true - }, - { - "projectID": 908741, - "fileID": 4982727, - "required": true - }, - { - "projectID": 357540, - "fileID": 4699629, - "required": true - }, - { - "projectID": 688231, - "fileID": 4836196, - "required": true - }, - { - "projectID": 317780, - "fileID": 4929640, - "required": true - }, - { - "projectID": 435044, - "fileID": 4596768, + "projectID": 231095, + "fileID": 4787442, "required": true }, { @@ -456,23 +191,63 @@ "required": true }, { - "projectID": 297038, - "fileID": 4969628, + "projectID": 654373, + "fileID": 4873766, "required": true }, { - "projectID": 429235, - "fileID": 4810975, + "projectID": 922713, + "fileID": 4982165, "required": true }, { - "projectID": 521393, - "fileID": 4837449, + "projectID": 551736, + "fileID": 4731947, "required": true }, { - "projectID": 841001, - "fileID": 4945181, + "projectID": 314905, + "fileID": 4596742, + "required": true + }, + { + "projectID": 60089, + "fileID": 4581240, + "required": true + }, + { + "projectID": 326652, + "fileID": 4979375, + "required": true + }, + { + "projectID": 266890, + "fileID": 4994127, + "required": true + }, + { + "projectID": 251407, + "fileID": 4751740, + "required": true + }, + { + "projectID": 439890, + "fileID": 4929694, + "required": true + }, + { + "projectID": 435044, + "fileID": 4596768, + "required": true + }, + { + "projectID": 254284, + "fileID": 4887789, + "required": true + }, + { + "projectID": 410295, + "fileID": 4583492, "required": true }, { @@ -481,13 +256,188 @@ "required": true }, { - "projectID": 654373, - "fileID": 4873766, + "projectID": 288885, + "fileID": 4711423, "required": true }, { - "projectID": 404468, - "fileID": 4623116, + "projectID": 387638, + "fileID": 4691333, + "required": true + }, + { + "projectID": 495693, + "fileID": 4870168, + "required": true + }, + { + "projectID": 404465, + "fileID": 4864329, + "required": true + }, + { + "projectID": 272335, + "fileID": 4990314, + "required": true + }, + { + "projectID": 316582, + "fileID": 4973430, + "required": true + }, + { + "projectID": 282001, + "fileID": 5005529, + "required": true + }, + { + "projectID": 238086, + "fileID": 4948967, + "required": true + }, + { + "projectID": 308240, + "fileID": 4820041, + "required": true + }, + { + "projectID": 419699, + "fileID": 4663010, + "required": true + }, + { + "projectID": 433760, + "fileID": 5008760, + "required": true + }, + { + "projectID": 292038, + "fileID": 4594106, + "required": true + }, + { + "projectID": 674852, + "fileID": 4828026, + "required": true + }, + { + "projectID": 324717, + "fileID": 4986594, + "required": true + }, + { + "projectID": 401648, + "fileID": 4863626, + "required": true + }, + { + "projectID": 871755, + "fileID": 4999501, + "required": true + }, + { + "projectID": 880532, + "fileID": 4895948, + "required": true + }, + { + "projectID": 299540, + "fileID": 4711441, + "required": true + }, + { + "projectID": 940350, + "fileID": 4922586, + "required": true + }, + { + "projectID": 365281, + "fileID": 4612683, + "required": true + }, + { + "projectID": 841001, + "fileID": 4945181, + "required": true + }, + { + "projectID": 270441, + "fileID": 4578892, + "required": true + }, + { + "projectID": 422301, + "fileID": 4993659, + "required": true + }, + { + "projectID": 531761, + "fileID": 4943500, + "required": true + }, + { + "projectID": 889915, + "fileID": 4932157, + "required": true + }, + { + "projectID": 475117, + "fileID": 4711435, + "required": true + }, + { + "projectID": 790626, + "fileID": 4980929, + "required": true + }, + { + "projectID": 583345, + "fileID": 4925840, + "required": true + }, + { + "projectID": 232131, + "fileID": 4635878, + "required": true + }, + { + "projectID": 618298, + "fileID": 4993651, + "required": true + }, + { + "projectID": 916493, + "fileID": 4988266, + "required": true + }, + { + "projectID": 367706, + "fileID": 4776833, + "required": true + }, + { + "projectID": 348521, + "fileID": 4973441, + "required": true + }, + { + "projectID": 416294, + "fileID": 4944325, + "required": true + }, + { + "projectID": 260262, + "fileID": 4581167, + "required": true + }, + { + "projectID": 289412, + "fileID": 4929479, + "required": true + }, + { + "projectID": 521393, + "fileID": 4837449, "required": true }, { @@ -496,18 +446,88 @@ "required": true }, { - "projectID": 714059, - "fileID": 4683092, + "projectID": 328085, + "fileID": 4835191, "required": true }, { - "projectID": 916493, - "fileID": 4797195, + "projectID": 357540, + "fileID": 4699629, "required": true }, { - "projectID": 581495, - "fileID": 4952626, + "projectID": 354353, + "fileID": 4891706, + "required": true + }, + { + "projectID": 526854, + "fileID": 4631193, + "required": true + }, + { + "projectID": 317780, + "fileID": 4929640, + "required": true + }, + { + "projectID": 823106, + "fileID": 4906217, + "required": true + }, + { + "projectID": 256717, + "fileID": 4614555, + "required": true + }, + { + "projectID": 538149, + "fileID": 4620037, + "required": true + }, + { + "projectID": 714158, + "fileID": 4987747, + "required": true + }, + { + "projectID": 429235, + "fileID": 4810975, + "required": true + }, + { + "projectID": 665658, + "fileID": 4982356, + "required": true + }, + { + "projectID": 297038, + "fileID": 4969628, + "required": true + }, + { + "projectID": 257814, + "fileID": 5005088, + "required": true + }, + { + "projectID": 633412, + "fileID": 4685319, + "required": true + }, + { + "projectID": 459929, + "fileID": 4936437, + "required": true + }, + { + "projectID": 513402, + "fileID": 5009676, + "required": true + }, + { + "projectID": 333287, + "fileID": 4833106, "required": true } ], diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html index 6518ab7aa..96ad7cd01 100644 --- a/.github/buildtools/modpack/modlist.html +++ b/.github/buildtools/modpack/modlist.html @@ -1,101 +1,105 @@  diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..f1d0b98bc --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,187 @@ +name: Build +run-name: "Build #${{ github.run_number }}" + +on: + push: + tags: + - "*.*.*" + branches: + - main + +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + modpack-info: + name: Modpack Info + runs-on: ubuntu-latest + outputs: + project_name: ${{ steps.info.outputs.project_name }} + project_version: ${{ steps.info.outputs.project_version }} + mcversion: ${{ steps.info.outputs.mcversion }} + tag: ${{ steps.version.outputs.tag }} + changelog: ${{ steps.changelog.outputs.description }} + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Get tag + id: version + uses: "WyriHaximus/github-action-get-previous-tag@v1.3.0" + with: + fallback: tag_not_found + + - name: Modpack info + id: info + shell: bash + run: | + set +e + + 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` + + project_name=`echo $(jq -r '.name' <<< "$manifestjson")` + echo "project_name=$project_name" >> $GITHUB_OUTPUT + + mcversion=`echo $(jq -r '.minecraft.version' <<< "$manifestjson")` + echo "mcversion=$mcversion" >> $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: Changelog Parser + id: changelog + uses: coditory/changelog-parser@v1.0.2 + with: + path: CHANGELOG.md + + + build-cf-modpack: + name: Build CF Modpack + runs-on: ubuntu-latest + needs: [modpack-info] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-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/main_menu.txt + sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + + - name: Export CF + run: | + mkdir -p overrides + 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 + + - 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 + retention-days: 5 + + build-mmc-modpack: + name: Build MMC Modpack + runs-on: ubuntu-latest + needs: [modpack-info] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-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/main_menu.txt + sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + + - 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 submodule update --recursive + + - name: Export MMC + run: | + mkdir -p .minecraft + mv -vf {config,defaultconfigs,kubejs,mods} .minecraft/ + mv -vf .github/buildtools/modpack/mmc-pack.json ./ + mv -vf .github/buildtools/modpack/instance.cfg ./ + zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ + + - 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 + retention-days: 5 + + build-serverpack: + name: Build Serverpack + runs-on: ubuntu-latest + needs: [modpack-info] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-info.outputs.project_version }} + sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + + - 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 submodule update --recursive + + - name: Export serverpack + run: | + 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 + zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-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 + retention-days: 5 + + + release: + name: Release + needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack] + if: startsWith(github.ref, 'refs/tags/') + uses: ./.github/workflows/release.yml + with: + project_name: ${{ needs.modpack-info.outputs.project_name }} + project_version: ${{ needs.modpack-info.outputs.project_version }} + mcversion: ${{ needs.modpack-info.outputs.mcversion }} + tag: ${{ needs.modpack-info.outputs.tag }} + news: ${{ needs.modpack-info.outputs.news }} + changelog: ${{ needs.modpack-info.outputs.changelog }} + secrets: inherit + diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml deleted file mode 100644 index 2d080c173..000000000 --- a/.github/workflows/preview.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Deploy modpack preview - -on: - push: - tags: - - "Pre*" - -jobs: - Deploy: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - - name: Get the version - id: get_version - run: echo ::set-output name=version::${GITHUB_REF#refs/tags/Pre} - - - name: Set the version - run: | - DEV=${{ steps.get_version.outputs.version }} - sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/manifest.json - sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/instance.cfg - sed -i -e "s/DEV/${DEV}/g" config/fancymenu/customization/main_menu.txt - sed -i -e "s/DEV/${DEV}/g" config/bcc-common.toml - - - name: Changelog Parser - id: changelog - uses: coditory/changelog-parser@v1.0.2 - with: - path: CHANGELOG.md - - - name: Submodule init - run: | - git submodule init - cd mods - git config --global credential.helper '!f() { echo "username=Xikaro"; echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' - git submodule update --recursive - - - name: Archive CF - run: | - cp -r {config,defaultconfigs,kubejs,mods} overrides/ - zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip .github/buildtools/modpack/manifest.json .github/buildtools/modpack/modlist.html overrides - - - name: Archive MMC - run: | - mv -vf overrides/ .minecraft/ - zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip .github/buildtools/modpack/mmc-pack.json .github/buildtools/modpack/instance.cfg .minecraft/ - - - name: Archive Server - run: | - cp -r .github/buildtools/serverpack/* .minecraft/ - cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done - cd .minecraft/ - zip -r ../TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip ./ - - - name: Create GitHub Release - uses: softprops/action-gh-release@v0.1.15 - if: startsWith(github.ref, 'refs/tags/') - with: - prerelease: true - generate_release_notes: true - name: ${{ steps.changelog.outputs.version }} - body: ${{ steps.changelog.outputs.description }} - files: | - ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip - ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-mmc.zip - ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69da08c50..1f2439585 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,116 +2,154 @@ name: Release run-name: "Release #${{ github.run_number }}" on: - push: - tags: - - "*.*.*" + workflow_call: + inputs: + project_name: + required: true + type: string + project_version: + required: true + type: string + mcversion: + required: true + type: string + tag: + required: true + type: string + news: + required: true + type: string + changelog: + required: true + type: string + +env: + CF_PROJECT_ID: "385053" + MODRINTH_PROJECT_ID: "75JuuMzk" + RELEASE_TYPE: "beta" jobs: - Deploy: + release-curseforge: + name: Deploy to CurseForge runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4.1.1 + - name: Check if CF_API_TOKEN exist + shell: bash + run: | + if [ "${{ secrets.CF_API_TOKEN }}" == '' ]; then + echo '::error::No value found for secret key `CF_API_TOKEN`. See https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 + fi - - name: Get the version - id: get_version - run: echo ::set-output name=version::${GITHUB_REF#refs/tags/} - - - name: Get tag - id: get_tag - uses: "WyriHaximus/github-action-get-previous-tag@v1.3.0" + - name: Download cf modpack + uses: actions/download-artifact@v4.1.0 with: - fallback: tag_not_found + name: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf - - name: Set the version - run: | - DEV=${{ steps.get_version.outputs.version }} - sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/manifest.json - sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/instance.cfg - sed -i -e "s/DEV/${DEV}/g" config/fancymenu/customization/main_menu.txt - sed -i -e "s/DEV/${DEV}/g" config/bcc-common.toml - - - name: Changelog Parser - id: changelog - uses: coditory/changelog-parser@v1.0.2 + - name: Download serverpack + uses: actions/download-artifact@v4.1.0 with: - path: CHANGELOG.md - - - name: Submodule init - run: | - git submodule init - cd mods - git config --local ${{ secrets.GITHUB_TOKEN }} - git submodule update --recursive - - - name: Archive CF - run: | - mkdir -p overrides - cp -r {config,defaultconfigs,kubejs} overrides/ - mv -vf .github/buildtools/modpack/manifest.json ./ - mv -vf .github/buildtools/modpack/modlist.html ./ - zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip manifest.json modlist.html overrides - - - name: Archive MMC - run: | - cp -r mods overrides/ - mv -vf overrides/ .minecraft/ - mv -vf .github/buildtools/modpack/mmc-pack.json ./ - mv -vf .github/buildtools/modpack/instance.cfg ./ - zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ - - - name: Archive Server - run: | - cp -r .github/buildtools/serverpack/* .minecraft/ - cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done - cd .minecraft/ - zip -r ../TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip ./ + name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server - name: Upload Curseforge id: cf_release uses: SwitchAlpha/upload-curseforge-modpack-action@master with: api-token: ${{ secrets.CF_API_TOKEN }} - project-id: "385053" - modpack-path: ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip - modpack-server-path: ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip - changelog: "${{ steps.changelog.outputs.description }}" + project-id: ${{ env.CF_PROJECT_ID }} + modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + changelog: ${{ inputs.changelog }} changelog-format: markdown - game-version: "1.20.1" - display-name: TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }} - server-display-name: TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server - release-type: "beta" + game-version: ${{ inputs.mcversion }} + display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} + server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + release-type: ${{ env.RELEASE_TYPE }} - - name: Create GitHub Release - uses: softprops/action-gh-release@v0.1.15 - if: startsWith(github.ref, 'refs/tags/') + - name: Send Discord message + uses: tsickert/discord-webhook@v5.4.0 + with: + webhook-url: ${{secrets.RELEASES_1_20}} + username: "TerraFirmaGreg" + avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" + embed-title: Release ${{ inputs.project_version }} + embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/${{ inputs.tag }} + embed-description: ${{ inputs.changelog }} + embed-color: 5814783 + + release-github: + name: Deploy to GitHub + runs-on: ubuntu-latest + steps: + - name: Download modpack + uses: actions/download-artifact@v4.1.0 + with: + merge-multiple: true + + - name: Create release + uses: softprops/action-gh-release@v1 with: prerelease: false generate_release_notes: true - name: ${{ steps.changelog.outputs.version }} - body: ${{ steps.changelog.outputs.description }} + name: ${{ inputs.project_version }} + body: ${{ inputs.changelog }} files: | - ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip - ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip - ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + tag_name: ${{ inputs.tag }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Discord notification - uses: tsickert/discord-webhook@v5.4.0 - with: - webhook-url: ${{ secrets.RELEASES_1_20 }} - username: "GitHub" - avatar-url: https://github.com/TerraFirmaGreg-Team/.github/tree/main/branding/logo_new_year.png?raw=true - content: "[CurseForge]()" - embed-title: Release ${{ steps.changelog.outputs.version }} - embed-description: "${{ steps.changelog.outputs.description }}" - embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/tree/main/CHANGELOG.md - embed-color: 5814783 - embed-footer-text: ${{ steps.changelog.outputs.date }} + # release-modrinth: + # name: Deploy to Modrinth + # runs-on: ubuntu-latest + # steps: + # - name: Check if MODRINTH_API_TOKEN exist + # shell: bash + # run: | + # if [ "${{ secrets.MODRINTH_API_TOKEN }}" == '' ]; then + # echo '::error::No value found for secret key `MODRINTH_API_TOKEN`. See https://docs.github.com/en/actionssecurity-guides/ encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 + # fi - - name: Close Fixed in dev + # - name: Download modpack + # uses: actions/download-artifact@v4.1.0 + # with: + # name: modpack_mrd + + # - name: Download serverpack + # uses: actions/download-artifact@v4.1.0 + # with: + # name: server_pack + + # - name: Upload Modrinth + # id: cf_release + # uses: SwitchAlpha/upload-curseforge-modpack-action@master + # with: + # api-token: ${{ secrets.MODRINTH_API_TOKEN }} + # project-id: ${{ env.MODRINTH_PROJECT_ID }} + # modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-mrd.zip + # modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + # changelog: "${{ inputs.changelog }}" + # changelog-format: markdown + # game-version: ${{ inputs.mcversion }} + # display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} + # server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + # release-type: ${{ env.RELEASE_TYPE }} + + close-fixed-issues: + name: Close Fixed Issues + runs-on: ubuntu-latest + needs: [release-github, release-curseforge] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: close-fixed-in-dev uses: juraj-hrivnak/close-issues-based-on-label@master env: LABEL: "2. status: fixed in dev" - VERSION: ${{ steps.get_tag.outputs.tag }} + VERSION: ${{ inputs.tag }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + diff --git a/.gitignore b/.gitignore index 43a31fe38..ced8fa48b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ config/oculus.properties config/smoothboot.json config/fml.toml config/forge-client.toml +config/chiselsandbits-client.toml +config/chiselsandbits-common.toml # .minecraft crash-reports/* diff --git a/CHANGELOG.md b/CHANGELOG.md index b8214fba9..b1f042741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Changelog -## [0.4.0] - 03.01.2024 +## [0.4.1] - 05.01.2024 +### Изменения +- Исправлена кнопка подключения к официальному серверу. +- Исправлен рецепт молда для лопаты. +### Обновленные моды +- TerraFirmaGreg-Core -> 0.2.5 +- notenoughanimations -> 1.7.0 + +## [0.4.0] - 05.01.2024 ### Изменения - Удалены из игры бронзовые паровые машины, тк позволяли скипнуть очень много прогресии TFC. - Добавлено очень много квестов для Примитивной эры (пока что без описаний). @@ -29,6 +37,36 @@ - И еще множество всего, чего я забыл. ### Удаленные моды - TFShips +- smallships +- ad_astra +- botarium +- resourcefulconfig +- resourcefullib +### Новые моды +- AdditionalPlacements +- EnhancedVisuals +- PlayerRevive +- cc-tweaked +- chisels-and-bits +- createaddition +- gcyr +- kubejs-create +- lootjs +- starlight +### Обновленные моды +- CreativeCore -> 2.11.18 +- Cucumber -> 7.0.7 +- FirmaCivilization -> 0.1.10 +- Jade -> 11.7.1 +- TerraFirmaGreg-Core -> 0.2.4 +- appliedenergistics2 -> 15.0.18 +- astikorcarts-redux -> 1.1.7 +- curios -> 5.4.7 +- embeddium -> 0.2.16 +- exposure -> 1.2.2 +- gtceu -> 1.0.19.b +- sophisticatedbackpacks -> 3.19.5.988 +- sophisticatedcore -> 0.5.113.524 ## [0.3.0] - 26.12.2023 ### Изменения diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml deleted file mode 100644 index ae44140a4..000000000 --- a/config/chiselsandbits-client.toml +++ /dev/null @@ -1,114 +0,0 @@ - -[settings] - #mod.scena.config.settings.invert-pick-block-behaviour.comment - invert-pick-block-behaviour = false - - [settings.bit-bag] - #mod.scena.config.settings.bit-bag.invert-durability-bar-indication.comment - invert-durability-bar-indication = false - - [settings.placement] - - [settings.placement.render-mode] - #mod.scena.config.settings.placement.render-mode.success.comment - #Allowed Values: GHOST_BLOCK_MODEL, GHOST_BLOCK_MODEL_SOLID_COLOR, WIREFRAME - success = "GHOST_BLOCK_MODEL" - #mod.scena.config.settings.placement.render-mode.failed.comment - #Allowed Values: GHOST_BLOCK_MODEL, GHOST_BLOCK_MODEL_SOLID_COLOR, WIREFRAME - failed = "GHOST_BLOCK_MODEL_SOLID_COLOR" - - [settings.placement.color] - #mod.scena.config.settings.placement.color.success.comment - success = [0.1882352977991104, 0.47058823704719543, 0.7882353067398071, 0.7058823704719543] - #mod.scena.config.settings.placement.color.not-fitting.comment - not-fitting = [0.7176470756530762, 0.2549019753932953, 0.054901961237192154, 0.7058823704719543] - #mod.scena.config.settings.placement.color.missing-bits-or-space.comment - missing-bits-or-space = [1.0, 0.8588235378265381, 0.3450980484485626, 0.7058823704719543] - - [settings.chiseling-previews] - #mod.scena.config.settings.chiseling-previews.renderer.comment - renderer = "chiselsandbits:default" - - [settings.chiseling-previews.default] - - [settings.chiseling-previews.default.colors] - #mod.scena.config.settings.chiseling-previews.default.colors.chiseling.comment - chiseling = [0.8500000238418579, 0.0, 0.0, 0.6499999761581421] - #mod.scena.config.settings.chiseling-previews.default.colors.placement.comment - placement = [0.0, 0.8500000238418579, 0.0, 0.6499999761581421] - - [settings.chiseling-previews.debug] - #mod.scena.config.settings.chiseling-previews.debug.enabled.comment - enabled = false - - [settings.chiseling-previews.debug.mutator] - - [settings.chiseling-previews.debug.mutator.colors] - #mod.scena.config.settings.chiseling-previews.debug.mutator.colors.chiseling.comment - chiseling = [0.0, 0.0, 0.8500000238418579, 0.6499999761581421] - #mod.scena.config.settings.chiseling-previews.debug.mutator.colors.placement.comment - placement = [0.8500000238418579, 0.8500000238418579, 0.0, 0.6499999761581421] - - [settings.selected-tool-mode-icons] - #mod.scena.config.settings.selected-tool-mode-icons.renderer.comment - renderer = "chiselsandbits:group" - - [settings.clipboard] - #mod.scena.config.settings.clipboard.size.comment - #Range: 0 ~ 64 - size = 64 - #mod.scena.config.settings.clipboard.add-broken-blocks.comment - add-broken-blocks = true - #mod.scena.config.settings.clipboard.add-picked-blocks.comment - add-picked-blocks = true - - [settings.patterns] - #mod.scena.config.settings.patterns.export-path.comment - export-path = "./chiselsandbits/patterns" - - [settings.warnings] - #mod.scena.config.settings.warnings.show-cool-down-error.comment - show-cool-down-error = false - - [settings.interactions] - #mod.scena.config.settings.interactions.scrolling-changes-mode.comment - scrolling-changes-mode = true - -[performance] - - [performance.caches] - - [performance.caches.sizes] - #mod.scena.config.performance.caches.sizes.bit-storage-content-models.comment - #Range: 0 ~ 9223372036854775807 - bit-storage-content-models = 100 - #mod.scena.config.performance.caches.sizes.block-models.comment - #Range: 3500 ~ 20000 - block-models = 3500 - #mod.scena.config.performance.caches.sizes.block-faces.comment - #Range: 350000 ~ 2000000 - block-faces = 1000000 - #mod.scena.config.performance.caches.sizes.cull-testing.comment - #Range: 3500 ~ 200000 - cull-testing = 3500 - #mod.scena.config.performance.caches.sizes.stack-models.comment - #Range: 0 ~ 9223372036854775807 - stack-models = 100 - - [performance.lighting] - #mod.scena.config.performance.lighting.extract-lighting-values-from-faces.comment - extract-lighting-values-from-faces = true - #mod.scena.config.performance.lighting.extract-lighting-values-from-blockstates.comment - extract-lighting-values-from-blockstates = false - - [performance.model-building] - #mod.scena.config.performance.model-building.thread-count.comment - #Range: 1 ~ 32 - thread-count = 10 - -[gui] - - [gui.radial-menu] - #mod.scena.config.gui.radial-menu.display-mouse-indicator.comment - display-mouse-indicator = false - diff --git a/config/chiselsandbits-common.toml b/config/chiselsandbits-common.toml deleted file mode 100644 index d611b473f..000000000 --- a/config/chiselsandbits-common.toml +++ /dev/null @@ -1,22 +0,0 @@ - -[help] - #mod.scena.config.help.enabled-in-tooltips.comment - enabled-in-tooltips = true - -[performance] - - [performance.caches] - - [performance.caches.sizes] - #mod.scena.config.performance.caches.sizes.collision-boxes.comment - #Range: 0 ~ 9223372036854775807 - collision-boxes = 10000 - #mod.scena.config.performance.caches.sizes.class-metadata.comment - #Range: 0 ~ 9223372036854775807 - class-metadata = 10000 - - [performance.saving] - #mod.scena.config.performance.saving.thread-count.comment - #Range: 1 ~ 32 - thread-count = 10 - diff --git a/config/embeddium++.toml b/config/embeddium++.toml new file mode 100644 index 000000000..ea1c2eb27 --- /dev/null +++ b/config/embeddium++.toml @@ -0,0 +1,80 @@ + +[EmbeddiumPlus] + + [EmbeddiumPlus.DynamicLights] + OnlyUpdateOnPositionChange = true + DynamicEntityLighting = true + #Allowed Values: OFF, SLOW, FAST, FASTEST, REALTIME + QualityMode = "REALTIME" + DynamicTileEntityLighting = true + + #You can configure FPS overlay at the corner + [EmbeddiumPlus.fps_overlay] + #Allowed Values: OFF, SIMPLE, ADVANCED + DisplayMode = "ADVANCED" + OverlayMargin = 12 + + #Configure max BlockEntity distance + [EmbeddiumPlus.block_entity_distance] + #Max horizontal render distance + #Value is squared, default was 64^2 (or 64x64) + maxHorizontalDistance = 4096 + #Max vertical render distance + #Value is raw + maxVerticalDistance = 32 + + [EmbeddiumPlus.Misc] + RenderFog = true + HideJEI = false + CloudHeight = 128 + #Allowed Values: OFF, FAST, FANCY + ChunkFadeInQuality = "FANCY" + #Allowed Values: WINDOWED, BORDERLESS, FULLSCREEN + BorderlessFullscreen = "FULLSCREEN" + ExtendedServerViewDistance = true + + #Configure max Entity distance + [EmbeddiumPlus.entity_distance_limit] + #Max horizontal render distance + #Value is squared, default was 64^2 (or 64x64) + maxHorizontalDistance = 4096 + #Turn on this feature + Enable = true + #List of entities to not be ignored when are out of configured radius. + #Accepts ResourceLocation and Mod IDs + #Example: "minecraft:bat" for specific entity or "alexmobs:*" for all mod specific entities + entityWhitelist = [] + #Max vertical render distance + #Value is raw + maxVerticalDistance = 32 + + #Configure TrueDarkness feature + #Section deprecated and removed soon (in favor of rework) + [EmbeddiumPlus.true_darkness] + #Sets darkness mode + #Depending of the option darkness can be less or more aggressive + #Allowed Values: PITCH_BLACK, REALLY_DARK, DARK, DIM + DarknessMode = "REALLY_DARK" + #Turn on this feature + Enable = true + + [EmbeddiumPlus.true_darkness.Advanced] + IgnoreMoonPhase = false + BlockLightingOnly = false + #Range: 0.0 ~ 1.0 + MaximumMoonBrightness = 0.25 + #Range: 0.0 ~ 1.0 + MinimumMoonBrightness = 0.0 + + #Configure what dimension should use TrueDarkness + [EmbeddiumPlus.true_darkness.DimensionSettings] + DefaultSetting = false + #Range: 0.0 ~ 1.0 + DarkNetherFogBrightness = 0.5 + DarkWhenNoSkylight = false + Nether = false + Overworld = true + #Range: 0.0 ~ 1.0 + DarkEndFogBrightness = 0.0 + "Dark End?" = false + diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt index bfd282f56..954799c42 100644 --- a/config/fancymenu/customization/main_menu.txt +++ b/config/fancymenu/customization/main_menu.txt @@ -233,7 +233,7 @@ customization { customization { orientation = mid-centered restartbackgroundanimations = true - buttonaction = joinserver;tfg2.tfg.su%btnaction_splitter_fm% + buttonaction = joinserver;tfg2.terrafirmagreg.su%btnaction_splitter_fm% backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png label = Offical Server loopbackgroundanimations = true diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index db48d9a24..e9522eb84 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -157,10 +157,6 @@ "create:exact_block": null, "create:filter": null, "create:goggles": null, - "gtceu:electric_container_provider": null, - "gtceu:workable_provider": null, - "gtceu:controllable_provider": null, - "gtceu:recipe_logic_provider": null, "tfc:barrel": null, "tfc:bellows": null, "tfc:sapling": null, @@ -210,6 +206,10 @@ "tfc:ocelot": null, "tfc:rabbit": null, "tfc:fishing_hook": null, + "gtceu:electric_container_provider": null, + "gtceu:workable_provider": null, + "gtceu:controllable_provider": null, + "gtceu:recipe_logic_provider": null, "minecraft:brewing_stand": null, "minecraft:beehive": null, "minecraft:command_block": null, diff --git a/config/smallships-client.toml b/config/smallships-client.toml deleted file mode 100644 index 5ace4a541..000000000 --- a/config/smallships-client.toml +++ /dev/null @@ -1,28 +0,0 @@ -# This holds the schematic version for internal purposes. DO NOT TOUCH! -schematicVersion = 1 - -# This category holds configs that define ship behaviour. -[Ship] - - #This category holds configs that define general ship behaviour. - [Ship.General] - - #General camera settings for ships. - [Ship.General.Camera] - #Automatically enable third person camera when entering a ship. - shipGeneralCameraAutoThirdPerson = true - - #Zoom camera settings for third person view in ships. - [Ship.General.Camera.Zoom] - #Generally enable the zooming feature. - shipGeneralCameraZoomEnable = true - #Set maximum distance of zoom (value must be smaller than or equal to 50.0). - shipGeneralCameraZoomMax = 20.0 - #Set minimum distance of zoom (value must be bigger than or equal to 1.0). - shipGeneralCameraZoomMin = 5.0 - -# This category holds configs that define general mod settings. -[General] - #Enable smallships creative tab in the creative inventory (only takes effect after restart). - smallshipsItemGroupEnable = false - diff --git a/config/smallships-common.toml b/config/smallships-common.toml deleted file mode 100644 index 5be303c46..000000000 --- a/config/smallships-common.toml +++ /dev/null @@ -1,88 +0,0 @@ -# This holds the schematic version for internal purposes. DO NOT TOUCH! -schematicVersion = 2 - -# This category holds configs that define ship behaviour. -[Ship] - - #This category holds configs that define general ship behaviour. - [Ship.General] - shipGeneralSailCooldown = 30 - shipGeneralCollisionDamage = 7.5 - shipGeneralDoItemDrop = true - - #General speed modifier for ships. - [Ship.General.Modifier] - #Maximum speed penalty for a filled container in percent. - shipGeneralContainerModifier = 10.0 - #Speed bonus for a paddle ship while paddling in percent. - shipGeneralPaddlingModifier = 35.0 - - #This category holds configs that define behaviour of fleeing water animals. - [Ship.General."Fleeing Water Animals"] - waterAnimalFleeRadius = 15.0 - waterAnimalFleeSpeed = 1.5 - waterAnimalFleeDistance = 10.0 - - [Ship.Cog] - - #Default attributes for the Cog. Speed in km/h, Health in default mc health points - [Ship.Cog.Attributes] - shipAttributeCogMaxHealth = 300.0 - shipAttributeCogMaxSpeed = 30.0 - shipAttributeCogMaxReverseSpeed = 0.1 - shipAttributeCogMaxRotationSpeed = 4.5 - shipAttributeCogAcceleration = 0.015 - shipAttributeCogRotationAcceleration = 0.7 - - #Default configs for the container of the Cog. - [Ship.Cog.Container] - #Set container size for the Cog (value must be divisible by 9 and bigger than 0). - shipContainerCogContainerSize = 108 - - #Cog specific speed modifier. - [Ship.Cog.Modifier] - #-1 = none, 0 = cold, 1 = neutral or 2 = warm Biomes - shipModifierCogBiome = 0 - - [Ship.Brigg] - - #Default attributes for the Brigg. Speed in km/h, Health in default mc health points - [Ship.Brigg.Attributes] - shipAttributeBriggMaxHealth = 450.0 - shipAttributeBriggMaxSpeed = 35.0 - shipAttributeBriggMaxReverseSpeed = 0.1 - shipAttributeBriggMaxRotationSpeed = 4.0 - shipAttributeBriggAcceleration = 0.015 - shipAttributeBriggRotationAcceleration = 0.55 - - #Default configs for the container of the Brigg. - [Ship.Brigg.Container] - #Set container size for the Brigg (value must be divisible by 9 and bigger than 0). - shipContainerBriggContainerSize = 162 - - #Brigg specific speed modifier. - [Ship.Brigg.Modifier] - #-1 = none, 0 = cold, 1 = neutral or 2 = warm Biomes - shipModifierBriggBiome = 0 - - [Ship.Galley] - - #Default attributes for the Galley. Speed in km/h, Health in default mc health points - [Ship.Galley.Attributes] - shipAttributeGalleyMaxHealth = 200.0 - shipAttributeGalleyMaxSpeed = 30.0 - shipAttributeGalleyMaxReverseSpeed = 0.1 - shipAttributeGalleyMaxRotationSpeed = 5.0 - shipAttributeGalleyAcceleration = 0.015 - shipAttributeGalleyRotationAcceleration = 1.0 - - #Default configs for the container of the Galley. - [Ship.Galley.Container] - #Set container size for the Galley (value must be divisible by 9 and bigger than 0). - shipContainerGalleyContainerSize = 54 - - #Galley specific speed modifier. - [Ship.Galley.Modifier] - #-1 = none, 0 = cold, 1 = neutral or 2 = warm Biomes - shipModifierGalleyBiome = 2 - diff --git a/config/sodium-extra-options.json b/config/sodium-extra-options.json index dedf2dcee..b6934868f 100644 --- a/config/sodium-extra-options.json +++ b/config/sodium-extra-options.json @@ -49,15 +49,15 @@ "use_adaptive_sync": false, "cloud_height": 192, "cloud_distance": 100, - "toasts": true, - "advancement_toast": true, - "recipe_toast": true, - "system_toast": true, - "tutorial_toast": true, + "toasts": false, + "advancement_toast": false, + "recipe_toast": false, + "system_toast": false, + "tutorial_toast": false, "instant_sneak": false, "prevent_shaders": false, "steady_debug_hud": true, - "steady_debug_hud_refresh_interval": 1 + "steady_debug_hud_refresh_interval": 10 }, "super_secret_settings": { "fetch_sodium_extra_crowdin_translations": false, diff --git a/mods b/mods index d4cc1ce51..9584cf55a 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit d4cc1ce510c68572d2690c1abe36c3ff4e880f55 +Subproject commit 9584cf55a8871c54b9cff14a8fde0fd11a817ac1