From 40f8527122ab86521cd77f6d6af954ee52c77fa8 Mon Sep 17 00:00:00 2001
From: CheaterCodes <cheater.codes@outlook.com>
Date: Tue, 12 Apr 2022 00:42:51 +0200
Subject: [PATCH] Allow publishing experimental versions from a zip url

---
 .../generate-and-publish-experimental.yml     | 32 +++++++++++++++++++
 .../generate-and-publish-snapshot.yml         | 26 ---------------
 build.gradle                                  |  2 ++
 gradle.properties                             |  1 +
 4 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 .github/workflows/generate-and-publish-experimental.yml
 delete mode 100644 .github/workflows/generate-and-publish-snapshot.yml

diff --git a/.github/workflows/generate-and-publish-experimental.yml b/.github/workflows/generate-and-publish-experimental.yml
new file mode 100644
index 0000000..138ee6d
--- /dev/null
+++ b/.github/workflows/generate-and-publish-experimental.yml
@@ -0,0 +1,32 @@
+name: "Generate and publish"
+on:
+  workflow_dispatch:
+    inputs:
+      url:
+        description: "URL to the zip containing the Minecraft version json"
+        required: true
+
+jobs:
+  generate-and-publish:
+    name: Generate and publish for Minecraft ${{ github.event.inputs.version }}
+    runs-on: ubuntu-latest
+    container:
+      image: openjdk:16-jdk
+      options: --user root
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Generate and publish mappings
+        run: ./gradlew publish -PversionZipUrl="${{ github.event.inputs.url }}" --stacktrace
+        env:
+          MAVEN_URL: ${{ secrets.MAVEN_URL }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      - name: Refresh Meta
+        uses: fjogeleit/http-request-action@master
+        with:
+          url: ${{ secrets.META_UPDATE_URL }}
+          method: 'GET'
+          preventFailureOnNoResponse: true
diff --git a/.github/workflows/generate-and-publish-snapshot.yml b/.github/workflows/generate-and-publish-snapshot.yml
deleted file mode 100644
index b7269e8..0000000
--- a/.github/workflows/generate-and-publish-snapshot.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: "Generate and publish to Snapshot Repository"
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Minecraft version from the version manifest"
-        required: true
-
-jobs:
-  generate-and-publish:
-    name: Generate and publish for Minecraft ${{ github.event.inputs.version }}
-    runs-on: ubuntu-latest
-    container:
-      image: openjdk:16-jdk
-      options: --user root
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: Generate and publish mappings
-        run: ./gradlew publish -PminecraftVersion="${{ github.event.inputs.version }}" --stacktrace
-        env:
-          SNAPSHOTS_URL: ${{ secrets.SNAPSHOTS_URL }}
-          SNAPSHOTS_USERNAME: ${{ secrets.SNAPSHOTS_USERNAME }}
-          SNAPSHOTS_PASSWORD: ${{ secrets.SNAPSHOTS_PASSWORD }}
diff --git a/build.gradle b/build.gradle
index f5a540f..a85c21a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,6 +70,8 @@ dependencies {
 
 if (!versionJsonUrl.isEmpty()) {
     tasks.getByName("run").setArgs(["--json", versionJsonUrl])
+} else if (!versionZipUrl.isEmpty()) {
+    tasks.getByName("run").setArgs(["--zip", versionZipUrl])
 } else {
     tasks.getByName("run").setArgs(["--version", minecraftVersion])
 }
diff --git a/gradle.properties b/gradle.properties
index 595ccf3..2c43780 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
 # Dummy variables. Pass the actual value via -P<variable>="<value>"
 minecraftVersion =
 versionJsonUrl =
+versionZipUrl =