Merge branch 'master' into 1.21.10

Author: Alexander01998

.github/workflows/auto_snapshot_update.yml

@@ -34,7 +34,7 @@ jobs:
       run: echo ${{ inputs.distinct_id }}
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Python 3.12
       uses: actions/setup-python@v6

.github/workflows/check_translations.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Check translations
       uses: Wurst-Imperium/check-translations@v1

.github/workflows/dependency_graph.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Java 21
       uses: actions/setup-java@v5

.github/workflows/gradle.yml

@@ -35,7 +35,7 @@ jobs:
       run: echo ${{ inputs.distinct_id }}
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Java 21
       uses: actions/setup-java@v5

.github/workflows/publish.yml

@@ -42,7 +42,7 @@ jobs:
       run: echo ${{ inputs.distinct_id }}
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         # Include all tags in case the new tag already exists.
         fetch-tags: true
@@ -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()
@@ -68,6 +68,10 @@ loom {
 	accessWidenerPath = file("src/main/resources/wurst.accesswidener")
 
 	runs {
+		clientWithMods {
+			inherit client
+		}
+
 		clientGameTestWithMods {
 			inherit client
 			source = sourceSets.gametest
@@ -89,6 +93,20 @@ dependencies {
 	testMods "maven.modrinth:sodium:${project.sodium_version}"
 }
 
+def cleanClientWithMods = tasks.register("cleanClientWithMods", Delete) {
+	delete "run/mods"
+}
+
+def prepareClientWithMods = tasks.register("prepareClientWithMods", Sync) {
+	from configurations.testMods
+	into "run/mods"
+}
+
+tasks.named("runClientWithMods") {
+	dependsOn prepareClientWithMods
+	finalizedBy cleanClientWithMods
+}
+
 def cleanClientGameTestWithMods = tasks.register("cleanClientGameTestWithMods", Delete) {
 	delete layout.buildDirectory.dir("run/clientGameTestWithMods")
 }
@@ -247,60 +265,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)
-			}
-		}
-	}
-}

gradle.properties

@@ -8,14 +8,14 @@ org.gradle.configuration-cache=true
 # https://modrinth.com/mod/fabric-api/versions
 minecraft_version=1.21.10
 yarn_mappings=1.21.10+build.2
-loader_version=0.17.3
+loader_version=0.18.1
 loom_version=1.13-SNAPSHOT
 
 # Fabric API
 fabric_version=0.138.3+1.21.10
 
 # Mod Properties
-mod_version=v7.51.1-MC1.21.10
+mod_version=v7.51.2-MC1.21.10
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric
@@ -26,5 +26,5 @@ mcx_repo_id=Wurst-Imperium/Wurst-MCX2
 
 # Dependencies
 # check at https://modrinth.com/mod/sodium/versions?l=fabric&g=1.21.10
-sodium_version=mc1.21.10-0.7.2-fabric
+sodium_version=mc1.21.10-0.7.3-fabric
 do_mod_compat_test=true

src/gametest/java/net/wurstclient/gametest/WurstTest.java

@@ -89,8 +89,7 @@ private void testInWorld(ClientGameTestContext context,
 		world.waitForChunksRender();
 
 		assertScreenshotEquals(context, "in_game",
-			IS_MOD_COMPAT_TEST ? "https://i.imgur.com/VxbGFrb.png"
-				: "https://i.imgur.com/EfzN9Cd.png");
+			"https://i.imgur.com/EfzN9Cd.png");
 
 		LOGGER.info("Recording debug menu");
 		input.pressKey(GLFW.GLFW_KEY_F3);

src/gametest/java/net/wurstclient/gametest/tests/FreecamHackTest.java

@@ -41,16 +41,14 @@ public static void testFreecamHack(ClientGameTestContext context,
 		input.holdKeyFor(GLFW.GLFW_KEY_S, 2);
 		input.holdKeyFor(GLFW.GLFW_KEY_SPACE, 1);
 		assertScreenshotEquals(context, "freecam_moved",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/oZUpI8c.png"
-				: "https://i.imgur.com/pZDlYfH.png");
+			"https://i.imgur.com/pZDlYfH.png");
 		clearChat(context);
 
 		// Enable tracer
 		runWurstCommand(context, "setcheckbox Freecam tracer on");
 		context.waitTick();
 		assertScreenshotEquals(context, "freecam_tracer",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/teKaxAK.png"
-				: "https://i.imgur.com/jYqDFzE.png");
+			"https://i.imgur.com/jYqDFzE.png");
 		clearChat(context);
 
 		// Clean up

src/gametest/java/net/wurstclient/gametest/tests/XRayHackTest.java

@@ -38,8 +38,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_default",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/02KZHLm.png"
-				: "https://i.imgur.com/Dftamqv.png");
+			"https://i.imgur.com/Dftamqv.png");
 
 		// Exposed only
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
@@ -48,8 +47,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_exposed_only",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/xplrJwM.png"
-				: "https://i.imgur.com/QlEpQTu.png");
+			"https://i.imgur.com/QlEpQTu.png");
 
 		// Opacity mode
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed off");
@@ -58,8 +56,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_opacity",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/MFc821z.png"
-				: "https://i.imgur.com/0nLulJn.png");
+			"https://i.imgur.com/0nLulJn.png");
 
 		// Exposed only + opacity
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
@@ -68,8 +65,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_X);
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_exposed_only_opacity",
-			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/GRHgW6P.png"
-				: "https://i.imgur.com/noPWDUl.png");
+			"https://i.imgur.com/noPWDUl.png");
 
 		// Clean up
 		runCommand(server, "fill ~-5 ~-2 ~5 ~5 ~5 ~7 air");