diff --git a/.github/workflows/build_and_publish.yaml b/.github/workflows/build_and_publish.yaml index 70bf87e80..bc96ca062 100644 --- a/.github/workflows/build_and_publish.yaml +++ b/.github/workflows/build_and_publish.yaml @@ -76,21 +76,33 @@ jobs: branch: version/1.18 commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' file_pattern: CHANGELOG.md - - name: Upload to Curseforge - id: curseforge + - name: Upload to Mod Platforms uses: itsmeow/curseforge-upload@master - if: ${{ steps.get_release_type.outputs.result != 'test' }} with: - token: ${{ secrets.CURSEFORGE_API_KEY }} - project_id: 361026 - game_endpoint: minecraft - file_path: ./build/libs/occultism-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}.jar + modrinth-id: sbJh4AZw + modrinth-token: ${{ secrets.MODRINTH_API_KEY }} + curseforge-id: 361026 + curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }} + + files: | + build/libs/occultism-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}.jar + + name: occultism-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}.jar + version: ${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }} + version-type: ${{ steps.get_release_type.outputs.result }} + game-versions: | + ${{ steps.get_mc_version.outputs.result }} changelog: |- - [Changelog] ${{ steps.changelog.outputs.changes }} - + Find changes for all versions at https://github.com/klikli-dev/occultism/releases - game_versions: Forge,Minecraft 1.18:${{ steps.get_mc_version.outputs.result }} - display_name: occultism-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}.jar - release_type: ${{ steps.get_release_type.outputs.result }} - relations: modonomicon:requiredDependency,curios:requiredDependency,geckolib:requiredDependency,smartbrainlib:requiredDependency,theurgy:optionalDependency,jei:optionalDependency,almost-unified:optionalDependency \ No newline at end of file + dependencies: | + forge(required) + modonomicon(required) + curios(required) + geckolib(required) + smartbrainlib(required) + theurgy(optional) + jei(optional) + almost-unified(optional) + perviaminvenire(optional) diff --git a/build.gradle b/build.gradle index 6abf89662..d582e6e77 100644 --- a/build.gradle +++ b/build.gradle @@ -21,11 +21,13 @@ apply plugin: 'org.parchmentmc.librarian.forgegradle' apply plugin: 'idea' apply plugin: 'maven-publish' -if (System.getenv('VERSION') != null) { - version = System.getenv('VERSION') -} else { - version = "${mc_version}-${mod_version}" +if (System.getenv('MOD_VERSION') != null) { + mod_version = System.getenv('MOD_VERSION') } +if (System.getenv('MINECRAFT_VERSION') != null) { + mc_version = System.getenv('MINECRAFT_VERSION') +} +version = "${mc_version}-${mod_version}" group = "com.github.klikli_dev" archivesBaseName = "occultism" @@ -245,4 +247,4 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -processResources.setDuplicatesStrategy(DuplicatesStrategy.WARN) \ No newline at end of file +processResources.setDuplicatesStrategy(DuplicatesStrategy.WARN)