Merge #1300 (Freecam old style raytrace option) into v7.52.1

Alexander01998 · web-flow · commit 9ea2342b0253 · 2026-03-03T20:34:30.000+01:00
diff --git a/src/gametest/java/net/wurstclient/gametest/tests/FreecamHackTest.java b/src/gametest/java/net/wurstclient/gametest/tests/FreecamHackTest.java
@@ -9,13 +9,19 @@
 
 import static net.wurstclient.gametest.WurstClientTestHelper.*;
 
+import java.nio.file.Path;
+
 import org.lwjgl.glfw.GLFW;
 
 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.core.BlockPos;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.LeverBlock;
+import net.minecraft.world.level.block.state.BlockState;
 import net.wurstclient.gametest.WurstTest;
 
 public enum FreecamHackTest
@@ -129,12 +135,97 @@ public static void testFreecamHack(ClientGameTestContext context,
 		context.waitTick();
 		world.waitForChunksRender();
 		
-		// Clean up
+		// Reset player and remove walkway
 		runCommand(server, "fill 0 -58 1 0 -58 2 air");
 		runCommand(server, "tp @s 0 -57 0 0 0");
-		context.waitTicks(2);
-		world.waitForChunksRender();
 		// Restore body rotation - /tp only rotates the head as of 1.21.11
 		context.runOnClient(mc -> mc.player.setYBodyRot(0));
+		
+		// Test "Interact from" setting
+		runCommand(server, "setblock 0 -56 2 smooth_stone");
+		waitForBlock(context, 0, 1, 2, Blocks.SMOOTH_STONE);
+		runCommand(server, "setblock 0 -56 1 lever[face=wall,facing=north]");
+		runCommand(server, "setblock 0 -56 3 lever[face=wall,facing=south]");
+		waitForBlock(context, 0, 1, 3, Blocks.LEVER);
+		context.waitTicks(WurstTest.IS_MOD_COMPAT_TEST ? 5 : 1);
+		world.waitForChunksRender();
+		context.takeScreenshot("freecam_interact_setup");
+		
+		// Enable Freecam and fly to a side view
+		runWurstCommand(context, "setslider Freecam horizontal_speed 0.95");
+		input.pressKey(GLFW.GLFW_KEY_U);
+		input.holdKeyFor(GLFW.GLFW_KEY_W, 3);
+		context.waitTick();
+		runWurstCommand(context, "setslider Freecam horizontal_speed 1");
+		for(int i = 0; i < 6; i++)
+		{
+			input.moveCursor(120, 0);
+			context.waitTick();
+		}
+		input.holdKeyFor(GLFW.GLFW_KEY_S, 2);
+		context.waitTick();
+		world.waitForChunksRender();
+		context.takeScreenshot("freecam_interact_side_view");
+		
+		// Right click with "Interact from: Player" (default)
+		input.pressMouse(GLFW.GLFW_MOUSE_BUTTON_RIGHT);
+		context.waitTick();
+		assertLeverState(context, spContext, 0, -56, 1, true,
+			"near lever, player mode");
+		assertLeverState(context, spContext, 0, -56, 3, false,
+			"far lever, player mode");
+		
+		// Switch to "Interact from: Camera" and right click
+		runWurstCommand(context, "setmode Freecam interact_from camera");
+		input.pressMouse(GLFW.GLFW_MOUSE_BUTTON_RIGHT);
+		context.waitTick();
+		assertLeverState(context, spContext, 0, -56, 3, true,
+			"far lever, camera mode");
+		assertLeverState(context, spContext, 0, -56, 1, true,
+			"near lever, camera mode");
+		
+		// Clean up
+		runCommand(server, "fill 0 -56 1 0 -56 3 air");
+		runWurstCommand(context, "setmode Freecam interact_from player");
+		input.pressKey(GLFW.GLFW_KEY_U);
+		context.waitTick();
+		world.waitForChunksRender();
+	}
+	
+	private static void assertLeverState(ClientGameTestContext context,
+		TestSingleplayerContext spContext, int x, int y, int z,
+		boolean expectedPowered, String description)
+	{
+		TestServerContext server = spContext.getServer();
+		BlockState state = server.computeOnServer(
+			s -> s.overworld().getBlockState(new BlockPos(x, y, z)));
+		
+		String errorMessage = null;
+		if(state.getBlock() != Blocks.LEVER)
+			errorMessage = "Expected lever at " + x + ", " + y + ", " + z + " ("
+				+ description + ") but found " + state;
+		else if(state.getValue(LeverBlock.POWERED) != expectedPowered)
+			errorMessage = "Lever at " + x + ", " + y + ", " + z + " ("
+				+ description + ") expected powered=" + expectedPowered
+				+ " but was powered=" + !expectedPowered;
+		
+		if(errorMessage == null)
+			return;
+		
+		TestClientWorldContext world = spContext.getClientWorld();
+		context.waitTick();
+		world.waitForChunksRender();
+		
+		String fileName = "freecam_interact_failed";
+		Path screenshotPath = context.takeScreenshot(fileName);
+		ghSummary("### Freecam interact test failed");
+		ghSummary(errorMessage);
+		String url = tryUploadToImgur(screenshotPath);
+		if(url != null)
+			ghSummary("![" + fileName + "](" + url + ")");
+		else
+			ghSummary("Couldn't upload " + fileName
+				+ ".png to Imgur. Check the Test Screenshots.zip artifact.");
+		throw new RuntimeException(errorMessage);
 	}
 }
