Merge remote-tracking branch 'upstream'

Author: cev-api

.github/workflows/update_modrinth_deps.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ['master', '26.1']
+        branch: ["master", "26.1", "1.21.10", "1.21.8"]
     steps:
       - name: Checkout
         uses: actions/checkout@v6

README.md

@@ -1,4 +1,4 @@
-# Wurst Client v7.52 (MC1.21.11) - Modified by CevAPI 
+# Wurst Client v7.53 (MC1.21.11) - Modified by CevAPI 
 
 ![CevAPI Logo](https://i.imgur.com/kBIn9Ab.png)
 

build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
 	id "fabric-loom" version "${loom_version}"
-	id "com.diffplug.spotless" version "8.3.0"
+	id "com.diffplug.spotless" version "8.4.0"
 }
 
 def ENV = System.getenv()

gradle.properties

@@ -15,8 +15,8 @@ loom_version=1.14-SNAPSHOT
 fabric_api_version=0.140.2+1.21.11
 
 # Mod Properties
-mod_version=v7.52-CevAPI-MC1.21.11
-fork_release_version=0.47
+mod_version=v7.53-CevAPI-MC1.21.11
+fork_release_version=0.48
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2014-2026 Wurst-Imperium and contributors.
+ *
+ * This source code is subject to the terms of the GNU General Public
+ * License, version 3. If a copy of the GPL was not distributed with this
+ * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
+ */
+package net.wurstclient.gametest;
+
+import java.nio.file.Path;
+
+import org.lwjgl.glfw.GLFW;
+import org.slf4j.Logger;
+
+import net.fabricmc.fabric.api.client.gametest.v1.TestInput;
+import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestClientWorldContext;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerContext;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+
+public abstract class SingleplayerTest
+{
+	protected final ClientGameTestContext context;
+	protected final TestSingleplayerContext spContext;
+	protected final TestInput input;
+	protected final TestClientWorldContext world;
+	protected final TestServerContext server;
+	protected final Logger logger = WurstTest.LOGGER;
+	
+	public SingleplayerTest(ClientGameTestContext context,
+		TestSingleplayerContext spContext)
+	{
+		this.context = context;
+		this.spContext = spContext;
+		this.input = context.getInput();
+		this.world = spContext.getClientWorld();
+		this.server = spContext.getServer();
+	}
+	
+	/**
+	 * Runs the test and verifies cleanup afterward.
+	 */
+	public final void run()
+	{
+		runImpl();
+		assertScreenshotEquals(
+			getClass().getSimpleName().toLowerCase() + "_cleanup",
+			"https://i.imgur.com/i2Nr9is.png");
+	}
+	
+	/**
+	 * Implement the actual test logic here. The test is responsible for
+	 * cleaning up after itself (disabling hacks, removing blocks, clearing
+	 * chat/inventory/particles, etc.).
+	 */
+	protected abstract void runImpl();
+	
+	protected final void runCommand(String command)
+	{
+		WurstClientTestHelper.runCommand(server, command);
+	}
+	
+	protected final void runWurstCommand(String command)
+	{
+		WurstClientTestHelper.runWurstCommand(context, command);
+	}
+	
+	protected final void waitForBlock(int relX, int relY, int relZ, Block block)
+	{
+		context.waitFor(mc -> mc.level
+			.getBlockState(mc.player.blockPosition().offset(relX, relY, relZ))
+			.getBlock() == block);
+	}
+	
+	/**
+	 * Waits for the hand swing and equip animations to finish. Call this
+	 * after any action that changes/clears the currently held item, if a
+	 * screenshot is taken soon after (<1 second).
+	 */
+	protected final void waitForHandSwing()
+	{
+		context.waitFor(mc -> {
+			var renderer =
+				mc.getEntityRenderDispatcher().getItemInHandRenderer();
+			return !mc.player.swinging && renderer.mainHandHeight == 1
+				&& renderer.oMainHandHeight == 1;
+		}, 20);
+	}
+	
+	protected final void clearChat()
+	{
+		context.runOnClient(mc -> mc.gui.getChat().clearMessages(true));
+	}
+	
+	protected final void clearInventory()
+	{
+		input.pressKey(GLFW.GLFW_KEY_T);
+		input.typeChars("/clear");
+		input.pressKey(GLFW.GLFW_KEY_ENTER);
+	}
+	
+	protected final void clearParticles()
+	{
+		context.runOnClient(mc -> mc.particleEngine.clearParticles());
+	}
+	
+	protected final void clearToasts()
+	{
+		context.runOnClient(mc -> mc.getToastManager().clear());
+	}
+	
+	protected final void assertOneItemInSlot(int slot, Item item)
+	{
+		ItemStack stack = context
+			.computeOnClient(mc -> mc.player.getInventory().getItem(slot));
+		if(!stack.is(item) || stack.getCount() != 1)
+			throw new RuntimeException(
+				"Expected 1 " + item.getName().getString() + " at slot " + slot
+					+ ", found " + stack.getCount() + " "
+					+ stack.getItem().getName().getString() + " instead");
+	}
+	
+	protected final void assertScreenshotEquals(String fileName,
+		String templateUrl)
+	{
+		WurstClientTestHelper.assertScreenshotEquals(context, fileName,
+			templateUrl);
+	}
+	
+	protected final void failWithScreenshot(String fileName, String title,
+		String errorMessage)
+	{
+		Path screenshotPath = context.takeScreenshot(fileName);
+		
+		WurstClientTestHelper
+			.ghSummary("### " + title + "\n" + errorMessage + "\n");
+		String url = WurstClientTestHelper.tryUploadToImgur(screenshotPath);
+		if(url != null)
+			WurstClientTestHelper.ghSummary("![" + fileName + "](" + url + ")");
+		else
+			WurstClientTestHelper.ghSummary("Couldn't upload " + fileName
+				+ ".png to Imgur. Check the Test Screenshots.zip artifact.");
+		
+		throw new RuntimeException(title + ": " + errorMessage);
+	}
+	
+	protected final void assertNoItemInSlot(int slot)
+	{
+		ItemStack stack = context
+			.computeOnClient(mc -> mc.player.getInventory().getItem(slot));
+		if(!stack.isEmpty())
+			throw new RuntimeException("Expected no item in slot " + slot
+				+ ", found " + stack.getCount() + " "
+				+ stack.getItem().getName().getString() + " instead");
+	}
+}

