From 6269f6e13513beb93cdc84b3fcbbfacd9762ba79 Mon Sep 17 00:00:00 2001
From: Manuel Sabogal <mfer32@gmail.com>
Date: Sat, 26 Oct 2024 04:08:32 +0200
Subject: [PATCH] Publish action fixes

---
 .github/workflows/publish.yml | 46 ++++++++---------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 57ad39c..3840883 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -13,8 +13,11 @@ on:
                 required: true
             java_version:
                 description: "Java Version"
-                type: number
-                default: 21
+                type: choice
+                options:
+                - "21"
+                - "17"
+                default: "21"
                 required: true
 
 permissions:
@@ -33,7 +36,7 @@ jobs:
               uses: actions/setup-java@v2
               with:
                   distribution: "temurin"
-                  java-version: 21
+                  java-version: ${{ inputs.java_version }}
 
             - name: Make Gradle Wrapper Executable
               if: ${{ runner.os != 'Windows' }}
@@ -54,9 +57,7 @@ jobs:
                   version: "${{ inputs.mod_version }}"
                   version-type: release
 
-                  files: |
-                    "*/build/libs/skin_changer-{fabric,forge,neoforge,quilt,rift}-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}.jar"
-                    "build/libs/skin_changer-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}.jar"
+                  files: "*/build/libs/skin_changer-{fabric,forge,neoforge,quilt,rift}-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}.jar"
 
                   java: "${{ inputs.java_version }}"
 
@@ -71,7 +72,7 @@ jobs:
 
                   github-generate-changelog: true
 
-                  name: "skin_changer-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}"
+                  name: "skin_changer-fabric-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}"
                   version: "${{ inputs.mod_version }}"
                   version-type: release
 
@@ -79,9 +80,7 @@ jobs:
 
                   java: "${{ inputs.java_version }}"
 
-                  fail-mode: skip
-
-            - name: Publish Forge (CurseForge/Modrinth)
+            - name: Publish NeoForge (CurseForge/Modrinth)
               uses: Kir-Antipov/mc-publish@v3.3.0
               with:
                   curseforge-id: 378549
@@ -92,35 +91,10 @@ jobs:
 
                   github-generate-changelog: true
 
-                  name: "skin_changer-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}"
-                  version: "${{ inputs.mod_version }}"
-                  version-type: release
-
-                  files: |
-                    "forge/build/libs/skin_changer-forge-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}.jar"
-                    "build/libs/skin_changer-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}.jar"
-
-                  java: "${{ inputs.java_version }}"
-
-                  fail-mode: skip
-
-            - name: Publish Neoforge (CurseForge/Modrinth)
-              uses: Kir-Antipov/mc-publish@v3.3.0
-              with:
-                  curseforge-id: 378549
-                  curseforge-token: "${{ secrets.CURSEFORGE_TOKEN }}"
-
-                  modrinth-id: 5jVtTQGY
-                  modrinth-token: "${{ secrets.MODRINTH_TOKEN }}"
-
-                  github-generate-changelog: true
-
-                  name: "skin_changer-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}"
+                  name: "skin_changer-neoforge-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}"
                   version: "${{ inputs.mod_version }}"
                   version-type: release
 
                   files: "neoforge/build/libs/skin_changer-neoforge-${{ inputs.minecraft_version }}-${{ inputs.mod_version }}.jar"
 
                   java: "${{ inputs.java_version }}"
-
-                  fail-mode: skip