diff --git a/src/main/java/net/wurstclient/hacks/FreecamHack.java b/src/main/java/net/wurstclient/hacks/FreecamHack.java
@@ -28,6 +28,8 @@
 import net.wurstclient.hacks.freecam.FreecamInitialPosSetting;
 import net.wurstclient.hacks.freecam.FreecamInputSetting;
 import net.wurstclient.hacks.freecam.FreecamInputSetting.ApplyInputTo;
+import net.wurstclient.hacks.freecam.FreecamInteractionSetting;
+import net.wurstclient.hacks.freecam.FreecamInteractionSetting.InteractFrom;
 import net.wurstclient.mixinterface.IKeyMapping;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.ColorSetting;
@@ -45,6 +47,9 @@ public final class FreecamHack extends Hack
 {
 	private final FreecamInputSetting applyInputTo = new FreecamInputSetting();
 	
+	private final FreecamInteractionSetting interactFrom =
+		new FreecamInteractionSetting();
+	
 	private final SliderSetting horizontalSpeed =
 		new SliderSetting("Horizontal speed",
 			"description.wurst.setting.freecam.horizontal_speed", 1, 0.05, 10,
@@ -90,6 +95,7 @@ public FreecamHack()
 		super("Freecam");
 		setCategory(Category.RENDER);
 		addSetting(applyInputTo);
+		addSetting(interactFrom);
 		addSetting(horizontalSpeed);
 		addSetting(verticalSpeed);
 		addSetting(scrollToChangeSpeed);
@@ -215,6 +221,11 @@ public boolean isMovingCamera()
 		return isEnabled() && applyInputTo.getSelected() == ApplyInputTo.CAMERA;
 	}
 	
+	public boolean isClickingFromCamera()
+	{
+		return isEnabled() && interactFrom.getSelected() == InteractFrom.CAMERA;
+	}
+	
 	@Override
 	public void onVisGraph(VisGraphEvent event)
 	{
@@ -274,4 +285,9 @@ public float getCamPitch()
 	{
 		return camPitch;
 	}
+	
+	public Vec3 getScaledCamDir(double scale)
+	{
+		return Vec3.directionFromRotation(camPitch, camYaw).scale(scale);
+	}
 }
diff --git a/src/main/java/net/wurstclient/hacks/freecam/FreecamInteractionSetting.java b/src/main/java/net/wurstclient/hacks/freecam/FreecamInteractionSetting.java
@@ -0,0 +1,61 @@
+/*
+ * 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.hacks.freecam;
+
+import net.wurstclient.settings.EnumSetting;
+import net.wurstclient.util.text.WText;
+
+public final class FreecamInteractionSetting
+	extends EnumSetting<FreecamInteractionSetting.InteractFrom>
+{
+	private static final WText DESCRIPTION = buildDescription();
+	
+	public FreecamInteractionSetting()
+	{
+		super("Interact from", DESCRIPTION, InteractFrom.values(),
+			InteractFrom.PLAYER);
+	}
+	
+	private static WText buildDescription()
+	{
+		WText text =
+			WText.translated("description.wurst.setting.freecam.interact_from");
+		
+		for(InteractFrom value : InteractFrom.values())
+			text = text
+				.append(WText.literal("\n\n\u00a7l" + value.name + ":\u00a7r "))
+				.append(value.description);
+		
+		return text;
+	}
+	
+	public enum InteractFrom
+	{
+		CAMERA("Camera"),
+		PLAYER("Player");
+		
+		private static final String TRANSLATION_KEY_PREFIX =
+			"description.wurst.setting.freecam.interact_from.";
+		
+		private final String name;
+		private final WText description;
+		
+		private InteractFrom(String name)
+		{
+			this.name = name;
+			description =
+				WText.translated(TRANSLATION_KEY_PREFIX + name().toLowerCase());
+		}
+		
+		@Override
+		public String toString()
+		{
+			return name;
+		}
+	}
+}
diff --git a/src/main/java/net/wurstclient/mixin/freecam/LocalPlayerMixin.java b/src/main/java/net/wurstclient/mixin/freecam/LocalPlayerMixin.java
@@ -7,6 +7,8 @@
  */
 package net.wurstclient.mixin.freecam;
 
+import java.util.function.Predicate;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -15,12 +17,22 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.authlib.GameProfile;
 
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.player.ClientInput;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.ClipContext;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.EntityHitResult;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
 import net.wurstclient.WurstClient;
 import net.wurstclient.hacks.FreecamHack;
 
@@ -79,4 +91,48 @@ public void turn(double deltaYaw, double deltaPitch)
 		
 		super.turn(deltaYaw, deltaPitch);
 	}