src/gametest/java/net/wurstclient/gametest/SingleplayerTest.java

@@ -36,9 +36,6 @@
 import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
 
 public enum WurstClientTestHelper
 {
@@ -284,57 +281,4 @@ public static String tryUploadToImgur(Path imagePath)
 		}
 	}
 
-	public static void waitForBlock(ClientGameTestContext context, int relX,
-		int relY, int relZ, Block block)
-	{
-		context.waitFor(mc -> mc.level
-			.getBlockState(mc.player.blockPosition().offset(relX, relY, relZ))
-			.getBlock() == block);
-	}
-	
-	public static void clearChat(ClientGameTestContext context)
-	{
-		context.runOnClient(mc -> mc.gui.getChat().clearMessages(true));
-	}
-	
-	public static void clearInventory(ClientGameTestContext context)
-	{
-		TestInput input = context.getInput();
-		input.pressKey(GLFW.GLFW_KEY_T);
-		input.typeChars("/clear");
-		input.pressKey(GLFW.GLFW_KEY_ENTER);
-	}
-	
-	public static void clearParticles(ClientGameTestContext context)
-	{
-		context.runOnClient(mc -> mc.particleEngine.clearParticles());
-	}
-	
-	public static void clearToasts(ClientGameTestContext context)
-	{
-		context.runOnClient(mc -> mc.getToastManager().clear());
-	}
-	
-	public static void assertOneItemInSlot(ClientGameTestContext context,
-		int slot, Item item)
-	{
-		ItemStack stack = context
-			.computeOnClient(mc -> mc.player.getInventory().getItem(slot));
-		if(!stack.is(item) || stack.getCount() != 1)
-			throw new RuntimeException(
-				"Expected 1 " + item.getName().getString() + " at slot " + slot
-					+ ", found " + stack.getCount() + " "
-					+ stack.getItem().getName().getString() + " instead");
-	}
-	
-	public static void assertNoItemInSlot(ClientGameTestContext context,
-		int slot)
-	{
-		ItemStack stack = context
-			.computeOnClient(mc -> mc.player.getInventory().getItem(slot));
-		if(!stack.isEmpty())
-			throw new RuntimeException("Expected no item in slot " + slot
-				+ ", found " + stack.getCount() + " "
-				+ stack.getItem().getName().getString() + " instead");
-	}
 }

src/gametest/java/net/wurstclient/gametest/WurstClientTestHelper.java

@@ -116,26 +116,26 @@ private void testInWorld(ClientGameTestContext context,
 			"setmode WurstLogo visibility only_when_outdated");
 		runWurstCommand(context, "setcheckbox HackList animations off");
 
-		InGameMenuTest.testMenuScreens(context);
+		new InGameMenuTest(context, spContext).run();
 
 		// TODO: Open ClickGUI and Navigator
 
 		// Test Wurst hacks
-		AutoMineHackTest.testAutoMineHack(context, spContext);
-		FreecamHackTest.testFreecamHack(context, spContext);
-		NoFallHackTest.testNoFallHack(context, spContext);
-		NoWeatherHackTest.testNoWeatherHack(context, spContext);
-		XRayHackTest.testXRayHack(context, spContext);
+		new AutoMineHackTest(context, spContext).run();
+		new FreecamHackTest(context, spContext).run();
+		new NoFallHackTest(context, spContext).run();
+		new NoWeatherHackTest(context, spContext).run();
+		new XRayHackTest(context, spContext).run();
 
 		// Test Wurst commands
-		CopyItemCmdTest.testCopyItemCmd(context, spContext);
-		GiveCmdTest.testGiveCmd(context, spContext);
-		ModifyCmdTest.testModifyCmd(context, spContext);
+		new CopyItemCmdTest(context, spContext).run();
+		new GiveCmdTest(context, spContext).run();
+		new ModifyCmdTest(context, spContext).run();
 
 		// TODO: Test more Wurst features
 
 		// Test special cases
-		PistonTest.testPistonDoesntCrash(context, spContext);
+		new PistonTest(context, spContext).run();
 	}
 
 	// because the grass texture is randomized and smooth stone isn't

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

@@ -31,7 +31,7 @@ public abstract class ScreenMixin extends AbstractContainerEventHandler
 	 * Replaces the panorama background with a gray background to make test
 	 * screenshots consistent.
 	 */
-	@Inject(at = @At("HEAD"), method = "renderPanorama", cancellable = true)
+	@Inject(method = "renderPanorama", at = @At("HEAD"), cancellable = true)
 	public void renderPanoramaBackground(GuiGraphics context, float deltaTicks,
 		CallbackInfo ci)
 	{