From a028f3d45e59a2257dc6070c631b3c9412da4061 Mon Sep 17 00:00:00 2001
From: Aurocosh <Aurocosh@gmail.com>
Date: Tue, 18 Jun 2024 21:36:40 +0700
Subject: [PATCH] Added missing optional dependency on Modrinth

---
 .github/workflows/gradle.yml | 48 +++++++-----------------------------
 1 file changed, 9 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index dd2d07f4..6ee6de61 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -44,21 +44,7 @@ jobs:
       id: build
       run: ./gradlew build
 
-    - name: Publish mod on Github (Optional)
-      if: ${{ steps.build.outputs.publish_mod == 'true' }}
-      uses: Kir-Antipov/mc-publish@v3.3
-      with:
-        changelog: ${{ github.event.head_commit.message }}
-        files: build/libs/!(*-@(dev|sources|all)).jar
-
-        # GitHub publishing
-        github-tag: ${{ steps.build.outputs.github_tag }}
-        github-generate-changelog: true
-        github-prerelease: false
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-    # Separate CurseForge and Modrinth uploads due to dependency difference
-    - name: Publish mod on CurseForge (Optional)
+    - name: Publish mod on CurseForge, Modrinth and Github (Optional)
       if: ${{ steps.build.outputs.publish_mod == 'true' }}
       uses: Kir-Antipov/mc-publish@v3.3
       with:
@@ -71,10 +57,6 @@ jobs:
         changelog: ${{ github.event.head_commit.message }}
         files: build/libs/!(*-@(dev|sources|all)).jar
 
-        # CurseForge publishing
-        curseforge-id: 322571
-        curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-
         dependencies: |
           forgelin-continuous(required)
           patchouli(required)
@@ -83,31 +65,19 @@ jobs:
           mtlib(optional)
           max-potion-id-extender(optional)
 
-      # Separate CurseForge and Modrinth uploads due to dependency difference
-    - name: Publish mod on Modrinth (Optional)
-      if: ${{ steps.build.outputs.publish_mod == 'true' }}
-      uses: Kir-Antipov/mc-publish@v3.3
-      with:
-        loaders: forge
-        name: ${{ steps.build.outputs.name }}
-        version: ${{ steps.build.outputs.version }}
-        version-type: ${{ steps.build.outputs.release_type }}
-        game-versions: 1.12.2
-        java: Java 1.8
-        changelog: ${{ github.event.head_commit.message }}
-        files: build/libs/!(*-@(dev|sources|all)).jar
+        # CurseForge publishing
+        curseforge-id: 322571
+        curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
         # Modrinth publishing
         modrinth-id: rT6tg86B
         modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
 
-        dependencies: |
-          forgelin-continuous(required)
-          patchouli(required)
-          jei(optional)
-          crafttweaker(optional)
-          mtlib(optional)
-#          max-potion-id-extender(optional) # Not available on Modrinth at the moment
+        # GitHub publishing
+        github-tag: ${{ steps.build.outputs.github_tag }}
+        github-generate-changelog: true
+        github-prerelease: false
+        github-token: ${{ secrets.GITHUB_TOKEN }}
 
     # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
     # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.