+	
+	@WrapOperation(
+		method = "pick(Lnet/minecraft/world/entity/Entity;DDF)Lnet/minecraft/world/phys/HitResult;",
+		at = @At(value = "INVOKE",
+			target = "Lnet/minecraft/world/entity/Entity;pick(DFZ)Lnet/minecraft/world/phys/HitResult;"))
+	private static HitResult modifyBlockRaycast(Entity player, double maxDist,
+		float partialTicks, boolean includeFluids,
+		Operation<HitResult> original)
+	{
+		FreecamHack freecam = WurstClient.INSTANCE.getHax().freecamHack;
+		if(!freecam.isClickingFromCamera())
+			return original.call(player, maxDist, partialTicks, includeFluids);
+		
+		Vec3 camStart = freecam.getCamPos(partialTicks);
+		Vec3 camEnd = camStart.add(freecam.getScaledCamDir(maxDist));
+		return player.level()
+			.clip(new ClipContext(camStart, camEnd, ClipContext.Block.OUTLINE,
+				includeFluids ? ClipContext.Fluid.ANY : ClipContext.Fluid.NONE,
+				player));
+	}
+	
+	@WrapOperation(
+		method = "pick(Lnet/minecraft/world/entity/Entity;DDF)Lnet/minecraft/world/phys/HitResult;",
+		at = @At(value = "INVOKE",
+			target = "Lnet/minecraft/world/entity/projectile/ProjectileUtil;getEntityHitResult(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;D)Lnet/minecraft/world/phys/EntityHitResult;"))
+	private static EntityHitResult modifyEntityRaycast(Entity instance,
+		Vec3 start, Vec3 end, AABB bounds, Predicate<Entity> predicate,
+		double maxDistSq, Operation<EntityHitResult> original,
+		@Local(ordinal = 0) double maxDist)
+	{
+		FreecamHack freecam = WurstClient.INSTANCE.getHax().freecamHack;
+		if(!freecam.isClickingFromCamera())
+			return original.call(instance, start, end, bounds, predicate,
+				maxDistSq);
+		
+		Vec3 camStart = freecam.getCamPos(1F);
+		Vec3 scaledCamDir = freecam.getScaledCamDir(maxDist);
+		Vec3 camEnd = camStart.add(scaledCamDir);
+		AABB camBounds = EntityType.PLAYER.getDimensions()
+			.makeBoundingBox(camStart).expandTowards(scaledCamDir).inflate(1);
+		
+		return original.call(instance, camStart, camEnd, camBounds, predicate,
+			maxDistSq);
+	}
 }
