From d88b7e246046c49ae9650f2205cbe0af8d520084 Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Mon, 4 Dec 2023 15:11:01 +0000
Subject: [PATCH] a bit more tweak of build system for mod publish plugin

---
 .github/workflows/main.yml    |  2 ++
 .github/workflows/release.yml | 20 +++-----------------
 build.gradle                  |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2975c10a..05321ef4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,6 +47,8 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           arguments: announceDiscordBuild
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
 #        uses: Ilshidur/action-discord@master
 #        env:
 #          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a27df796..fa004b00 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,27 +50,13 @@ jobs:
           MODMAVEN_PASSWORD: ${{ secrets.MODMAVEN_PASSWORD }}
         with:
           arguments: publishMavenPublicationToModmavenRepository --no-daemon
-      - name: Publish to Modrinth
+      - name: Publish to Curseforge/Modrinth
         uses: gradle/gradle-build-action@v2
         env:
           CHANGELOG: ${{ github.event.release.body }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-          BUILD_NUMBER: ${{ github.run_number }}
-        with:
-          arguments: modrinth --no-daemon
-      - name: Publish to Curseforge
-        uses: gradle/gradle-build-action@v2
-        env:
-          CHANGELOG: ${{ github.event.release.body }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
-          BUILD_NUMBER: ${{ github.run_number }}
-        with:
-          arguments: curseforge --no-daemon
-      - name: Discord notification
-        uses: Ilshidur/action-discord@master
-        env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        if:
-          env.DISCORD_WEBHOOK != null
+          BUILD_NUMBER: ${{ github.run_number }}
         with:
-          args: 'Release ${{ github.event.release.tag_name }} done for project {{ EVENT_PAYLOAD.repository.full_name }} (Minecraft ${{ steps.mod_meta.outputs.mc_version}}): ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.'
\ No newline at end of file
+          arguments: publishMods --no-daemon
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 42f15226..f60566f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -204,7 +204,7 @@ publishMods {
     version = mod_version
     type = getReleaseType(relType)
     file = jar.archiveFile
-    displayName = mod_name
+    displayName = "${mod_name} ${mod_version} MC-${minecraft_version}"
     modLoaders.add("neoforge")
 
     curseforge {