From ab47469bac64e539c1ba41aa5ba8e391af123683 Mon Sep 17 00:00:00 2001
From: Cadiboo <37298044+Cadiboo@users.noreply.github.com>
Date: Fri, 14 Jun 2024 23:51:27 +1000
Subject: [PATCH] Fix publishing

[ci publish]
---
 .github/workflows/build.yml | 26 ++++++++++----------------
 gradle.properties           |  2 +-
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22697d87..a6426d12 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
           path: |
             fabric/build/libs/*.jar
           if-no-files-found: error
-      - name: Integration tests (forge)
+      - name: Integration tests (fabric)
         run: ./gradlew :fabric:runGameTestServer --stacktrace
       - name: Publish
         uses: Kir-Antipov/mc-publish@v3.3
@@ -38,13 +38,10 @@ jobs:
           version-type: beta
           files: fabric/build/libs/*.jar
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          github-commitish: ${{ env.GITHUB_SHA }}
-          github-files-primary: fabric/build/libs/*.jar
-          github-files-secondary: fabric/build/devlibs/*.jar
-          curseforge-id: 309664
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-          modrinth-id: w3bbwFYU
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+#          curseforge-id: 309664
+#          curseforge-token: "secrets.CURSEFORGE_TOKEN"
+#          modrinth-id: w3bbwFYU
+#          modrinth-token: "secrets.MODRINTH_TOKEN"
   build-forge:
     runs-on: ubuntu-latest
     steps:
@@ -85,12 +82,9 @@ jobs:
         if: "contains(github.event.head_commit.message, '[ci publish]')"
         with:
           version-type: beta
-          files: forge/build/libs/!(*-@(dev|sources|javadoc)).jar
+          files: forge/build/libs/!(*-@(sources|dev|dev-shadow|javadoc).jar)
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          github-commitish: ${{ env.GITHUB_SHA }}
-          github-files-primary: forge/build/libs/!(*-@(dev|sources|javadoc)).jar
-          github-files-secondary: forge/build/libs/*-@(dev|sources|javadoc).jar
-          curseforge-id: 309664
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-          modrinth-id: w3bbwFYU
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+#          curseforge-id: 309664
+#          curseforge-token: "secrets.CURSEFORGE_TOKEN"
+#          modrinth-id: w3bbwFYU
+#          modrinth-token: "secrets.MODRINTH_TOKEN"
diff --git a/gradle.properties b/gradle.properties
index 1c5dd861..cacb255e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ minecraft_version=1.20.1
 forge_version=47.2.30
 forge_loader_version_range=[47,)
 forge_version_range=[47,)
-minecraft_version_range=[1.20.1, 1.21)
+minecraft_version_range=[1.20.1,)
 
 # Fabric
 fabric_loader_version=0.15.10