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

Author: cev-api

.github/workflows/gradle.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches-ignore:
     - "dependabot/**"
-    - "modrinth_deps/**"
     tags-ignore:
     - "**"
     paths:

.github/workflows/update_modrinth_deps.yml

@@ -5,10 +5,6 @@ on:
     - cron: "0 0 * * *"
   workflow_dispatch:
 
-permissions:
-  # Needed to edit gradle.properties on the PR branches
-  contents: write
-
 jobs:
   update-deps:
     runs-on: ubuntu-latest
@@ -17,12 +13,8 @@ jobs:
       matrix:
         branch: ["master", "26.1", "1.21.10", "1.21.8"]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ matrix.branch }}
-
       - name: Update Modrinth Dependencies
         uses: Wurst-Imperium/update-modrinth-deps@v1
         with:
+          ref: ${{ matrix.branch }}
           token: ${{ secrets.UMD_PR_TOKEN }}

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

@@ -26,8 +26,8 @@ protected void runImpl()
 		logger.info("Testing .give command");
 
 		runWurstCommand("give diamond");
-		clearToasts();
 		context.waitTick();
+		clearToasts();
 		assertOneItemInSlot(0, Items.DIAMOND);
 		context.takeScreenshot("give_command_result");
 

src/main/java/net/wurstclient/hacks/XRayHack.java

@@ -100,8 +100,9 @@ public final class XRayHack extends Hack
 		0, 0, 0.99, 0.01, ValueDisplay.PERCENTAGE.withLabel(0, "off"));
 
 	private final String optiFineWarning;
-	private final String renderName =
-		Math.random() < 0.01 ? "X-Wurst" : getName();
+	private final String renderName = Math.random() < 0.01
+		&& System.getProperty("fabric.client.gametest") == null ? "X-Wurst"
+			: getName();
 
 	private ArrayList<String> oreNamesCache;
 	private java.util.Set<String> oreExactIds;