Merge remote-tracking branch 'upstream'

Author: cev-api

build.gradle

@@ -115,7 +115,6 @@ loom {
 			runDir = "build/run/clientGameTestWithMods"
 			jvmArguments.add("-Dfabric.client.gametest")
 			jvmArguments.add("-Dfabric.client.gametest.disableNetworkSynchronizer=true")
-			jvmArguments.add("-Dwurst.test.withMods=true")
 			programArguments.add("--username=Wurst-Bot")
 		}
 	}

gradle.properties

@@ -11,7 +11,7 @@ loader_version=0.19.3
 loom_version=1.17-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.152.1+26.2
+fabric_api_version=0.152.2+26.2
 
 # Mod Properties
 mod_version=v7.54-CevAPI-MC26.2
@@ -25,10 +25,10 @@ gh_repo_id=cev-api/Wurst7-CevAPI
 
 # Mod versions for automated compatibility tests:
 # Check at https://modrinth.com/mod/sodium/versions?l=fabric&g=26.2
-#sodium_version=mc26.1.2-0.8.12-fabric
+sodium_version=mc26.2-0.9.0-fabric
 
 # For manual testing (uncomment as needed):
 # Check at https://modrinth.com/mod/better-block-entities/versions?g=26.2
-#better_block_entities_version=1.3.4+mc26.1.2
+#better_block_entities_version=1.3.6+mc26.2
 # Check at https://modrinth.com/mod/badoptimizations/versions?g=26.2
-#badoptimizations_version=gjIvugXc
+#badoptimizations_version=JmPs4Wie

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

@@ -11,6 +11,7 @@
 
 import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
 import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.EntitySpawnReason;
 import net.minecraft.world.entity.EntityTypes;
@@ -111,8 +112,14 @@ protected void runImpl()
 		runWurstCommand("setcheckbox Freecam tracer off");
 		runWurstCommand("setcheckbox Freecam hide_hand off");
 		context.waitTick();
-		assertScreenshotEquals("freecam_with_hand",
-			"https://i.imgur.com/6tahHsE.png");
+		// This is broken in Sodium 0.9.0, see
+		// https://github.com/CaffeineMC/sodium/issues/3745
+		// Remove this special case once that issue is fixed.
+		if(!WurstTest.IS_SODIUM_INSTALLED
+			|| !FabricLoader.getInstance().getModContainer("sodium").get()
+				.getMetadata().getVersion().toString().equals("0.9.0+mc26.2"))
+			assertScreenshotEquals("freecam_with_hand",
+				"https://i.imgur.com/6tahHsE.png");
 		runWurstCommand("setcheckbox Freecam hide_hand on");
 
 		// Enable player movement, walk forward, and turn around