Merge remote-tracking branch 'upstream' + Additional fixes and changes due to upstream.

Author: cev-api

.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/gradle.yml

@@ -55,6 +55,20 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         cache-read-only: ${{ github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/heads/1.') }}
 
+    - name: Resolve dependencies
+      run: |
+        max_attempts=3
+        attempt=1
+        until ./gradlew dependencies --stacktrace; do
+          if [ $attempt -ge $max_attempts ]; then
+            echo "Failed to resolve dependencies after $max_attempts attempts"
+            exit 1
+          fi
+          echo "Attempt $attempt failed, retrying in 30 seconds..."
+          attempt=$((attempt + 1))
+          sleep 30
+        done
+
     - name: Build
       run: ./gradlew build --stacktrace --warning-mode=fail
 

.github/workflows/publish.yml

@@ -62,6 +62,20 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         cache-read-only: ${{ github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/heads/1.') }}
 
+    - name: Resolve dependencies
+      run: |
+        max_attempts=3
+        attempt=1
+        until ./gradlew dependencies --stacktrace; do
+          if [ $attempt -ge $max_attempts ]; then
+            echo "Failed to resolve dependencies after $max_attempts attempts"
+            exit 1
+          fi
+          echo "Attempt $attempt failed, retrying in 30 seconds..."
+          attempt=$((attempt + 1))
+          sleep 30
+        done
+
     - name: Build
       run: ./gradlew build --stacktrace --warning-mode=fail
 

README.md

@@ -90,6 +90,8 @@ I'm pleased to note that many of the features and improvements below are complet
 - KickForensics
 - HideWurst
 - LootRunner
+- AutoFly
+- HideModMenu
 - Redstone, Bed, Sign & Workstation ESP
 - PearlESP (Not a simple trajectory hack)
 - SignFramePassThrough (I didn't know something like this existed as a mod already)
@@ -686,11 +688,12 @@ This hack is still undergoing development and has only been tested in the end. A
 
 ### AutoFly
 
-- AutoFly follows SeedMapper exports or manually entered coordinates, automatically tuning Flight height/speed and showing a crosshair status.
+- AutoFly follows SeedMapper exports or manually entered coordinates, automatically tuning flight height/speed and showing a crosshair status.
 - Able to adjust mid flight so you can get yourself unstuck if it failed to do it itself.
+- Able to somewhat path around blocks it crashes into either by moving around it or flying above it.
 - Auto lands and turns off flight when complete.
 - Comes with custom commands:
-  - `.autofly <x> <y> <z> [height] [speed]` or `.autofly <x> <z> [height] [speed]` to AutoFly to a given waypoint (relative `~` values are supported as well as comma separated entries).
+  - `.autofly <x> <y> <z> [height] [speed]` or `.autofly <x> <z> [height] [speed]` to AutoFly to a given waypoint (relative `~` values are supported as well as comma separated entries). Omitting Y causes it to simply land at the waypoint.
   - `.autofly next`/`.autofly prev(ious)` cycles the SeedMapper export list, while `.autofly stop|off|disable` turns off AutoFly.
 
 ## What's changed or improved in this fork?
@@ -746,6 +749,7 @@ Examples:
 - Right-click Area setting resets it to default.  
 - Can now scroll all drop down/pop ups with your mouse.
 - Pinned windows/settings now capture mouse input when a container screen is open, meaning you can now adjust settings without opening the ClickGUI.
+- Remembers scroll positions in categories
 
 ![HackList](https://i.imgur.com/fzcQdjy.png)
 
@@ -786,7 +790,8 @@ Examples:
 - Improved coloring for default distance based rendering, close (red) to far (green) (when all above off)
 - Able to ignore NPCs
 - Enter/Leave area notification option in chat with name, co-ordinates and block distance
-- Enter sound notifications with 7 different selectable sounds with optional cooldown
+- Enter sound notifications with multiple different selectable note block sounds with optional cooldown
+- Customise the enter sound with any minecraft sound by entering its name and selecting custom in the dropdown
 
 ![ESP](https://i.imgur.com/ydpYuOm.png)
 
@@ -834,6 +839,8 @@ Examples:
   - Able to ignore friends.
 - Added enable NoFall when flight is enabled toggle.
 - Added flight speed and velocity (blocks per second) to the hacklist
+- Optionally tie horizontal and vertical speeds together
+- Adjustable step for both speeds
 
 ### Larger Scan Radius
 - Extended up to 65×65 chunks for all chunk-based features.  
@@ -868,6 +875,7 @@ Examples:
 ### NoSlowDown Improved
 - Added no slowdown for lava
 - Added no slowdown for water
+  - Added a toggle to allow swimming
 
 ### TrueSight Improved
 - Added customisable glow ESP for invisible entities
@@ -895,13 +903,19 @@ Examples:
 - Can now multi-select and delete alt accounts
 - Moved to multiplayer screen
 
+### FreeCam Improved
+- Optionally tie horizontal and vertical speeds together
+- Adjustable step for both speeds
+- Option to allow older Wurst method of FreeCam which allowed interaction with the world
+
 ### AutoBuild Improved
 - Air-start position support and continued air place for gaps in build
 - Template preview shows a ghost of the template which locks in position when freecam is activated
 - Placement validation, blocks are only considered done when the world has a non-replaceable block in that position
 - Stuck handling, if the strict build order fails it temporarily relaxes the order so it can resume easier
 - CTRL (Sprint) bypass, by holding it you can add your own blocks at any time, before during or after the build
 - Adjustable confirmation ticks
+- Shows block count on crosshair
 
 ### Wurst Options
 - Added to home screen and put in the old spot of Alt Manager

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()

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.51.4-CevAPI-MC1.21.11
-fork_release_version=0.43
+mod_version=v7.52-CevAPI-MC1.21.11
+fork_release_version=0.44
 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.1-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

@@ -112,22 +112,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
@@ -139,8 +136,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

@@ -35,6 +35,7 @@ public static void testCopyItemCmd(ClientGameTestContext context,
 		input.pressKey(GLFW.GLFW_KEY_F5);
 		clearInventory(context);
 		clearChat(context);
+		context.waitTick();
 
 		// Put on a golden helmet
 		runCommand(server,