diff --git a/src/main/resources/assets/wurst/translations/de_de.json b/src/main/resources/assets/wurst/translations/de_de.json
@@ -98,6 +98,9 @@
   "description.wurst.setting.freecam.apply_input_to": "Was deine Tastatur- und Mauseingaben tun sollen, während Freecam aktiv ist.",
   "description.wurst.setting.freecam.apply_input_to.camera": "Bewegt die Kamera, während deine Spielfigur stillsteht.",
   "description.wurst.setting.freecam.apply_input_to.player": "Bewegt deine Spielfigur, während die Kamera stillsteht.",
+  "description.wurst.setting.freecam.interact_from": "Was deine Links-/Rechts-/Mittelklicks treffen sollen, während Freecam aktiv ist.",
+  "description.wurst.setting.freecam.interact_from.camera": "Klicks treffen das, worauf die Kamera schaut. Das ermöglicht dir, mit Blöcken und Mobs hinter Wänden zu interagieren, solange sie nicht zu weit von deiner Spielfigur entfernt sind.",
+  "description.wurst.setting.freecam.interact_from.player": "Klicks treffen das, worauf deine Spielfigur schaut.",
   "description.wurst.setting.freecam.horizontal_speed": "Horizontale Geschwindigkeit von Kamerabewegungen während du Freecam benutzt.\n\nHat keine Wirkung, wenn §lApply §linput §lto§r auf §lPlayer§r gesetzt ist.",
   "description.wurst.setting.freecam.vertical_speed": "Vertikale Geschwindigkeit von Kamerabewegungen während du Freecam benutzt (relativ zur horizontalen).\n\nHat keine Wirkung, wenn §lApply §linput §lto§r auf §lPlayer§r gesetzt ist.",
   "description.wurst.setting.freecam.scroll_to_change_speed": "Ändert deine Kamerageschwindigkeit, wenn du das Mausrad scrollst.\n\nHat keine Wirkung, wenn §lApply §linput §lto§r auf §lPlayer§r gesetzt ist.",
diff --git a/src/main/resources/assets/wurst/translations/en_us.json b/src/main/resources/assets/wurst/translations/en_us.json
@@ -148,6 +148,9 @@
   "description.wurst.setting.freecam.apply_input_to": "What your keyboard and mouse inputs should do while Freecam is active.",
   "description.wurst.setting.freecam.apply_input_to.camera": "Moves the camera around while your character stays still.",
   "description.wurst.setting.freecam.apply_input_to.player": "Moves your character while the camera stays still.",
+  "description.wurst.setting.freecam.interact_from": "What your left/right/middle clicks should target while Freecam is active.",
+  "description.wurst.setting.freecam.interact_from.camera": "Clicks target what the camera is looking at. This allows you to interact with blocks and entities behind walls as long as they're not too far away from your character.",
+  "description.wurst.setting.freecam.interact_from.player": "Clicks target what your character is looking at.",
   "description.wurst.setting.freecam.horizontal_speed": "Horizontal camera movement speed when using Freecam.\n\nDoes nothing when §lApply §linput §lto§r is set to §lPlayer§r.",
   "description.wurst.setting.freecam.vertical_speed": "Vertical camera movement speed when using Freecam (relative to horizontal).\n\nDoes nothing when §lApply §linput §lto§r is set to §lPlayer§r.",
   "description.wurst.setting.freecam.scroll_to_change_speed": "Changes your camera movement speed when you scroll the mouse wheel.\n\nDoes nothing when §lApply §linput §lto§r is set to §lPlayer§r.",
