Merge remote-tracking branch 'upstream/1.21.8' into 1.21.8

Author: cev-api

.github/workflows/publish.yml

@@ -82,26 +82,29 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
       run: ./gradlew closeMilestone --stacktrace --no-configuration-cache
 
+    - name: Build website update inputs
+      id: website_inputs
+      if: ${{ inputs.update_website }}
+      run: |
+        echo "wurst_version=$(grep '^mod_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r' | sed 's/^v//' | sed 's/-MC.*$//')" >> "$GITHUB_OUTPUT"
+        echo "mc_version=$(grep '^minecraft_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
+        echo "fapi_version=$(grep '^fabric_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
+
     - name: Upload backups
       if: ${{ inputs.upload_backups }}
-      env:
-        WI_BACKUPS_API_KEY: ${{ secrets.WI_BACKUPS_API_KEY }}
-      run: ./gradlew uploadBackups --stacktrace --no-configuration-cache
+      uses: Wurst-Imperium/upload-backups@v1
+      with:
+        api_key: ${{ secrets.WI_BACKUPS_API_KEY }}
+        project: Wurst
+        version: ${{ steps.website_inputs.outputs.wurst_version }}
+        path: build/libs/*.jar
 
     - name: Publish to GitHub
       if: ${{ inputs.publish_github }}
       env:
         GITHUB_TOKEN: ${{ secrets.OLD_MCX_PUBLISH_TOKEN }}
       run: ./gradlew github --stacktrace --no-configuration-cache
 
-    - name: Build website update inputs
-      id: website_inputs
-      if: ${{ inputs.update_website }}
-      run: |
-        echo "wurst_version=$(grep '^mod_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r' | sed 's/^v//' | sed 's/-MC.*$//')" >> "$GITHUB_OUTPUT"
-        echo "mc_version=$(grep '^minecraft_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
-        echo "fapi_version=$(grep '^fabric_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
-
     - name: Trigger website update
       if: ${{ inputs.update_website }}
       uses: Wurst-Imperium/dispatch-and-wait@v1

build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
 	id "fabric-loom" version "${loom_version}"
-	id "com.diffplug.spotless" version "8.0.0"
+	id "com.diffplug.spotless" version "8.1.0"
 }
 
 def ENV = System.getenv()
@@ -339,60 +339,3 @@ task closeMilestone {
 		}
 	}
 }
-
-task uploadBackups {
-	dependsOn build
-	
-	onlyIf {
-		ENV.WI_BACKUPS_API_KEY
-	}
-	
-	doLast {
-		def shortVersion = getGhVersion().substring(1)
-		def backupUrl = "https://api.wurstclient.net/artifact-backups/Wurst/${shortVersion}"
-		
-		def maxRetries = 3
-		def retryCount = 0
-		def success = false
-		
-		while (!success && retryCount < maxRetries) {
-			try {
-				def connection = new URL(backupUrl).openConnection() as HttpURLConnection
-				def boundary = UUID.randomUUID().toString()
-				connection.setRequestMethod("POST")
-				connection.setRequestProperty("X-API-Key", ENV.WI_BACKUPS_API_KEY)
-				connection.setRequestProperty("Accept", "application/json")
-				connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=$boundary")
-				connection.doOutput = true
-				
-				def output = connection.outputStream
-				[remapJar, remapSourcesJar].each { jarTask ->
-					def file = jarTask.archiveFile.get().asFile
-					output << "--${boundary}\r\n"
-					output << "Content-Disposition: form-data; name=\"files\"; filename=\"${file.name}\"\r\n"
-					output << "Content-Type: application/java-archive\r\n\r\n"
-					file.withInputStream { input -> 
-						output << input
-					}
-					output << "\r\n"
-				}
-				output << "--${boundary}--\r\n"
-				output.flush()
-				
-				if(connection.responseCode != 200) {
-					throw new IOException("HTTP ${connection.responseCode}: ${connection.responseMessage}")
-				}
-				
-				success = true
-				
-			} catch (Exception e) {
-				retryCount++
-				if (retryCount >= maxRetries) {
-					throw new GradleException("Failed to upload backups after ${maxRetries} attempts: ${e.message}")
-				}
-				println "Upload attempt ${retryCount} failed: ${e.message}. Retrying in 5 seconds..."
-				Thread.sleep(5000)
-			}
-		}
-	}
-}