Merge branch 'v7.52' into v7.52-1.21.10

Author: Alexander01998

.github/dependabot.yml

@@ -6,13 +6,15 @@ updates:
 - package-ecosystem: "gradle"
   directory: "/"
   schedule:
-    interval: "daily"
+    interval: "weekly"
+    day: "monday"
     time: "06:00"
     timezone: "Europe/Berlin"
 - package-ecosystem: "github-actions"
   # Directory should be `/` instead of `/.github/workflows` according to the docs.
   directory: "/"
   schedule:
-    interval: "daily"
+    interval: "weekly"
+    day: "monday"
     time: "06:00"
     timezone: "Europe/Berlin"

.github/workflows/publish.yml

@@ -86,7 +86,7 @@ jobs:
       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"
+        echo "fapi_version=$(grep '^fabric_api_version=' gradle.properties | cut -d'=' -f2 | tr -d ' \r')" >> "$GITHUB_OUTPUT"
 
     - name: Upload backups
       if: ${{ inputs.upload_backups }}

build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
 	id "fabric-loom" version "${loom_version}"
-	id "com.diffplug.spotless" version "8.1.0"
+	id "com.diffplug.spotless" version "8.2.1"
 }
 
 def ENV = System.getenv()
@@ -45,7 +45,7 @@ dependencies {
 	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 	// net.wurstclient.ai.PathPos extends net.minecraft.util.math.BlockPos,
 	// which uses javax.annotation.concurrent.Immutable, which is part of

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.3
-loader_version=0.18.3
-loom_version=1.14-SNAPSHOT
+loader_version=0.18.4
+loom_version=1.15-SNAPSHOT
 
 # Fabric API
-fabric_version=0.138.4+1.21.10
+fabric_api_version=0.138.4+1.21.10
 
 # Mod Properties
-mod_version=v7.52pre1-MC1.21.10
+mod_version=v7.52pre3-MC1.21.10
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -13,7 +13,7 @@ def update_gradle_properties(mc_version, fabric_loader, fapi_version):
 	replacements = {
 		"minecraft_version": lambda v: mc_version,
 		"loader_version": lambda v: fabric_loader,
-		"fabric_version": lambda v: fapi_version,
+		"fabric_api_version": lambda v: fapi_version,
 		"mod_version": lambda v: v[: v.index("MC") + 2] + mc_version,
 	}
 

scripts/update_version_constants.py

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2025 Wurst-Imperium and contributors.
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2025 Wurst-Imperium and contributors.
+ * 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
@@ -109,22 +109,19 @@ private void testInWorld(ClientGameTestContext context,
 			"https://i.imgur.com/LyQ5FSD.png");
 		input.pressKey(GLFW.GLFW_KEY_ESCAPE);
 
-		LOGGER.info("Opening game menu");
-		input.pressKey(GLFW.GLFW_KEY_ESCAPE);
-		assertScreenshotEquals(context, "game_menu",
-			"https://i.imgur.com/3wB05mE.png");
-		input.pressKey(GLFW.GLFW_KEY_ESCAPE);
-		
 		runWurstCommand(context,
 			"setmode WurstLogo visibility only_when_outdated");
 		runWurstCommand(context, "setcheckbox HackList animations off");
 
+		InGameMenuTest.testMenuScreens(context);
+		
 		// 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);
 
 		// Test Wurst commands
@@ -136,8 +133,6 @@ private void testInWorld(ClientGameTestContext context,
 
 		// Test special cases
 		PistonTest.testPistonDoesntCrash(context, spContext);
-		
-		// TODO: Check Wurst Options
 	}
 
 	// because the grass texture is randomized and smooth stone isn't

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2025 Wurst-Imperium and contributors.
+ * 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