From a9d277874c4e18bd2de03d2f96f833cd079f2140 Mon Sep 17 00:00:00 2001 From: Hendrix-Shen Date: Thu, 12 Dec 2024 11:14:26 +0800 Subject: [PATCH] Rewrite CI logic Signed-off-by: Hendrix-Shen --- .github/workflows/CI.yml | 162 ++---------- .github/workflows/build.yml | 62 ++--- .github/workflows/generate_matrix.yml | 15 +- .github/workflows/prepare_action_info.yml | 134 ++++++++++ .github/workflows/publish.yml | 244 +++++++----------- .github/workflows/scripts/common.py | 58 +++-- .../scripts/determining_subproject.py | 33 --- .github/workflows/scripts/matrix.py | 27 +- .github/workflows/scripts/publish_info.py | 67 +++++ .github/workflows/scripts/summary.py | 81 +++--- .../workflows/scripts/validate_subproject.py | 26 -- build.gradle | 4 +- .../versions/1.14.4-fabric/gradle.properties | 1 + .../versions/1.15.2-fabric/gradle.properties | 1 + .../versions/1.16.5-fabric/gradle.properties | 1 + .../versions/1.17.1-fabric/gradle.properties | 1 + .../versions/1.17.1-forge/gradle.properties | 1 + .../versions/1.18.2-fabric/gradle.properties | 1 + .../versions/1.18.2-forge/gradle.properties | 1 + .../versions/1.19.2-fabric/gradle.properties | 1 + .../versions/1.19.3-fabric/gradle.properties | 1 + .../versions/1.19.4-fabric/gradle.properties | 1 + .../versions/1.19.4-forge/gradle.properties | 1 + .../versions/1.20.1-fabric/gradle.properties | 1 + .../versions/1.20.2-fabric/gradle.properties | 1 + .../1.20.2-neoforge/gradle.properties | 3 +- .../versions/1.20.4-fabric/gradle.properties | 3 +- .../versions/1.20.6-fabric/gradle.properties | 3 +- .../1.20.6-neoforge/gradle.properties | 3 +- .../versions/1.21.1-fabric/gradle.properties | 3 +- .../1.21.1-neoforge/gradle.properties | 1 + .../versions/1.21.3-fabric/gradle.properties | 3 +- .../1.21.3-neoforge/gradle.properties | 1 + .../assets/magiclib-core/lang/en_us.yml | 1 + .../assets/magiclib-core/lang/zh_cn.yml | 1 + .../versions/1.14.4-fabric/gradle.properties | 3 + .../versions/1.15.2-fabric/gradle.properties | 3 + .../versions/1.16.5-fabric/gradle.properties | 3 + .../versions/1.17.1-fabric/gradle.properties | 3 + .../versions/1.18.2-fabric/gradle.properties | 3 + .../versions/1.19.2-fabric/gradle.properties | 3 + .../versions/1.19.3-fabric/gradle.properties | 3 + .../versions/1.19.4-fabric/gradle.properties | 3 + .../versions/1.20.1-fabric/gradle.properties | 3 + .../versions/1.20.2-fabric/gradle.properties | 3 + .../versions/1.20.4-fabric/gradle.properties | 5 +- .../versions/1.20.6-fabric/gradle.properties | 5 +- .../versions/1.21.1-fabric/gradle.properties | 5 +- .../versions/1.21.3-fabric/gradle.properties | 5 +- .../versions/1.14.4-fabric/gradle.properties | 2 + .../versions/1.15.2-fabric/gradle.properties | 2 + .../versions/1.16.5-fabric/gradle.properties | 2 + .../versions/1.17.1-fabric/gradle.properties | 2 + .../versions/1.17.1-forge/gradle.properties | 2 + .../versions/1.18.2-fabric/gradle.properties | 2 + .../versions/1.18.2-forge/gradle.properties | 2 + .../versions/1.19.2-fabric/gradle.properties | 2 + .../versions/1.19.3-fabric/gradle.properties | 2 + .../versions/1.19.4-fabric/gradle.properties | 2 + .../versions/1.19.4-forge/gradle.properties | 4 +- .../versions/1.20.1-fabric/gradle.properties | 2 + .../versions/1.20.2-fabric/gradle.properties | 2 + .../versions/1.20.4-fabric/gradle.properties | 4 +- .../versions/1.20.6-fabric/gradle.properties | 4 +- .../1.20.6-neoforge/gradle.properties | 2 + .../versions/1.21.1-fabric/gradle.properties | 4 +- .../1.21.1-neoforge/gradle.properties | 2 + .../versions/1.21.3-fabric/gradle.properties | 4 +- .../versions/1.14.4-fabric/gradle.properties | 1 + .../versions/1.15.2-fabric/gradle.properties | 1 + .../versions/1.16.5-fabric/gradle.properties | 1 + .../versions/1.17.1-fabric/gradle.properties | 1 + .../versions/1.17.1-forge/gradle.properties | 1 + .../versions/1.18.2-fabric/gradle.properties | 1 + .../versions/1.18.2-forge/gradle.properties | 1 + .../versions/1.19.2-fabric/gradle.properties | 1 + .../versions/1.19.3-fabric/gradle.properties | 1 + .../versions/1.19.4-fabric/gradle.properties | 1 + .../versions/1.19.4-forge/gradle.properties | 1 + .../versions/1.20.1-fabric/gradle.properties | 1 + .../versions/1.20.2-fabric/gradle.properties | 1 + .../1.20.2-neoforge/gradle.properties | 3 +- .../versions/1.20.4-fabric/gradle.properties | 3 +- .../versions/1.20.6-fabric/gradle.properties | 3 +- .../1.20.6-neoforge/gradle.properties | 3 +- .../versions/1.21.1-fabric/gradle.properties | 3 +- .../1.21.1-neoforge/gradle.properties | 1 + .../versions/1.21.3-fabric/gradle.properties | 3 +- .../1.21.3-neoforge/gradle.properties | 1 + 89 files changed, 573 insertions(+), 506 deletions(-) create mode 100644 .github/workflows/prepare_action_info.yml delete mode 100644 .github/workflows/scripts/determining_subproject.py create mode 100644 .github/workflows/scripts/publish_info.py delete mode 100644 .github/workflows/scripts/validate_subproject.py diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e2119659..642c7aed 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,171 +1,39 @@ name: CI -# release: (release title) -# dispatch (all): Manual release for $target_release_tag -# dispatch (specified): Manual release for $target_release_tag (subproject: $target_subproject) -run-name: |- - ${{ github.event_name == 'workflow_dispatch' && format('Manual release for {0}{1}', inputs.target_release_tag, inputs.target_subproject && format(' (subproject: {0})', inputs.target_subproject) || '') || '' }} on: push: branches: - 'dev/**' - - 'exp/**' paths: - '**/*.gradle' - '**/gradle.properties' - '**/src/**' - '**/versions/**' - '.github/**' + pull_request: release: types: - published - pull_request: - workflow_dispatch: - inputs: - target_subproject: - description: |- - The subproject name(s) of the specified Minecraft version to be released, seperated with ",". - By default all subprojects will be released. - type: string - required: false - default: '' - target_release_tag: - description: |- - The tag of the release you want to append the artifact to. - type: string - required: true + jobs: - show_action_parameters: - runs-on: ubuntu-latest - steps: - - name: Show action parameters - run: | - cat < $GITHUB_STEP_SUMMARY - ## Action Parameters - - target_subproject: \`${{ inputs.target_subproject }}\` - - target_release_tag: \`${{ inputs.target_release_tag }}\` - EOF - validate_target_subproject: - runs-on: ubuntu-latest - steps: - - name: Checkout the sources - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Validate target subproject - if: ${{ github.event_name == 'workflow_dispatch' }} - # ubuntu-22.04 uses Python 3.10.6 - run: python3 .github/workflows/scripts/validate_subproject.py - env: - TARGET_SUBPROJECT: ${{ inputs.target_subproject }} - # Ensure the input release tag is valid. - validate_release: - runs-on: ubuntu-latest - steps: - - name: Get github release information - if: ${{ github.event_name == 'workflow_dispatch' }} - uses: cardinalby/git-get-release-action@1.2.5 - env: - GITHUB_TOKEN: ${{ github.token }} - with: - tag: ${{ inputs.target_release_tag }} - prepare_build_info: + prepare_action_info: if: ${{ !startsWith(github.event.ref, 'refs/tags/') }} - runs-on: ubuntu-latest - outputs: - build_publish: ${{ steps.build_info.outputs.build_publish }} - build_target_subprojects: ${{ steps.subprojects.outputs.subprojects }} - build_version_type: ${{ steps.build_info.outputs.build_version_type }} - publish_channel: ${{ steps.build_info.outputs.publish_channel }} - publish_target_release_tag: ${{ steps.build_info.outputs.publish_target_release_tag }} - steps: - - name: Checkout the sources - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Determining build info - id: build_info - run: | - if [ ${{ github.repository_owner }} != 'Hendrix-Shen' ] - then - build_publish=true - build_version_type=FORK - publish_channel=fork - elif [ ${{ github.event_name }} == 'push' ] - then - build_publish=true - build_version_type=BETA - publish_channel=dev - elif [ ${{ github.event_name }} == 'release' ] - then - build_publish=true - build_version_type=RELEASE - publish_channel=stable - publish_target_release_tag=${{ github.event.ref }} - elif [ ${{ github.event_name }} == 'pull_request' ] - then - build_publish=false - build_version_type=PULL_REQUEST - elif [ ${{ github.event_name }} == 'workflow_dispatch' ] - then - build_publish=true - build_version_type=RELEASE - publish_channel=stable - publish_target_release_tag=${{ inputs.target_release_tag }} - else - echo Unknown github event name $GITHUB_EVENT_NAME - exit 1 - fi - - echo "build_publish=$build_publish" >> $GITHUB_OUTPUT - echo "build_version_type=$build_version_type" >> $GITHUB_OUTPUT - echo "publish_channel=$publish_channel" >> $GITHUB_OUTPUT - echo "publish_target_release_tag=$publish_target_release_tag" >> $GITHUB_OUTPUT - - cat < $GITHUB_STEP_SUMMARY - ## Determining build info - - build_publish: \`$build_publish\` - - build_version_type: \`$build_version_type\` - - publish_channel: \`$publish_channel\` - - publish_target_release_tag: \`$publish_target_release_tag\` - EOF - - name: Determining subprojects - id: subprojects - run: python3 .github/workflows/scripts/determining_subproject.py - env: - TARGET_SUBPROJECT: ${{ github.event.inputs.target_subproject }} - prepare_publish_info: - if: ${{ needs.prepare_build_info.outputs.build_publish == 'true' }} - runs-on: ubuntu-latest - needs: - - prepare_build_info - outputs: - publish_channel: ${{ needs.prepare_build_info.outputs.publish_channel }} - publish_target_release_tag: ${{ needs.prepare_build_info.outputs.publish_target_release_tag }} - steps: - - name: Checkout the sources - uses: actions/checkout@v4 - with: - fetch-depth: 0 + uses: ./.github/workflows/prepare_action_info.yml build: - if: ${{ contains(github.event.head_commit.message, '[build skip]') == false }} - needs: - - prepare_build_info - - validate_target_subproject - - validate_release + if: ${{ !contains(github.event.head_commit.message, '[build skip]') }} uses: ./.github/workflows/build.yml secrets: inherit + needs: + - prepare_action_info with: - build_publish: ${{ needs.prepare_build_info.outputs.build_publish }} - build_version_type: ${{ needs.prepare_build_info.outputs.build_version_type }} - target_subproject: ${{ needs.prepare_build_info.outputs.build_target_subprojects }} + build_publish: ${{ fromJSON(needs.prepare_action_info.outputs.build_publish) }} + build_version_type: ${{ needs.prepare_action_info.outputs.build_version_type }} publish: - if: ${{ github.event_name != 'pull_request' }} - needs: - - build - - prepare_publish_info + if: ${{ fromJSON(needs.prepare_action_info.outputs.publish_enable) }} uses: ./.github/workflows/publish.yml secrets: inherit + needs: + - build + - prepare_action_info with: - publish_channel: ${{ needs.prepare_publish_info.outputs.publish_channel }} - publish_target_release_tag: ${{ needs.prepare_publish_info.outputs.publish_target_release_tag }} - target_subproject: ${{ inputs.target_subproject }} + publish_platform_channel: ${{ needs.prepare_action_info.outputs.publish_platform_channel }} + publish_type: ${{ needs.prepare_action_info.outputs.publish_type }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a5c992e..b8bd687f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,16 +3,13 @@ on: workflow_call: inputs: build_publish: - type: string - required: true + type: boolean + default: false + required: false build_version_type: type: string - required: true - target_subproject: - description: see CI.yml, leave it empty to build all - type: string + default: 'DEV' required: false - default: '' jobs: build: runs-on: ubuntu-latest @@ -26,8 +23,9 @@ jobs: with: distribution: 'temurin' java-version: 21 + - name: Validate gradle wrapper + uses: gradle/actions/wrapper-validation@v4 - name: Cache gradle files - if: ${{ inputs.build_version_type != 'PULL_REQUEST' }} uses: actions/cache@v4 with: path: | @@ -44,44 +42,35 @@ jobs: ./gradlew preprocessResources env: BUILD_TYPE: ${{ inputs.build_version_type }} - - name: Build with gradle - run: | - chmod +x gradlew - if [ -z "${{ inputs.target_subproject }}" ]; then - echo "Building all subprojects" - ./gradlew build - else - args=$(echo "${{ inputs.target_subproject }}" | tr ',' '\n' | sed 's/$/:build/' | paste -sd ' ') - echo "Building with arguments=$args" - ./gradlew $args - fi - env: - BUILD_TYPE: ${{ inputs.build_version_type }} - - name: Publish with gradle - if: ${{ inputs.build_publish == 'true' }} + - name: Build and publish with gradle + if: ${{ inputs.build_publish == true }} run: | - if [ -z "${{ inputs.target_subproject }}" ]; then - echo "Publishing all subprojects" - ./gradlew publish - else - args=$(echo "${{ inputs.target_subproject }}" | tr ',' '\n' | sed 's/$/:publish/' | paste -sd ' ') - echo "Publishing with arguments=$args" - ./gradlew $args - fi + ./gradlew build publish -x test --stacktrace env: BUILD_TYPE: ${{ inputs.build_version_type }} NYAN_MAVEN_PASSWORD: ${{ secrets.NYAN_MAVEN_PASSWORD }} NYAN_MAVEN_USERNAME: ${{ secrets.NYAN_MAVEN_USERNAME }} SIGNING_PGP_KEY: ${{ secrets.SIGNING_PGP_KEY }} - - name: Upload artifacts + - name: Build and publishToMavenLocal with gradle + if: ${{ inputs.build_publish == false }} + run: | + ./gradlew build publishToMavenLocal -x test --stacktrace + env: + BUILD_TYPE: ${{ inputs.build_version_type }} + - name: Upload build artifacts uses: actions/upload-artifact@v4 with: name: build-artifacts path: | */**/build/libs/ */**/build/tmp/submods/ + - name: Upload MavenLocal + uses: actions/upload-artifact@v4 + with: + name: Maven Local + path: ~/.m2/repository/top/hendrixshen/ summary: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest needs: - build steps: @@ -95,7 +84,6 @@ jobs: name: build-artifacts path: build-artifacts - name: Make build summary - # ubuntu-22.04 uses Python 3.10.6 - run: python3 .github/workflows/scripts/summary.py - env: - TARGET_SUBPROJECT: ${{ inputs.target_subproject }} + run: | + pip install jproperties + python .github/workflows/scripts/summary.py diff --git a/.github/workflows/generate_matrix.yml b/.github/workflows/generate_matrix.yml index b30a9b2b..23047ef2 100644 --- a/.github/workflows/generate_matrix.yml +++ b/.github/workflows/generate_matrix.yml @@ -1,19 +1,13 @@ name: _step.generate_matrix on: workflow_call: - inputs: - target_subproject: - description: see CI.yml, for generating matrix entries - type: string - required: false - default: '' outputs: matrix: description: The generated run matrix value: ${{ jobs.generate_matrix.outputs.matrix }} jobs: generate_matrix: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - name: Checkout the sources uses: actions/checkout@v4 @@ -21,9 +15,8 @@ jobs: fetch-depth: 0 - name: Generate matrix id: generate_matrix - # ubuntu-22.04 uses Python 3.10.6 - run: python3 .github/workflows/scripts/matrix.py - env: - TARGET_SUBPROJECT: ${{ inputs.target_subproject }} + run: | + pip install jproperties + python .github/workflows/scripts/matrix.py outputs: matrix: ${{ steps.generate_matrix.outputs.matrix }} \ No newline at end of file diff --git a/.github/workflows/prepare_action_info.yml b/.github/workflows/prepare_action_info.yml new file mode 100644 index 00000000..28bcda26 --- /dev/null +++ b/.github/workflows/prepare_action_info.yml @@ -0,0 +1,134 @@ +name: _step.prepare_action_info +on: + workflow_call: + outputs: + build_publish: + value: ${{ jobs.prepare_build_info.outputs.build_publish }} + build_version_type: + value: ${{ jobs.prepare_build_info.outputs.build_version_type }} + publish_enable: + value: ${{ jobs.prepare_build_info.outputs.publish_enable }} + publish_platform_channel: + value: ${{ jobs.prepare_build_info.outputs.publish_platform_channel }} + publish_type: + value: ${{ jobs.prepare_build_info.outputs.publish_type }} +jobs: + prepare_build_info: + runs-on: ubuntu-latest + outputs: + build_publish: ${{ steps.build_info.outputs.build_publish }} + build_version_type: ${{ steps.build_info.outputs.build_version_type }} + publish_enable: ${{ steps.build_info.outputs.publish_enable }} + publish_platform_channel: ${{ steps.build_info.outputs.publish_platform_channel }} + publish_type: ${{ steps.build_info.outputs.publish_type }} + steps: + - name: Checkout the sources + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Determining build info + id: build_info + env: + REPO_OWNER: ${{ github.repository_owner }} + GH_EVENT_NAME: ${{ github.event_name }} + run: | + # Publish to NyanMaven + build_publish=false + # Version Type + # BETA + # DEV + # FORK + # PULL_REQUEST + # RC + # RELEASE + build_version_type=DEV + # MC-Publish + publish_enable=false + # CurseForge / Modrinth Release Channel + # alpha + # beta + # release + publish_platform_channel=alpha + # Publish Type + # dev + # release + publish_type=dev + + # Master Repo + # push + # true / BETA / true / alpha / dev + # pull_request + # false / PULL_REQUEST / false / - / - + # pre-release + # true / RC / true / beta / release + # release + # true / RELEASE / true / release / release + if [ "$REPO_OWNER" == 'Hendrix-Shen' ] + then + if [ "$GH_EVENT_NAME" == 'push' ] + then + build_publish=true + build_version_type=BETA + publish_enable=true + publish_platform_channel=alpha + elif [ "$GH_EVENT_NAME" == 'pull_request' ] + then + build_version_type=PULL_REQUEST + elif [ "$GH_EVENT_NAME" == 'release' ] + then + if [ ${{ github.event.release.prerelease }} ] + then + build_version_type=RC + publish_platform_channel=beta + else + build_version_type=RELEASE + publish_platform_channel=release + fi + + build_publish=true + publish_enable=true + else + echo Unsupported github event name "$GH_EVENT_NAME" + exit 1 + fi + # Nyan-Work (Test) Repo + # push + # true / DEV / false / - / dev + elif [ "$REPO_OWNER" == 'Nyan-Work' ] + then + if [ "$GH_EVENT_NAME" == 'push' ] + then + publish_enable=true + else + echo Unsupported github event name "$GH_EVENT_NAME" + exit 1 + fi + # Fork Repos + # push + # true / FORK / false / - / dev + else + if [ "$GH_EVENT_NAME" == 'release' ] + then + build_version_type=FORK + publish_enable=true + else + echo Unsupported github event name "$GH_EVENT_NAME" + exit 1 + fi + fi + + echo "build_publish=$build_publish" >> $GITHUB_OUTPUT + echo "build_version_type=$build_version_type" >> $GITHUB_OUTPUT + echo "publish_channel=$publish_channel" >> $GITHUB_OUTPUT + echo "publish_enable=$publish_enable" >> $GITHUB_OUTPUT + echo "publish_platform_channel=$publish_platform_channel" >> $GITHUB_OUTPUT + echo "publish_type=$publish_type" >> $GITHUB_OUTPUT + + cat < $GITHUB_STEP_SUMMARY + ## Determining build info + - build_publish: \`$build_publish\` + - build_version_type: \`$build_version_type\` + - publish_enable: \`$publish_enable\` + - publish_platform_channel: \`$publish_platform_channel\` + - publish_type: \`$publish_type\` + EOF diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d50b5f9..e54bd219 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,31 +2,30 @@ name: _step.publish on: workflow_call: inputs: - publish_channel: + publish_platform_channel: type: string required: true - publish_target_release_tag: - description: |- - The tag of the release you want to append the artifact to. + publish_type: type: string required: true - target_subproject: - description: see CI.yml, for generating matrix entries - type: string - required: false - default: '' jobs: generate_matrix: - if: ${{ github.event_name != 'pull_request' }} uses: ./.github/workflows/generate_matrix.yml - with: - target_subproject: ${{ inputs.target_subproject }} release_core: runs-on: ubuntu-latest - # Allow the mod publish step to add asserts to release + # Allow the mod publish step to add assets to release # https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token permissions: contents: write + outputs: + commit_count: ${{ steps.shared_publish_info.outputs.commit_count }} + github_changelog: ${{ steps.shared_publish_info.outputs.github_changelog }} + github_tag: ${{ steps.shared_publish_info.outputs.github_tag }} + mod_name: ${{ steps.shared_publish_info.outputs.mod_name }} + mod_version: ${{ steps.shared_publish_info.outputs.mod_version }} + mod_full_version: ${{ steps.shared_publish_info.outputs.mod_version }} + release_title: ${{ steps.shared_publish_info.outputs.release_title }} + short_sha: ${{ steps.shared_publish_info.outputs.short_sha }} steps: - name: Checkout the sources uses: actions/checkout@v4 @@ -37,70 +36,98 @@ jobs: with: name: build-artifacts path: build-artifacts - - name: Get git info - id: get_git_info - run: | - short_sha=$(echo ${GITHUB_SHA} | cut -c1-7) - commit_count=$(git log | grep -e '^commit [a-zA-Z0-9]*' | wc -l) - echo "short_sha=$short_sha" >> $GITHUB_OUTPUT - echo "commit_count=$commit_count" >> $GITHUB_OUTPUT - name: Read Properties mod info id: mod_info uses: christian-draeger/read-properties@1.1.1 with: path: gradle.properties properties: 'mod.name mod.version' + - name: Get shared properties + id: shared_publish_info + env: + REPO_OWNER: ${{ github.repository_owner }} + run: | + short_sha=$(echo ${GITHUB_SHA} | cut -c1-7) + commit_count=$(git log | grep -e '^commit [a-zA-Z0-9]*' | wc -l) + mod_name=${{ steps.mod_info.outputs.mod-name }} + mod_version=${{ steps.mod_info.outputs.mod-version }} + mod_full_version="$mod_version.$commit_count+$short_sha" + + if [ "${{ inputs.publish_type }}" == 'release' ] + then + github_change_log=${{ github.event.release.body }} + github_tag=${{ github.event.ref }} + release_title=${{ github.event.release.name }} + elif [ "${{ inputs.publish_type }}" == "dev" ] + then + if [ "$REPO_OWNER" == 'Hendrix-Shen' ] + then + github_tag="${{ github.ref_name }}.$commit_count" + release_title="[CI#${{ github.run_number }}]$mod_name $mod_full_version" + elif [ "$REPO_OWNER" == 'Nyan-Work' ] + then + github_tag="nyan-work/${{ github.ref_name }}.$commit_count" + release_title="[CI#${{ github.run_number }}]$mod_name $mod_full_version (Nyan)" + else + github_tag="$REPO_OWNER/${{ github.ref_name }}.$commit_count" + release_title="[CI#${{ github.run_number }}]$mod_name $mod_full_version (Fork)" + fi + + github_changelog="**This version is automatically released by CI Build** + + Latest commit log: + + ${{ github.event.head_commit.message }}" + else + echo Unknown publish type ${{ inputs.publish_type }} + exit 1 + fi + + echo "short_sha=$short_sha" >> $GITHUB_OUTPUT + echo "github_changelog<> "$GITHUB_OUTPUT" + echo "commit_count=$commit_count" >> $GITHUB_OUTPUT + echo "github_tag=$github_tag" >> $GITHUB_OUTPUT + echo "mod_name=$mod_name" >> $GITHUB_OUTPUT + echo "mod_version=$mod_version" >> $GITHUB_OUTPUT + echo "mod_full_version=$mod_full_version" >> $GITHUB_OUTPUT + echo "release_title=$release_title" >> $GITHUB_OUTPUT - name: Publish Minecraft Mods (Dev Channel) - if: ${{ inputs.publish_channel == 'dev' }} + if: ${{ inputs.publish_type == 'dev' }} uses: Kir-Antipov/mc-publish@v3.3 with: - github-tag: ${{ format('{0}.{1}', github.ref_name, steps.get_git_info.outputs.commit_count) }} + github-tag: ${{ steps.shared_publish_info.outputs.github_tag }} github-token: ${{ secrets.GITHUB_TOKEN }} + github-changelog: ${{ steps.shared_publish_info.outputs.github_changelog }} github-prerelease: true - github-generate-changelog: true files: | build-artifacts/magiclib-wrapper/fabric/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar build-artifacts/magiclib-wrapper/forge/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar build-artifacts/magiclib-wrapper/neoforge/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar - name: ${{ format('[CI#{0}]{1} {2}.{3}+{4}', github.run_number, steps.mod_info.outputs.mod-name, steps.mod_info.outputs.mod-version, steps.get_git_info.outputs.commit_count, steps.get_git_info.outputs.short_sha) }} + name: ${{ steps.shared_publish_info.outputs.release_title }} retry-attempts: 3 retry-delay: 10000 - name: Publish Minecraft Mods (Stable Channel) if: ${{ inputs.publish_channel == 'stable' }} uses: Kir-Antipov/mc-publish@v3.3 with: - github-tag: ${{ inputs.publish_target_release_tag }} + github-tag: ${{ steps.shared_publish_info.outputs.github_tag }} github-token: ${{ secrets.GITHUB_TOKEN }} files: | build-artifacts/magiclib-wrapper/fabric/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar build-artifacts/magiclib-wrapper/forge/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar build-artifacts/magiclib-wrapper/neoforge/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar - changelog: ${{ format('{0}{1}', github.event.release.body, steps.get_release.outputs.body) }} - retry-attempts: 3 - retry-delay: 10000 - - name: Publish Minecraft Mods (Forks) - if: ${{ inputs.publish_channel == 'fork' }} - uses: Kir-Antipov/mc-publish@v3.3 - with: - github-tag: ${{ format('{0}.{1}', github.ref_name, steps.get_git_info.outputs.commit_count) }} - github-token: ${{ secrets.GITHUB_TOKEN }} - github-prerelease: true - github-generate-changelog: true - files: | - build-artifacts/magiclib-wrapper/fabric/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar - build-artifacts/magiclib-wrapper/forge/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar - build-artifacts/magiclib-wrapper/neoforge/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar - name: ${{ format('{0} {1}.{2}+{3}', steps.mod_info.outputs.mod-name, steps.mod_info.outputs.mod-version, steps.get_git_info.outputs.commit_count, steps.get_git_info.outputs.short_sha) }} retry-attempts: 3 retry-delay: 10000 release: runs-on: ubuntu-latest strategy: - matrix: ${{ fromJson(needs.generate_matrix.outputs.matrix) }} + matrix: ${{ fromJSON(needs.generate_matrix.outputs.matrix) }} needs: - generate_matrix - release_core - # Allow the mod publish step to add asserts to release + # Allow the mod publish step to add assets to release # https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token permissions: contents: write @@ -114,27 +141,14 @@ jobs: with: name: build-artifacts path: build-artifacts - - name: Get git info - id: get_git_info + - name: Get publish info + id: publish_info run: | - short_sha=$(echo ${GITHUB_SHA} | cut -c1-7) - commit_count=$(git log | grep -e '^commit [a-zA-Z0-9]*' | wc -l) - echo "short_sha=$short_sha" >> $GITHUB_OUTPUT - echo "commit_count=$commit_count" >> $GITHUB_OUTPUT - - name: Get github release information - if: ${{ github.event_name == 'workflow_dispatch' }} - id: get_release - uses: cardinalby/git-get-release-action@1.2.5 + pip install jproperties + python .github/workflows/scripts/publish_info.py env: - GITHUB_TOKEN: ${{ github.token }} - with: - tag: ${{ inputs.publish_target_release_tag }} - - name: Read Properties mod info - id: mod_info - uses: christian-draeger/read-properties@1.1.1 - with: - path: gradle.properties - properties: 'mod.name mod.version' + MOD_PLATFORM: ${{ matrix.platform }} + MOD_MC_VER: ${{ matrix.mc_ver }} - name: Prepare file information id: file_info run: | @@ -154,38 +168,15 @@ jobs: echo "name=$FILE_NAME" >> $GITHUB_OUTPUT echo "hash=$FILE_HASH" >> $GITHUB_OUTPUT cat $GITHUB_OUTPUT - - name: Prepare changelog (Dev Channel) - if: ${{ inputs.publish_channel == 'dev' }} - uses: actions/github-script@v7 - id: changelog_dev - with: - script: return process.env.CHANGELOG - result-encoding: string - env: - CHANGELOG: |- - **This version is automatically released by CI Build** - - Latest commit log: - - ${{ github.event.head_commit.message }} - - ------- - - Build Information - - - File name: `${{ steps.file_info.outputs.name }}` - - SHA-256: `${{ steps.file_info.outputs.hash }}` - - Built from: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - - name: Prepare changelog (Stable Channel) - if: ${{ inputs.publish_channel == 'stable' }} + - name: Prepare changelog uses: actions/github-script@v7 - id: changelog_release + id: changelog with: script: return process.env.CHANGELOG result-encoding: string env: CHANGELOG: |- - ${{ format('{0}{1}', github.event.release.body, steps.get_release.outputs.body) }} + ${{ needs.release_core.outputs.github_changelog }} ------- @@ -195,52 +186,42 @@ jobs: - SHA-256: `${{ steps.file_info.outputs.hash }}` - Built from: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - name: Publish Minecraft Mods (Dev Channel) - if: ${{ inputs.publish_channel == 'dev' }} + if: ${{ inputs.publish_type == 'dev' }} uses: Kir-Antipov/mc-publish@v3.3 with: modrinth-id: JOGZQCse modrinth-token: ${{ secrets.MODRINTH_API_TOKEN }} curseforge-id: 1022790 curseforge-token: ${{ secrets.CF_API_TOKEN }} - github-tag: ${{ format('{0}.{1}', github.ref_name, steps.get_git_info.outputs.commit_count) }} + github-tag: ${{ needs.release_core.outputs.github_tag }} github-token: ${{ secrets.GITHUB_TOKEN }} - github-prerelease: true - github-name: ${{ format('[CI#{0}]{1} {2}.{3}+{4}', github.run_number, steps.mod_info.outputs.mod-name, steps.mod_info.outputs.mod-version, steps.get_git_info.outputs.commit_count, steps.get_git_info.outputs.short_sha) }} - github-changelog: | - **This version is automatically released by CI Build** - - Latest commit log: - - ${{ github.event.head_commit.message }} github-files: | build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/libs/!(*-@(dev|sources|javadoc|empty)).jar build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/tmp/submods/unpublish/!(*-@(dev|sources|javadoc|empty)).jar files: | build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/libs/!(*-@(dev|sources|javadoc|empty)).jar - changelog: ${{ steps.changelog_dev.outputs.result }} - name: ${{ format('[CI#{0}]{1} {2}.{3} for Minecraft {4} ({5})', github.run_number, steps.mod_info.outputs.mod-name, steps.mod_info.outputs.mod-version, steps.get_git_info.outputs.commit_count, matrix.mc_ver, matrix.platform) }} - version: ${{ format('v{0}.{1}-mc{2}-{3}', steps.mod_info.outputs.mod-version, steps.get_git_info.outputs.commit_count, matrix.mc_ver, matrix.platform) }} + curseforge-changelog: ${{ steps.changelog.outputs.result }} + curseforge-name: ${{ needs.release_core.outputs.release_title }} + modrinth-changelog: ${{ steps.changelog.outputs.result }} + modrinth-name: ${{ needs.release_core.outputs.release_title }} + version: ${{ format('v{0}.{1}-mc{2}-{3}', needs.release_core.outputs.mod_version, needs.release_core.outputs.commit_count, matrix.mc_ver, matrix.platform) }} version-type: alpha - loaders: | - ${{ matrix.platform }} - game-versions: | - ${{ matrix.mc_ver }} + loaders: ${{ steps.publish_info.outputs.publish_loaders }} + game-versions: ${{ steps.publish_info.outputs.publish_game_versions }} game-version-filter: any - dependencies: | - carpet(optional) - malilib(optional + dependencies: ${{ steps.publish_info.outputs.publish_dependencies }} retry-attempts: 3 retry-delay: 10000 - name: Publish Minecraft Mods (Stable Channel) - if: ${{ inputs.publish_channel == 'stable' }} + if: ${{ inputs.publish_type == 'stable' }} uses: Kir-Antipov/mc-publish@v3.3 with: modrinth-id: mv1zH6ln modrinth-token: ${{ secrets.MODRINTH_API_TOKEN }} curseforge-id: 576459 curseforge-token: ${{ secrets.CF_API_TOKEN }} - github-tag: ${{ inputs.publish_target_release_tag }} + github-tag: ${{ needs.release_core.outputs.github_tag }} github-token: ${{ secrets.GITHUB_TOKEN }} github-files: | build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/libs/!(*-@(dev|sources|javadoc|empty)).jar @@ -248,40 +229,15 @@ jobs: build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/tmp/submods/unpublish/!(*-@(dev|sources|javadoc|empty)).jar files: | build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/libs/!(*-@(dev|sources|javadoc|empty)).jar - name: ${{ format('{0} {1}.{2} for Minecraft {3} ({4})', steps.mod_info.outputs.mod-name, steps.mod_info.outputs.mod-version, steps.get_git_info.outputs.commit_count, matrix.mc_ver, matrix.platform) }} - version: ${{ format('v{0}.{1}mc{2}-{3}', steps.mod_info.outputs.mod-version, steps.get_git_info.outputs.commit_count, matrix.mc_ver, matrix.platform) }} - version-type: release - github-changelog: ${{ format('{0}{1}', github.event.release.body, steps.get_release.outputs.body) }} - modrinth-changelog: ${{ steps.changelog_release.outputs.result }} - curseforge-changelog: ${{ steps.changelog_release.outputs.result }} - loaders: | - ${{ matrix.platform }} - game-versions: | - ${{ matrix.mc_ver }} + curseforge-changelog: ${{ steps.changelog.outputs.result }} + curseforge-name: ${{ needs.release_core.outputs.release_title }} + modrinth-changelog: ${{ steps.changelog.outputs.result }} + modrinth-name: ${{ needs.release_core.outputs.release_title }} + version: ${{ format('v{0}.{1}-mc{2}-{3}', needs.release_core.outputs.mod_version, needs.release_core.outputs.commit_count, matrix.mc_ver, matrix.platform) }} + version-type: ${{ github.event.release.prerelease && 'beta' || 'release' }} + loaders: ${{ steps.publish_info.outputs.publish_loaders }} + game-versions: ${{ steps.publish_info.outputs.publish_game_versions }} game-version-filter: any - dependencies: | - carpet(optional) - malilib(optional) - retry-attempts: 3 - retry-delay: 10000 - - name: Publish Minecraft Mods (Forks) - if: ${{ inputs.publish_channel == 'fork' }} - uses: Kir-Antipov/mc-publish@v3.3 - with: - github-tag: ${{ format('{0}.{1}', github.ref_name, steps.get_git_info.outputs.commit_count) }} - github-token: ${{ secrets.GITHUB_TOKEN }} - github-prerelease: true - changelog: | - **This version is automatically released by CI Build** - - Latest commit log: - - ${{ github.event.head_commit.message }} - - files: | - build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/libs/!(*-@(dev|sources|javadoc|empty)).jar - build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/tmp/submods/publish/!(*-@(dev|sources|javadoc|empty)).jar - build-artifacts/magiclib-wrapper/${{ matrix.platform }}/${{ matrix.mc_ver }}/build/tmp/submods/unpublish/!(*-@(dev|sources|javadoc|empty)).jar - name: ${{ format('{0} {1}.{2}+{3} (Fork)', steps.mod_info.outputs.mod-name, steps.mod_info.outputs.mod-version, steps.get_git_info.outputs.commit_count, steps.get_git_info.outputs.short_sha) }} + dependencies: ${{ steps.publish_info.outputs.publish_dependencies }} retry-attempts: 3 retry-delay: 10000 diff --git a/.github/workflows/scripts/common.py b/.github/workflows/scripts/common.py index 8eaea48e..e4bdb596 100644 --- a/.github/workflows/scripts/common.py +++ b/.github/workflows/scripts/common.py @@ -4,8 +4,11 @@ __author__ = 'Hendrix_Shen' import json +from dataclasses import dataclass from typing import Dict, List, Set +from jproperties import Properties + __PLATFORM_MAPPING: dict = { 'fabric': 'Fabric', 'forge': 'Forge', @@ -14,6 +17,20 @@ } +def get_settings() -> dict: + with open('settings.json') as f: + return json.load(f) + + +def read_properties(file_name: str) -> Properties: + configs = Properties() + + with open(file_name, 'rb') as f: + configs.load(f) + + return configs + + def get_mc_vers(subproject_dict: Dict[str, List[str]]) -> List[str]: mc_vers: Set[str] = set() @@ -24,23 +41,24 @@ def get_mc_vers(subproject_dict: Dict[str, List[str]]) -> List[str]: return sorted(list(mc_vers)) -def get_subproject_dict() -> Dict[str, List[str]]: - with open('settings.json') as f: - settings: dict = json.load(f) - +def get_projects_by_platform() -> Dict[str, List[str]]: + settings: dict = get_settings() projects: Dict[str, List[str]] = {} for project in settings['projects']: for version in settings['projects'][project]['versions']: module: Module = Module.of(version) + platform: str = module.platform() - if module.platform() not in projects: - projects[module.platform()] = [] + if platform not in projects: + projects[platform] = [] - projects[module.platform()].append(module.mc_ver()) + projects[platform].append(module.mc_ver()) - for platform in projects: - projects[platform] = sorted(list(set(projects[platform]))) + projects = { + platform: sorted({item for item in projects[platform]}) + for platform in projects if projects[platform] + } return projects @@ -50,21 +68,25 @@ def pretty_platform(platform: str) -> str: def read_prop(file_name: str, key: str) -> str: - with open(file_name) as prop: - return next(filter( - lambda x: x.split('=', 1)[0].strip() == key, - prop.readlines() - )).split('=', 1)[1].lstrip() + configs: Properties = read_properties(file_name) + return configs[key].data + +@dataclass(frozen=True) +class FileData: + file_name: str + file_size: int + sha256: str + def get_file_size(self) -> str: + return '{} B'.format(self.file_size) + + +@dataclass(frozen=True) class Module: __mc_ver: str __platform: str - def __init__(self, mc_ver: str, platform: str) -> None: - self.__mc_ver = mc_ver - self.__platform = platform - @staticmethod def of(module_name: str) -> 'Module': s = module_name.split('-') diff --git a/.github/workflows/scripts/determining_subproject.py b/.github/workflows/scripts/determining_subproject.py deleted file mode 100644 index 97f25a72..00000000 --- a/.github/workflows/scripts/determining_subproject.py +++ /dev/null @@ -1,33 +0,0 @@ -__author__ = 'Hendrix_Shen' - -import os -from typing import List, Dict - -import common - -WRAPPER_NAME = ':magiclib-wrapper' - - -def main(): - target_subproject_env = os.environ.get('TARGET_SUBPROJECT', '') - target_subprojects = list(filter(None, target_subproject_env.split(',') if target_subproject_env != '' else [])) - subproject_dict: Dict[str, List[str]] = common.get_subproject_dict() - gradle_subprojects: List[str] = [] - - for target_subproject in target_subprojects: - for platform in subproject_dict: - if target_subproject in subproject_dict[platform]: - gradle_subprojects.append('{}:{}:{}'.format(WRAPPER_NAME, platform, target_subproject)) - - result: str = ','.join(gradle_subprojects) - - with open(os.environ['GITHUB_STEP_SUMMARY'], 'w') as f: - f.write('## Determining subprojects\n') - f.write('- subprojects={}\n'.format(result)) - - with open(os.environ['GITHUB_OUTPUT'], 'w') as f: - f.write('- subprojects={}\n'.format(result)) - - -if __name__ == '__main__': - main() diff --git a/.github/workflows/scripts/matrix.py b/.github/workflows/scripts/matrix.py index b327288c..1c95bf2f 100644 --- a/.github/workflows/scripts/matrix.py +++ b/.github/workflows/scripts/matrix.py @@ -15,27 +15,12 @@ def main(): - target_subproject_env = os.environ.get('TARGET_SUBPROJECT', '') - target_subprojects = list(filter(None, target_subproject_env.split(',') if target_subproject_env != '' else [])) - print('target_subprojects: {}'.format(target_subprojects)) - subproject_dict: Dict[str, List[str]] = common.get_subproject_dict() - matrix: Dict[str, List[Dict[str, str]]] = {'include': []} - - if len(target_subprojects) == 0: - for platform in subproject_dict: - for mc_ver in subproject_dict[platform]: - matrix['include'].append({ - 'platform': platform, - 'mc_ver': mc_ver - }) - else: - for platform in subproject_dict: - for mc_ver in subproject_dict[platform]: - if mc_ver in target_subprojects: - matrix['include'].append({ - 'platform': platform, - 'mc_ver': mc_ver - }) + subproject_dict: Dict[str, List[str]] = common.get_projects_by_platform() + matrix: Dict[str, List[Dict[str, str]]] = {'include': [ + {'platform': platform, 'mc_ver': mc_ver} + for platform, versions in subproject_dict.items() + for mc_ver in versions + ]} with open(os.environ['GITHUB_OUTPUT'], 'w') as f: f.write('matrix={}\n'.format(json.dumps(matrix))) diff --git a/.github/workflows/scripts/publish_info.py b/.github/workflows/scripts/publish_info.py new file mode 100644 index 00000000..d534b666 --- /dev/null +++ b/.github/workflows/scripts/publish_info.py @@ -0,0 +1,67 @@ +""" +A script to scan through all valid submodules in build-artifacts.zip/$module/$version/gradle.properties, +and generate the information needed for mc-publish +""" +__author__ = 'Hendrix_Shen' + +import os +from typing import List + +import common +from common import Module + + +def format_multiple_line(var: str, raw: str) -> str: + return (f'{var}< str: @@ -27,48 +29,30 @@ def get_sha256_hash(file_path: str) -> str: return sha256_hash.hexdigest() -def get_file_info(file_paths: List[str], subproject: str, warnings: List[str]) -> dict: +def get_file_info(file_paths: List[str], subproject: str, warnings: List[str]) -> FileData: if len(file_paths) == 0: - file_name = '*not found*' - file_size = 0 - sha256 = '*N/A*' - else: - file_name = '`{}`'.format(os.path.basename(file_paths[0])) - file_size = '{} B'.format(os.path.getsize(file_paths[0])) - sha256 = '`{}`'.format(get_sha256_hash(file_paths[0])) - if len(file_paths) > 1: - warnings.append( - 'Found too many build files in subproject {}: {}'.format(subproject, ', '.join(file_paths))) - - return { - 'file_name': file_name, - 'file_size': file_size, - 'sha256': sha256 - } + return __EMPTY_FILE_INFO + if len(file_paths) > 1: + warnings.append( + 'Found too many build files in subproject {}: {}'.format(subproject, ', '.join(file_paths))) + + return FileData(os.path.basename(file_paths[0]), os.path.getsize(file_paths[0]), get_sha256_hash(file_paths[0])) -def main(): - with open('settings.json') as f: - settings: dict = json.load(f) - target_subproject_env = os.environ.get('TARGET_SUBPROJECT', '') - target_subprojects = list(filter(None, target_subproject_env.split(',') if target_subproject_env != '' else [])) - print('target_subprojects: {}'.format(target_subprojects)) - subproject_dict: Dict[str, List[str]] = common.get_subproject_dict() +def main(): + subproject_dict: Dict[str, List[str]] = common.get_projects_by_platform() + settings: dict = common.get_settings() with open(os.environ['GITHUB_STEP_SUMMARY'], 'w') as f: - f.write('## Build Artifacts Summary\n\n') - warnings = [] - wrappers: List[common.Module] = [] + f.write('## Build Artifacts Summary\n') + warnings: List[str] = [] + wrappers: List[Module] = [] cores: List[str] = [] - modules: Dict[str, List[common.Module]] = {} + modules: Dict[str, List[Module]] = {} for platform in subproject_dict: for mc_ver in subproject_dict[platform]: - if len(target_subprojects) > 0 and mc_ver not in target_subprojects: - print('Skipping {}-{}'.format(mc_ver, platform)) - continue - module: common.Module = common.Module(mc_ver, platform) wrappers.append(module) cores.append(module.platform()) @@ -85,7 +69,7 @@ def main(): wrappers = sorted(list(set(wrappers)), key=lambda m: (m.mc_ver(), m.platform())) f.write('### MagicLib Mod\n') f.write('| Minecraft | Platform | File | Size | SHA-256 |\n') - f.write('| --- | --- |--- | --- | --- |\n') + f.write('|:---:|:---:|--- | --- | --- |\n') for wrapper in wrappers: file_paths = glob.glob( @@ -93,15 +77,16 @@ def main(): file_paths = list(filter( lambda fp: not fp.endswith('-sources.jar') and not fp.endswith('-javadoc.jar') and not fp.endswith( '-empty.jar'), file_paths)) - file_info = get_file_info(file_paths, 'magiclib-wrapper', warnings) + file_info: FileData = get_file_info(file_paths, 'magiclib-wrapper', warnings) f.write('| {} | {} | {} | {} | {} |\n'.format(wrapper.mc_ver(), wrapper.pretty_platform(), - file_info.get('file_name'), file_info.get('file_size'), - file_info.get('sha256'))) + file_info.file_name, file_info.get_file_size(), + file_info.sha256)) + f.write('\n') cores = sorted(list(set(cores))) - f.write('\n### Module {}'.format(common.read_prop('magiclib-core/gradle.properties', 'mod.name'))) + f.write('### Module {}\n'.format(common.read_prop('magiclib-core/gradle.properties', 'mod.name'))) f.write('| Platform | File | Size | SHA-256 |\n') - f.write('| --- | --- | --- | --- |\n') + f.write('|:---:| --- | --- | --- |\n') for platform in cores: file_paths = glob.glob('build-artifacts/magiclib-core/{}/build/libs/*.jar'.format(platform)) @@ -110,35 +95,37 @@ def main(): '-javadoc.jar'), file_paths)) file_info = get_file_info(file_paths, platform, warnings) platform = common.pretty_platform(platform) - f.write('| {} | {} | {} | {} |\n'.format(platform, file_info.get('file_name'), file_info.get('file_size'), - file_info.get('sha256'))) + f.write('| {} | {} | {} | {} |\n'.format(platform, file_info.file_name, file_info.get_file_size(), + file_info.sha256)) modules = {key: modules[key] for key in sorted(modules.keys())} for subproject in modules: modules[subproject] = sorted(list(set(modules[subproject])), key=lambda m: (m.mc_ver(), m.platform())) f.write( - '\n### Module {}'.format(common.read_prop('{}/gradle.properties'.format(subproject), 'mod.name'))) + '### Module {}\n'.format(common.read_prop('{}/gradle.properties'.format(subproject), 'mod.name'))) f.write('| Minecraft | Platform | File | Size | SHA-256 |\n') - f.write('| --- | --- | --- | --- | --- |\n') + f.write('|:---:|:---:| --- | --- | --- |\n') for module in modules[subproject]: platform = module.pretty_platform() game_versions = common.read_prop( '{}/versions/{}/gradle.properties'.format(subproject, module.get_str()), 'publish.game_version') - game_versions = game_versions.strip().replace('\\n', ', ') + game_versions = game_versions.strip().replace('\n', ', ') file_paths = glob.glob( 'build-artifacts/{}/versions/{}/build/libs/*.jar'.format(subproject, module.get_str())) file_paths = list(filter( lambda fp: not fp.endswith('-sources.jar') and not fp.endswith('-shadow.jar') and not fp.endswith( '-javadoc.jar'), file_paths)) file_info = get_file_info(file_paths, module.get_str(), warnings) - f.write('| {} | {} | {} | {} | {} |\n'.format(game_versions, platform, file_info.get('file_name'), - file_info.get('file_size'), file_info.get('sha256'))) + f.write('| {} | {} | {} | {} | {} |\n'.format(game_versions, platform, file_info.file_name, + file_info.get_file_size(), file_info.sha256)) + f.write('\n') if len(warnings) > 0: - f.write('\n### Warnings\n\n') + f.write('### Warnings\n') + for warning in warnings: f.write('- {}\n'.format(warning)) diff --git a/.github/workflows/scripts/validate_subproject.py b/.github/workflows/scripts/validate_subproject.py deleted file mode 100644 index 6920a3f9..00000000 --- a/.github/workflows/scripts/validate_subproject.py +++ /dev/null @@ -1,26 +0,0 @@ -""" -A script to valid TARGET_SUBPROJECT. -""" -__author__ = 'Hendrix_Shen' - -import os -import sys -from typing import List - -import common - - -def main(): - target_subproject_env = os.environ.get('TARGET_SUBPROJECT', '') - target_subprojects = list(filter(None, target_subproject_env.split(',') if target_subproject_env != '' else [])) - subproject_dict: dict = common.get_subproject_dict() - mc_ver: List[str] = common.get_mc_vers(subproject_dict) - - for subproject in target_subprojects: - if subproject not in mc_ver: - print('Could not found subproject {} in any platform!'.format(subproject)) - sys.exit(1) - - -if __name__ == '__main__': - main() diff --git a/build.gradle b/build.gradle index c441b11b..d5f18bd1 100644 --- a/build.gradle +++ b/build.gradle @@ -56,12 +56,14 @@ ext { return "beta" case "FORK": return "fork" + case "RC": + return "rc" case "RELEASE": return "stable" case "PULL_REQUEST": return "pull_request" default: - return "dev" + return "development" } } diff --git a/magiclib-better-dev/versions/1.14.4-fabric/gradle.properties b/magiclib-better-dev/versions/1.14.4-fabric/gradle.properties index 536765da..f3c542b3 100644 --- a/magiclib-better-dev/versions/1.14.4-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.14.4-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=8.0.1-fabric1.14 # Publish properties publish.game_version=1.14.4 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.15.2-fabric/gradle.properties b/magiclib-better-dev/versions/1.15.2-fabric/gradle.properties index bc3a4ba4..0f3fb94d 100644 --- a/magiclib-better-dev/versions/1.15.2-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.15.2-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=8.0.1-fabric1.15 # Publish properties publish.game_version=1.15.2 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.16.5-fabric/gradle.properties b/magiclib-better-dev/versions/1.16.5-fabric/gradle.properties index 54e3b731..31dfc892 100644 --- a/magiclib-better-dev/versions/1.16.5-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.16.5-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=8.0.1-fabric1.16 # Publish properties publish.game_version=1.16.5 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.17.1-fabric/gradle.properties b/magiclib-better-dev/versions/1.17.1-fabric/gradle.properties index 36865890..04001053 100644 --- a/magiclib-better-dev/versions/1.17.1-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.17.1-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=8.0.1-fabric1.17 # Publish properties publish.game_version=1.17.1 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.17.1-forge/gradle.properties b/magiclib-better-dev/versions/1.17.1-forge/gradle.properties index f4577e37..1bc23f8c 100644 --- a/magiclib-better-dev/versions/1.17.1-forge/gradle.properties +++ b/magiclib-better-dev/versions/1.17.1-forge/gradle.properties @@ -14,3 +14,4 @@ loom.platform=forge # Publish properties publish.game_version=1.17.1 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.18.2-fabric/gradle.properties b/magiclib-better-dev/versions/1.18.2-fabric/gradle.properties index 254816e7..b28d71db 100644 --- a/magiclib-better-dev/versions/1.18.2-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.18.2-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=9.0.0 # Publish properties publish.game_version=1.18.2 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.18.2-forge/gradle.properties b/magiclib-better-dev/versions/1.18.2-forge/gradle.properties index 98f3aaea..86283009 100644 --- a/magiclib-better-dev/versions/1.18.2-forge/gradle.properties +++ b/magiclib-better-dev/versions/1.18.2-forge/gradle.properties @@ -15,3 +15,4 @@ loom.platform=forge # Publish properties publish.game_version=1.18.2 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.19.2-fabric/gradle.properties b/magiclib-better-dev/versions/1.19.2-fabric/gradle.properties index 3d0dc6a3..414eb3b2 100644 --- a/magiclib-better-dev/versions/1.19.2-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.19.2-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=4WyhQU59 # Publish properties publish.game_version=1.19.2 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.19.3-fabric/gradle.properties b/magiclib-better-dev/versions/1.19.3-fabric/gradle.properties index b423d9f6..3ed72a79 100644 --- a/magiclib-better-dev/versions/1.19.3-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.19.3-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=8.0.1.1-fabric1.19 # Publish properties publish.game_version=1.19.3 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.19.4-fabric/gradle.properties b/magiclib-better-dev/versions/1.19.4-fabric/gradle.properties index 71eed8f9..871d4ae4 100644 --- a/magiclib-better-dev/versions/1.19.4-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.19.4-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=zo8AWOHP # Publish properties publish.game_version=1.19.4 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.19.4-forge/gradle.properties b/magiclib-better-dev/versions/1.19.4-forge/gradle.properties index 1b7b28c0..ae66b871 100644 --- a/magiclib-better-dev/versions/1.19.4-forge/gradle.properties +++ b/magiclib-better-dev/versions/1.19.4-forge/gradle.properties @@ -15,3 +15,4 @@ loom.platform=forge # Publish properties publish.game_version=1.19.4 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.20.1-fabric/gradle.properties b/magiclib-better-dev/versions/1.20.1-fabric/gradle.properties index 3b6352ff..26f36661 100644 --- a/magiclib-better-dev/versions/1.20.1-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.20.1-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=3lDWPamo # Publish properties publish.game_version=1.20.1 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.20.2-fabric/gradle.properties b/magiclib-better-dev/versions/1.20.2-fabric/gradle.properties index a78de4ca..7bfc621e 100644 --- a/magiclib-better-dev/versions/1.20.2-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.20.2-fabric/gradle.properties @@ -17,3 +17,4 @@ dependencies.runtime.inGameAccountSwitcher_version=KMG9GrSq # Publish properties publish.game_version=1.20.2 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.20.2-neoforge/gradle.properties b/magiclib-better-dev/versions/1.20.2-neoforge/gradle.properties index 28eea630..0f4439d8 100644 --- a/magiclib-better-dev/versions/1.20.2-neoforge/gradle.properties +++ b/magiclib-better-dev/versions/1.20.2-neoforge/gradle.properties @@ -13,4 +13,5 @@ dependencies.runtime.inGameAccountSwitcher_version=3k6OaZQw loom.platform=neoforge # Publish properties -publish.game_version=1.20.2 \ No newline at end of file +publish.game_version=1.20.2 +publish.dependencies_list= \ No newline at end of file diff --git a/magiclib-better-dev/versions/1.20.4-fabric/gradle.properties b/magiclib-better-dev/versions/1.20.4-fabric/gradle.properties index 82c6a59c..d33c3078 100644 --- a/magiclib-better-dev/versions/1.20.4-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.20.4-fabric/gradle.properties @@ -16,4 +16,5 @@ dependencies.runtime.imblocker_version=1.0.24 dependencies.runtime.inGameAccountSwitcher_version=dHZaRsM5 # Publish properties -publish.game_version=1.20.3\n1.20.4 +publish.game_version=1.20.3,1.20.4 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.20.6-fabric/gradle.properties b/magiclib-better-dev/versions/1.20.6-fabric/gradle.properties index 73f0f8bf..934793d9 100644 --- a/magiclib-better-dev/versions/1.20.6-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.20.6-fabric/gradle.properties @@ -16,4 +16,5 @@ dependencies.runtime.imblocker_version=1.0.24 dependencies.runtime.inGameAccountSwitcher_version=9.0.1 # Publish properties -publish.game_version=1.20.5\n1.20.6 +publish.game_version=1.20.5,1.20.6 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.20.6-neoforge/gradle.properties b/magiclib-better-dev/versions/1.20.6-neoforge/gradle.properties index 922c59d3..bebe5724 100644 --- a/magiclib-better-dev/versions/1.20.6-neoforge/gradle.properties +++ b/magiclib-better-dev/versions/1.20.6-neoforge/gradle.properties @@ -14,4 +14,5 @@ dependencies.runtime.inGameAccountSwitcher_version=rdiakbKb loom.platform=neoforge # Publish properties -publish.game_version=1.20.6 \ No newline at end of file +publish.game_version=1.20.6 +publish.dependencies_list= \ No newline at end of file diff --git a/magiclib-better-dev/versions/1.21.1-fabric/gradle.properties b/magiclib-better-dev/versions/1.21.1-fabric/gradle.properties index df531341..ed29f047 100644 --- a/magiclib-better-dev/versions/1.21.1-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.21.1-fabric/gradle.properties @@ -16,4 +16,5 @@ dependencies.runtime.imblocker_version=1.0.24 dependencies.runtime.inGameAccountSwitcher_version=RQG6VufY # Publish properties -publish.game_version=1.21\n1.21.1 +publish.game_version=1.21,1.21.1 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.21.1-neoforge/gradle.properties b/magiclib-better-dev/versions/1.21.1-neoforge/gradle.properties index 71a0ce05..14815ae3 100644 --- a/magiclib-better-dev/versions/1.21.1-neoforge/gradle.properties +++ b/magiclib-better-dev/versions/1.21.1-neoforge/gradle.properties @@ -15,3 +15,4 @@ loom.platform=neoforge # Publish properties publish.game_version=1.21.1 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.21.3-fabric/gradle.properties b/magiclib-better-dev/versions/1.21.3-fabric/gradle.properties index c10922f9..164492f0 100644 --- a/magiclib-better-dev/versions/1.21.3-fabric/gradle.properties +++ b/magiclib-better-dev/versions/1.21.3-fabric/gradle.properties @@ -16,4 +16,5 @@ dependencies.runtime.imblocker_version=1.0.24 dependencies.runtime.inGameAccountSwitcher_version=RQG6VufY # Publish properties -publish.game_version=1.21.2\n1.12.3 +publish.game_version=1.21.2,1.21.3 +publish.dependencies_list= diff --git a/magiclib-better-dev/versions/1.21.3-neoforge/gradle.properties b/magiclib-better-dev/versions/1.21.3-neoforge/gradle.properties index 4c9400de..af990ace 100644 --- a/magiclib-better-dev/versions/1.21.3-neoforge/gradle.properties +++ b/magiclib-better-dev/versions/1.21.3-neoforge/gradle.properties @@ -15,3 +15,4 @@ loom.platform=neoforge # Publish properties publish.game_version=1.21.3 +publish.dependencies_list= diff --git a/magiclib-core/common/src/main/resources/assets/magiclib-core/lang/en_us.yml b/magiclib-core/common/src/main/resources/assets/magiclib-core/lang/en_us.yml index d814174c..6e220863 100644 --- a/magiclib-core/common/src/main/resources/assets/magiclib-core/lang/en_us.yml +++ b/magiclib-core/common/src/main/resources/assets/magiclib-core/lang/en_us.yml @@ -61,5 +61,6 @@ magiclib: development: Development fork: Third-Party Fork pull_request: Pull Request + rc: Release Candidate stable: Public Release unknown: Unknown diff --git a/magiclib-core/common/src/main/resources/assets/magiclib-core/lang/zh_cn.yml b/magiclib-core/common/src/main/resources/assets/magiclib-core/lang/zh_cn.yml index 0ff1f6bf..f855486b 100644 --- a/magiclib-core/common/src/main/resources/assets/magiclib-core/lang/zh_cn.yml +++ b/magiclib-core/common/src/main/resources/assets/magiclib-core/lang/zh_cn.yml @@ -61,5 +61,6 @@ magiclib: development: 开发版 fork: 第三方分支 pull_request: 拉取请求 + rc: 候选发布 stable: 公共发行版 unknown: 未知版本 diff --git a/magiclib-legacy-compat/versions/1.14.4-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.14.4-fabric/gradle.properties index cc2bfa17..8a8e9ae0 100644 --- a/magiclib-legacy-compat/versions/1.14.4-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.14.4-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.14.4-1.3.7+v200127 # Publish properties publish.game_version=1.14.4 +publish.dependencies_list=\ + carpet@1.14.4-1.3.7+v200127(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.10.0-dev.20+arne.2(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.15.2-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.15.2-fabric/gradle.properties index 3bedf10e..270f0e4f 100644 --- a/magiclib-legacy-compat/versions/1.15.2-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.15.2-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.15.2-1.4.8+v200811 # Publish properties publish.game_version=1.15.2 +publish.dependencies_list=\ + carpet@1.15.2-1.4.8+v200811(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.10.0-dev.21+arne.3(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.16.5-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.16.5-fabric/gradle.properties index 02f54b8c..94e4b1b3 100644 --- a/magiclib-legacy-compat/versions/1.16.5-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.16.5-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.16.5-1.4.44+v210714 # Publish properties publish.game_version=1.16.5 +publish.dependencies_list=\ + carpet@1.16.5-1.4.44+v210714(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.10.0-dev.21+arne.8(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.17.1-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.17.1-fabric/gradle.properties index cb278a8c..04491045 100644 --- a/magiclib-legacy-compat/versions/1.17.1-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.17.1-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.17.1-1.4.57+v220119 # Publish properties publish.game_version=1.17.1 +publish.dependencies_list=\ + carpet@1.17.1-1.4.57+v220119(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.10.0-dev.26(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.18.2-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.18.2-fabric/gradle.properties index ae056d97..7879a5ce 100644 --- a/magiclib-legacy-compat/versions/1.18.2-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.18.2-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.18.2-1.4.69+v220331 # Publish properties publish.game_version=1.18.2 +publish.dependencies_list=\ + carpet@1.18.2-1.4.69+v220331(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.12.1(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.19.2-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.19.2-fabric/gradle.properties index 5a67df62..8bf65dbe 100644 --- a/magiclib-legacy-compat/versions/1.19.2-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.19.2-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.19.2-1.4.84+v221018 # Publish properties publish.game_version=1.19.2 +publish.dependencies_list=\ + carpet@1.19.2-1.4.84+v221018(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.13.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.19.3-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.19.3-fabric/gradle.properties index 273d18ad..9c4c0fd1 100644 --- a/magiclib-legacy-compat/versions/1.19.3-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.19.3-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.19.3-1.4.96+v230201 # Publish properties publish.game_version=1.19.3 +publish.dependencies_list=\ + carpet@1.19.3-1.4.96+v230201(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.14.1-pre.1(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.19.4-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.19.4-fabric/gradle.properties index e9537303..67d5cde9 100644 --- a/magiclib-legacy-compat/versions/1.19.4-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.19.4-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.19.4-1.4.101+v230319 # Publish properties publish.game_version=1.19.4 +publish.dependencies_list=\ + carpet@1.19.4-1.4.101+v230319(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.15.4(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.20.1-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.20.1-fabric/gradle.properties index e8295ec9..03ebf8a3 100644 --- a/magiclib-legacy-compat/versions/1.20.1-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.20.1-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.20-1.4.112+v230608 # Publish properties publish.game_version=1.20.1 +publish.dependencies_list=\ + carpet@1.20-1.4.112+v230608(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.16.3(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.20.2-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.20.2-fabric/gradle.properties index 116369ea..72e3579b 100644 --- a/magiclib-legacy-compat/versions/1.20.2-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.20.2-fabric/gradle.properties @@ -8,3 +8,6 @@ dependencies.api.carpet_version=1.20.2-1.4.119+v230928 # Publish properties publish.game_version=1.20.2 +publish.dependencies_list=\ + carpet@1.20.2-1.4.119+v230928(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.17.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.20.4-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.20.4-fabric/gradle.properties index 8426fd86..d1a0f5fb 100644 --- a/magiclib-legacy-compat/versions/1.20.4-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.20.4-fabric/gradle.properties @@ -7,4 +7,7 @@ dependencies.minecraft_version=1.20.4 dependencies.api.carpet_version=1.20.3-1.4.128+v231205 # Publish properties -publish.game_version=1.20.3\n1.20.4 +publish.game_version=1.20.3,1.20.4 +publish.dependencies_list=\ + carpet@1.20.3-1.4.128+v231205(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.18.1(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.20.6-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.20.6-fabric/gradle.properties index 63b3ac92..610a0372 100644 --- a/magiclib-legacy-compat/versions/1.20.6-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.20.6-fabric/gradle.properties @@ -7,4 +7,7 @@ dependencies.minecraft_version=1.20.6 dependencies.api.carpet_version=1.20.6-1.4.141+v240429 # Publish properties -publish.game_version=1.20.5\n1.20.6 +publish.game_version=1.20.5,1.20.6 +publish.dependencies_list=\ + carpet@1.20.6-1.4.141+v240429(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.19.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.21.1-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.21.1-fabric/gradle.properties index 89cb340d..a22c6892 100644 --- a/magiclib-legacy-compat/versions/1.21.1-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.21.1-fabric/gradle.properties @@ -7,4 +7,7 @@ dependencies.minecraft_version=1.21.1 dependencies.api.carpet_version=1.21-1.4.147+v240613 # Publish properties -publish.game_version=1.21\n1.21.1 +publish.game_version=1.21,1.21.1 +publish.dependencies_list=\ + carpet@1.21-1.4.147+v240613(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.20.2(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties b/magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties index 0b50902c..aba45dcb 100644 --- a/magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties +++ b/magiclib-legacy-compat/versions/1.21.3-fabric/gradle.properties @@ -7,4 +7,7 @@ dependencies.minecraft_version=1.21.3 dependencies.api.carpet_version=1.21.2-1.4.158+v241022 # Publish properties -publish.game_version=1.21.2\n1.21.3 +publish.game_version=1.21.2,1.21.3 +publish.dependencies_list=\ + carpet@1.21.2-1.4.158+v241022(optional){modrinth:TQTTVgYE}{curseforge:349239}#(ignore:github),\ + malilib@0.22.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.14.4-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.14.4-fabric/gradle.properties index 0ba75179..070accfd 100644 --- a/magiclib-malilib-extra/versions/1.14.4-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.14.4-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=0.10.0-dev.20+arne.2 # Publish properties publish.game_version=1.14.4 +publish.dependencies_list=\ + malilib@0.10.0-dev.20+arne.2(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.15.2-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.15.2-fabric/gradle.properties index bc9466c6..fc389f66 100644 --- a/magiclib-malilib-extra/versions/1.15.2-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.15.2-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=0.10.0-dev.21+arne.3 # Publish properties publish.game_version=1.15.2 +publish.dependencies_list=\ + malilib@0.10.0-dev.21+arne.3(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.16.5-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.16.5-fabric/gradle.properties index 2484a346..7fbbadc2 100644 --- a/magiclib-malilib-extra/versions/1.16.5-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.16.5-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=0.10.0-dev.21+arne.8 # Publish properties publish.game_version=1.16.5 +publish.dependencies_list=\ + malilib@0.10.0-dev.21+arne.8(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.17.1-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.17.1-fabric/gradle.properties index b72227d7..cfc5ed7f 100644 --- a/magiclib-malilib-extra/versions/1.17.1-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.17.1-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=HljUtdhE # Publish properties publish.game_version=1.17.1 +publish.dependencies_list=\ + malilib@0.10.0-dev.26(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.17.1-forge/gradle.properties b/magiclib-malilib-extra/versions/1.17.1-forge/gradle.properties index 6bd3d1b1..420d6730 100644 --- a/magiclib-malilib-extra/versions/1.17.1-forge/gradle.properties +++ b/magiclib-malilib-extra/versions/1.17.1-forge/gradle.properties @@ -12,3 +12,5 @@ loom.platform=forge # Publish properties publish.game_version=1.17.1 +publish.dependencies_list=\ + mafglib@0.1.6-mc1.17.1(optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.18.2-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.18.2-fabric/gradle.properties index cc843bf7..ba1670e5 100644 --- a/magiclib-malilib-extra/versions/1.18.2-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.18.2-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=0.12.1 # Publish properties publish.game_version=1.18.2 +publish.dependencies_list=\ + malilib@0.12.1(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.18.2-forge/gradle.properties b/magiclib-malilib-extra/versions/1.18.2-forge/gradle.properties index d21ce3f7..a3ee96ec 100644 --- a/magiclib-malilib-extra/versions/1.18.2-forge/gradle.properties +++ b/magiclib-malilib-extra/versions/1.18.2-forge/gradle.properties @@ -12,3 +12,5 @@ loom.platform=forge # Publish properties publish.game_version=1.18.2 +publish.dependencies_list=\ + mafglib@0.1.14-mc1.18.2(optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.19.2-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.19.2-fabric/gradle.properties index 126bbda6..9ea595ce 100644 --- a/magiclib-malilib-extra/versions/1.19.2-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.19.2-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=0.13.0 # Publish properties publish.game_version=1.19.2 +publish.dependencies_list=\ + malilib@0.13.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.19.3-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.19.3-fabric/gradle.properties index 35dc7519..24a04451 100644 --- a/magiclib-malilib-extra/versions/1.19.3-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.19.3-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=0.14.1-pre.1 # Publish properties publish.game_version=1.19.3 +publish.dependencies_list=\ + malilib@0.14.1-pre.1(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.19.4-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.19.4-fabric/gradle.properties index 3357cfcf..0c9903ce 100644 --- a/magiclib-malilib-extra/versions/1.19.4-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.19.4-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=0.15.4 # Publish properties publish.game_version=1.19.4 +publish.dependencies_list=\ + malilib@0.15.4(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.19.4-forge/gradle.properties b/magiclib-malilib-extra/versions/1.19.4-forge/gradle.properties index ce85eaa2..c3fbb71e 100644 --- a/magiclib-malilib-extra/versions/1.19.4-forge/gradle.properties +++ b/magiclib-malilib-extra/versions/1.19.4-forge/gradle.properties @@ -11,4 +11,6 @@ dependencies.api.malilib_version=0.1.11-mc1.19.4 loom.platform=forge # Publish properties -publish.game_version=1.18.2 +publish.game_version=1.19.4 +publish.dependencies_list=\ + mafglib@0.1.11-mc1.19.4(optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.20.1-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.20.1-fabric/gradle.properties index e584e356..6710c656 100644 --- a/magiclib-malilib-extra/versions/1.20.1-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.20.1-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=0.16.3 # Publish properties publish.game_version=1.20.1 +publish.dependencies_list=\ + malilib@0.16.3(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.20.2-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.20.2-fabric/gradle.properties index e34bfe8a..86358a0b 100644 --- a/magiclib-malilib-extra/versions/1.20.2-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.20.2-fabric/gradle.properties @@ -8,3 +8,5 @@ dependencies.api.malilib_version=0.17.0 # Publish properties publish.game_version=1.20.2 +publish.dependencies_list=\ + malilib@0.17.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.20.4-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.20.4-fabric/gradle.properties index a3992a6c..680915d5 100644 --- a/magiclib-malilib-extra/versions/1.20.4-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.20.4-fabric/gradle.properties @@ -7,4 +7,6 @@ dependencies.minecraft_version=1.20.4 dependencies.api.malilib_version=0.18.1 # Publish properties -publish.game_version=1.20.3\n1.20.4 +publish.game_version=1.20.3,1.20.4 +publish.dependencies_list=\ + malilib@0.18.1(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.20.6-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.20.6-fabric/gradle.properties index 95750e19..20f15128 100644 --- a/magiclib-malilib-extra/versions/1.20.6-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.20.6-fabric/gradle.properties @@ -7,4 +7,6 @@ dependencies.minecraft_version=1.20.6 dependencies.api.malilib_version=0.19.0 # Publish properties -publish.game_version=1.20.5\n1.20.6 +publish.game_version=1.20.5,1.20.6 +publish.dependencies_list=\ + malilib@0.19.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.20.6-neoforge/gradle.properties b/magiclib-malilib-extra/versions/1.20.6-neoforge/gradle.properties index 0af89edf..5bc7d76b 100644 --- a/magiclib-malilib-extra/versions/1.20.6-neoforge/gradle.properties +++ b/magiclib-malilib-extra/versions/1.20.6-neoforge/gradle.properties @@ -16,3 +16,5 @@ loom.platform=neoforge # Publish properties publish.game_version=1.20.6 +publish.dependencies_list=\ + mafglib@0.1.15-mc1.20.6(optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.21.1-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.21.1-fabric/gradle.properties index 5715406b..ceb51a69 100644 --- a/magiclib-malilib-extra/versions/1.21.1-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.21.1-fabric/gradle.properties @@ -7,4 +7,6 @@ dependencies.minecraft_version=1.21.1 dependencies.api.malilib_version=0.20.2 # Publish properties -publish.game_version=1.21\n1.21.1 +publish.game_version=1.21,1.21.1 +publish.dependencies_list=\ + malilib@0.20.2(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.21.1-neoforge/gradle.properties b/magiclib-malilib-extra/versions/1.21.1-neoforge/gradle.properties index 7186e87d..9c226377 100644 --- a/magiclib-malilib-extra/versions/1.21.1-neoforge/gradle.properties +++ b/magiclib-malilib-extra/versions/1.21.1-neoforge/gradle.properties @@ -16,3 +16,5 @@ loom.platform=neoforge # Publish properties publish.game_version=1.21.1 +publish.dependencies_list=\ + mafglib@0.1.21-mc1.21(optional){modrinth:SKI34J7B}{curseforge:910766}#(ignore:github) diff --git a/magiclib-malilib-extra/versions/1.21.3-fabric/gradle.properties b/magiclib-malilib-extra/versions/1.21.3-fabric/gradle.properties index e975a9b3..8bc8b8dd 100644 --- a/magiclib-malilib-extra/versions/1.21.3-fabric/gradle.properties +++ b/magiclib-malilib-extra/versions/1.21.3-fabric/gradle.properties @@ -7,4 +7,6 @@ dependencies.minecraft_version=1.21.3 dependencies.api.malilib_version=1.21.3-0.22.0-sakura.2 # Publish properties -publish.game_version=1.21.2\n1.21.3 +publish.game_version=1.21.2,1.21.3 +publish.dependencies_list=\ + malilib@0.22.0(optional){modrinth:GcWjdA9I}{curseforge:303119}#(ignore:github) diff --git a/magiclib-minecraft-api/versions/1.14.4-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.14.4-fabric/gradle.properties index 937c9f99..427a99ea 100644 --- a/magiclib-minecraft-api/versions/1.14.4-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.14.4-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.14.4 # Publish properties publish.game_version=1.14.4 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.15.2-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.15.2-fabric/gradle.properties index 98d89ce8..bb48a84c 100644 --- a/magiclib-minecraft-api/versions/1.15.2-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.15.2-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.15.2 # Publish properties publish.game_version=1.15.2 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.16.5-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.16.5-fabric/gradle.properties index 414b17ec..361d8938 100644 --- a/magiclib-minecraft-api/versions/1.16.5-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.16.5-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.16.5 # Publish properties publish.game_version=1.16.5 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.17.1-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.17.1-fabric/gradle.properties index 2208cd92..57df3873 100644 --- a/magiclib-minecraft-api/versions/1.17.1-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.17.1-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.17.1 # Publish properties publish.game_version=1.17.1 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.17.1-forge/gradle.properties b/magiclib-minecraft-api/versions/1.17.1-forge/gradle.properties index c80699de..d334a603 100644 --- a/magiclib-minecraft-api/versions/1.17.1-forge/gradle.properties +++ b/magiclib-minecraft-api/versions/1.17.1-forge/gradle.properties @@ -8,3 +8,4 @@ loom.platform=forge # Publish properties publish.game_version=1.17.1 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.18.2-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.18.2-fabric/gradle.properties index daaa9506..c12724dc 100644 --- a/magiclib-minecraft-api/versions/1.18.2-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.18.2-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.18.2 # Publish properties publish.game_version=1.18.2 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.18.2-forge/gradle.properties b/magiclib-minecraft-api/versions/1.18.2-forge/gradle.properties index 9a9d4658..7f788e8b 100644 --- a/magiclib-minecraft-api/versions/1.18.2-forge/gradle.properties +++ b/magiclib-minecraft-api/versions/1.18.2-forge/gradle.properties @@ -8,3 +8,4 @@ loom.platform=forge # Publish properties publish.game_version=1.18.2 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.19.2-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.19.2-fabric/gradle.properties index de7c2050..a3fb9c8c 100644 --- a/magiclib-minecraft-api/versions/1.19.2-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.19.2-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.19.2 # Publish properties publish.game_version=1.19.2 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.19.3-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.19.3-fabric/gradle.properties index 5d5375fc..72373ef7 100644 --- a/magiclib-minecraft-api/versions/1.19.3-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.19.3-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.19.3 # Publish properties publish.game_version=1.19.3 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.19.4-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.19.4-fabric/gradle.properties index 73eb1188..320f59a0 100644 --- a/magiclib-minecraft-api/versions/1.19.4-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.19.4-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.19.4 # Publish properties publish.game_version=1.19.4 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.19.4-forge/gradle.properties b/magiclib-minecraft-api/versions/1.19.4-forge/gradle.properties index 69569f93..00160b28 100644 --- a/magiclib-minecraft-api/versions/1.19.4-forge/gradle.properties +++ b/magiclib-minecraft-api/versions/1.19.4-forge/gradle.properties @@ -8,3 +8,4 @@ loom.platform=forge # Publish properties publish.game_version=1.19.4 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.20.1-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.20.1-fabric/gradle.properties index 2196f4b1..e9a128eb 100644 --- a/magiclib-minecraft-api/versions/1.20.1-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.20.1-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.20.1 # Publish properties publish.game_version=1.20.1 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.20.2-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.20.2-fabric/gradle.properties index 417f7aa7..26d3f1c6 100644 --- a/magiclib-minecraft-api/versions/1.20.2-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.20.2-fabric/gradle.properties @@ -4,3 +4,4 @@ dependencies.minecraft_version=1.20.2 # Publish properties publish.game_version=1.20.2 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.20.2-neoforge/gradle.properties b/magiclib-minecraft-api/versions/1.20.2-neoforge/gradle.properties index 1c70e689..2fba5d2b 100644 --- a/magiclib-minecraft-api/versions/1.20.2-neoforge/gradle.properties +++ b/magiclib-minecraft-api/versions/1.20.2-neoforge/gradle.properties @@ -7,4 +7,5 @@ dependencies.minecraft_version=1.20.2 loom.platform=neoforge # Publish properties -publish.game_version=1.20.2 \ No newline at end of file +publish.game_version=1.20.2 +publish.dependencies_list= \ No newline at end of file diff --git a/magiclib-minecraft-api/versions/1.20.4-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.20.4-fabric/gradle.properties index ff969fe0..daf577e4 100644 --- a/magiclib-minecraft-api/versions/1.20.4-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.20.4-fabric/gradle.properties @@ -3,4 +3,5 @@ dependencies.minecraft_dependency=>=1.20.3- <1.20.5- dependencies.minecraft_version=1.20.4 # Publish properties -publish.game_version=1.20.3\n1.20.4 +publish.game_version=1.20.3,1.20.4 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.20.6-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.20.6-fabric/gradle.properties index 484168e6..2eac327d 100644 --- a/magiclib-minecraft-api/versions/1.20.6-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.20.6-fabric/gradle.properties @@ -3,4 +3,5 @@ dependencies.minecraft_dependency=>=1.20.5- <1.20.7- dependencies.minecraft_version=1.20.6 # Publish properties -publish.game_version=1.20.5\n1.20.6 +publish.game_version=1.20.5,1.20.6 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.20.6-neoforge/gradle.properties b/magiclib-minecraft-api/versions/1.20.6-neoforge/gradle.properties index 173f9446..e2a18b3c 100644 --- a/magiclib-minecraft-api/versions/1.20.6-neoforge/gradle.properties +++ b/magiclib-minecraft-api/versions/1.20.6-neoforge/gradle.properties @@ -7,4 +7,5 @@ dependencies.minecraft_version=1.20.6 loom.platform=neoforge # Publish properties -publish.game_version=1.20.2 \ No newline at end of file +publish.game_version=1.20.2 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.21.1-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.21.1-fabric/gradle.properties index 4413df1e..f4e68e79 100644 --- a/magiclib-minecraft-api/versions/1.21.1-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.21.1-fabric/gradle.properties @@ -3,4 +3,5 @@ dependencies.minecraft_dependency=>=1.21- <1.21.2- dependencies.minecraft_version=1.21.1 # Publish properties -publish.game_version=1.21\n1.21.1 +publish.game_version=1.21,1.21.1 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.21.1-neoforge/gradle.properties b/magiclib-minecraft-api/versions/1.21.1-neoforge/gradle.properties index 0d4fc732..6c550d4f 100644 --- a/magiclib-minecraft-api/versions/1.21.1-neoforge/gradle.properties +++ b/magiclib-minecraft-api/versions/1.21.1-neoforge/gradle.properties @@ -8,3 +8,4 @@ loom.platform=neoforge # Publish properties publish.game_version=1.21.1 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.21.3-fabric/gradle.properties b/magiclib-minecraft-api/versions/1.21.3-fabric/gradle.properties index d7b05556..c18f08af 100644 --- a/magiclib-minecraft-api/versions/1.21.3-fabric/gradle.properties +++ b/magiclib-minecraft-api/versions/1.21.3-fabric/gradle.properties @@ -3,4 +3,5 @@ dependencies.minecraft_dependency=>=1.21.2- <1.21.4- dependencies.minecraft_version=1.21.3 # Publish properties -publish.game_version=1.21.2\n1.21.3 +publish.game_version=1.21.2,1.21.3 +publish.dependencies_list= diff --git a/magiclib-minecraft-api/versions/1.21.3-neoforge/gradle.properties b/magiclib-minecraft-api/versions/1.21.3-neoforge/gradle.properties index 31f76ccd..07d45b09 100644 --- a/magiclib-minecraft-api/versions/1.21.3-neoforge/gradle.properties +++ b/magiclib-minecraft-api/versions/1.21.3-neoforge/gradle.properties @@ -8,3 +8,4 @@ loom.platform=neoforge # Publish properties publish.game_version=1.21.3 +publish.dependencies_list=