Merge branch 'master' into 1.21.11

Author: Alexander01998

.github/workflows/publish.yml

@@ -16,6 +16,14 @@ on:
         description: "Publish to GitHub"
         type: boolean
         default: true
+      publish_curseforge:
+        description: "Dummy input. Does nothing."
+        type: boolean
+        default: false
+      publish_modrinth:
+        description: "Dummy input. Does nothing."
+        type: boolean
+        default: false
       update_website:
         description: "Update WurstClient.net post (only works if there already is one)"
         type: boolean

.github/workflows/update_modrinth_deps.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ["master", "1.21.11"]
+        branch: ["26.2", "master", "1.21.11"]
     steps:
       - name: Update Modrinth Dependencies
         uses: Wurst-Imperium/update-modrinth-deps@v1

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -46,7 +46,7 @@ public SingleplayerTest(ClientGameTestContext context,
 	public final void run()
 	{
 		runImpl();
-		assertScreenshotEquals(
+		waitForScreenshotMatch(
 			getClass().getSimpleName().toLowerCase() + "_cleanup",
 			"https://i.imgur.com/i2Nr9is.png");
 	}
@@ -131,6 +131,13 @@ protected final void assertScreenshotEquals(String fileName,
 			templateUrl);
 	}
 
+	protected final void waitForScreenshotMatch(String fileName,
+		String templateUrl)
+	{
+		WurstClientTestHelper.waitForScreenshotMatch(context, fileName,
+			templateUrl);
+	}
+	
 	protected final void failWithScreenshot(String fileName, String title,
 		String errorMessage)
 	{

gradlew

@@ -53,31 +53,62 @@ public static void assertScreenshotEquals(ClientGameTestContext context,
 		String fileName, String templateUrl)
 	{
 		ThreadingImpl.checkOnGametestThread("assertScreenshotEquals");
+		waitForScreenshotMatchImpl(context, fileName, templateUrl, 1);
+	}
+	
+	/**
+	 * Same as
+	 * {@link #assertScreenshotEquals(ClientGameTestContext, String, String)},
+	 * but retries for up to 10 seconds to get a matching screenshot.
+	 *
+	 * <p>
+	 * Useful for cases where you're waiting for recent movements to settle
+	 * (e.g. chunk reloads, hand animation), where it can otherwise be tricky to
+	 * get the timing right. Not useful for anything that's still in motion,
+	 * where delaying the screenshot would only cause it to drift further away
+	 * from the expected image.
+	 */
+	public static void waitForScreenshotMatch(ClientGameTestContext context,
+		String fileName, String templateUrl)
+	{
+		ThreadingImpl.checkOnGametestThread("waitForScreenshotMatch");
+		waitForScreenshotMatchImpl(context, fileName, templateUrl,
+			ClientGameTestContext.DEFAULT_TIMEOUT);
+	}
+	
+	private static void waitForScreenshotMatchImpl(
+		ClientGameTestContext context, String fileName, String templateUrl,
+		int maxAttempts)
+	{
+		NativeImage nativeImageTemplate = downloadImage(templateUrl);
+		boolean[][] mask = alphaChannelToMask(nativeImageTemplate);
+		RawImage<int[]> rawTemplate =
+			RawImageImpl.fromColorNativeImage(nativeImageTemplate);
+		RawImage<int[]> maskedTemplate = applyMask(rawTemplate, mask);
 
-		NativeImage nativeTemplateImage = downloadImage(templateUrl);
-		boolean[][] mask = alphaChannelToMask(nativeTemplateImage);
-		RawImage<int[]> rawTemplateImage =
-			RawImageImpl.fromColorNativeImage(nativeTemplateImage);
-		RawImage<int[]> maskedTemplateImage = applyMask(rawTemplateImage, mask);
-		
-		Path screenshotPath = context.takeScreenshot(fileName);
-		RawImage<int[]> rawScreenshotImage =
-			RawImageImpl.fromColorNativeImage(loadImageFile(screenshotPath));
-		RawImage<int[]> maskedScreenshotImage =
-			applyMask(rawScreenshotImage, mask);
-		
-		if(maskedScreenshotImage.width() != maskedTemplateImage.width()
-			|| maskedScreenshotImage.height() != maskedTemplateImage.height())
-			throw new AssertionError(
-				"Screenshot and template dimensions do not match");
-		
-		TestScreenshotComparisonAlgorithm algo =
-			TestScreenshotComparisonAlgorithm.meanSquaredDifference(3e-4F);
-		
-		Vector2i result =
-			algo.findColor(maskedScreenshotImage, maskedTemplateImage);
-		if(result != null)
-			return;
+		Path screenshotPath = null;
+		for(int i = 0; i < maxAttempts; i++)
+		{
+			if(i > 0)
+				context.waitTick();
+			
+			screenshotPath = context.takeScreenshot(fileName);
+			RawImage<int[]> rawScreenshot = RawImageImpl
+				.fromColorNativeImage(loadImageFile(screenshotPath));
+			RawImage<int[]> maskedScreenshot = applyMask(rawScreenshot, mask);
+			
+			if(maskedScreenshot.width() != maskedTemplate.width()
+				|| maskedScreenshot.height() != maskedTemplate.height())
+				throw new AssertionError(
+					"Screenshot and template dimensions do not match");
+			
+			TestScreenshotComparisonAlgorithm algo =
+				TestScreenshotComparisonAlgorithm.meanSquaredDifference(3e-4F);
+			
+			Vector2i result = algo.findColor(maskedScreenshot, maskedTemplate);
+			if(result != null)
+				return;
+		}
 
 		ghSummary("### Screenshot " + fileName + " does not match template");
 		ghSummary("Expected:");

gradlew.bat

@@ -33,26 +33,26 @@ protected void runImpl()
 		runWurstCommand("setcheckbox X-Ray only_show_exposed off");
 		runWurstCommand("setslider X-Ray opacity 0");
 		input.pressKey(GLFW.GLFW_KEY_X);
-		waitForChunkReloading();
-		assertScreenshotEquals("xray_default",
+		world.waitForChunksRender();
+		waitForScreenshotMatch("xray_default",
 			"https://i.imgur.com/Dftamqv.png");
 
 		// Exposed only
 		runWurstCommand("setcheckbox X-Ray only_show_exposed on");
 		runWurstCommand("setslider X-Ray opacity 0");
 		input.pressKey(GLFW.GLFW_KEY_X);
 		input.pressKey(GLFW.GLFW_KEY_X);
-		waitForChunkReloading();
-		assertScreenshotEquals("xray_exposed_only",
+		world.waitForChunksRender();
+		waitForScreenshotMatch("xray_exposed_only",
 			"https://i.imgur.com/QlEpQTu.png");
 
 		// Opacity mode
 		runWurstCommand("setcheckbox X-Ray only_show_exposed off");
 		runWurstCommand("setslider X-Ray opacity 0.5");
 		input.pressKey(GLFW.GLFW_KEY_X);
 		input.pressKey(GLFW.GLFW_KEY_X);
-		waitForChunkReloading();
-		assertScreenshotEquals("xray_opacity",
+		world.waitForChunksRender();
+		waitForScreenshotMatch("xray_opacity",
 			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/hXdzoDB.png"
 				: "https://i.imgur.com/oZqevTx.png");
 
@@ -61,8 +61,8 @@ protected void runImpl()
 		runWurstCommand("setslider X-Ray opacity 0.5");
 		input.pressKey(GLFW.GLFW_KEY_X);
 		input.pressKey(GLFW.GLFW_KEY_X);
-		waitForChunkReloading();
-		assertScreenshotEquals("xray_exposed_only_opacity",
+		world.waitForChunksRender();
+		waitForScreenshotMatch("xray_exposed_only_opacity",
 			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/ZwIARSr.png"
 				: "https://i.imgur.com/3DLxNuS.png");
 
@@ -72,7 +72,7 @@ protected void runImpl()
 		runWurstCommand("setcheckbox X-Ray only_show_exposed off");
 		runWurstCommand("setslider X-Ray opacity 0");
 		input.pressKey(GLFW.GLFW_KEY_X);
-		waitForChunkReloading();
+		world.waitForChunksRender();
 		clearChat();
 	}
 
@@ -103,15 +103,6 @@ private void buildTestRig()
 
 		// Wait for blocks to appear
 		waitForBlock(-1, 0, 6, Blocks.LAVA);
-		waitForChunkReloading();
 		clearChat();
 	}
-	
-	private void waitForChunkReloading()
-	{
-		// Wait longer if testing with Sodium, since we can't rely on
-		// waitForChunksRender() to track when Sodium finishes loading chunks
-		context.waitTicks(WurstTest.IS_MOD_COMPAT_TEST ? 5 : 1);
-		world.waitForChunksRender();
-	}
 }