Add AutoPlaceHack

gradle.properties

@@ -5,15 +5,15 @@ org.gradle.parallel=true
 # Fabric Properties
 # check these at https://fabricmc.net/develop/ and
 # https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
 loader_version=0.16.5
 
 # Fabric API
-fabric_version=0.105.0+1.21.1
+fabric_version=0.102.0+1.21
 
 # Mod Properties
-mod_version = v7.46.1-MC1.21.1
+mod_version = v7.46.1-MC1.21
 maven_group = net.wurstclient
 archives_base_name = Wurst-Client
 

src/main/java/net/wurstclient/WurstClient.java

@@ -51,7 +51,7 @@ public enum WurstClient
 	public static IMinecraftClient IMC;
 
 	public static final String VERSION = "7.46.1";
-	public static final String MC_VERSION = "1.21.1";
+	public static final String MC_VERSION = "1.21";
 
 	private WurstAnalytics analytics;
 	private EventManager eventManager;

src/main/java/net/wurstclient/hack/HackList.java

@@ -49,6 +49,7 @@ public final class HackList implements UpdateListener
 	public final AutoLeaveHack autoLeaveHack = new AutoLeaveHack();
 	public final AutoLibrarianHack autoLibrarianHack = new AutoLibrarianHack();
 	public final AutoEatHack autoEatHack = new AutoEatHack();
+	public final AutoPlaceHack autoPlaceHack = new AutoPlaceHack();
 	public final AutoFarmHack autoFarmHack = new AutoFarmHack();
 	public final AutoFishHack autoFishHack = new AutoFishHack();
 	public final AutoMineHack autoMineHack = new AutoMineHack();
@@ -172,6 +173,7 @@ public final class HackList implements UpdateListener
 	public final SpeedNukerHack speedNukerHack = new SpeedNukerHack();
 	public final SpiderHack spiderHack = new SpiderHack();
 	public final StepHack stepHack = new StepHack();
+	public final TeamEspHack teamEspHack = new TeamEspHack();
 	public final TemplateToolHack templateToolHack = new TemplateToolHack();
 	public final ThrowHack throwHack = new ThrowHack();
 	public final TillauraHack tillauraHack = new TillauraHack();

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

@@ -12,6 +12,10 @@
 
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.entity.Entity;
+import net.minecraft.item.AxeItem;
+import net.minecraft.item.Item;
+import net.minecraft.item.Items;
+import net.minecraft.item.SwordItem;
 import net.minecraft.util.math.Vec3d;
 import net.wurstclient.Category;
 import net.wurstclient.events.MouseUpdateListener;
@@ -50,6 +54,10 @@ public final class AimAssistHack extends Hack
 			"description.wurst.setting.aimassist.ignore_mouse_input", 0, 0, 1,
 			0.01, ValueDisplay.PERCENTAGE);
 
+	private final CheckboxSetting onlyHoldingWeapon = new CheckboxSetting(
+		"Only if holding weapon",
+		"Won't aim if not holding a weapon (Swords, axes & sticks.)", false);
+
 	private final CheckboxSetting checkLOS =
 		new CheckboxSetting("Check line of sight",
 			"description.wurst.setting.aimassist.check_line_of_sight", true);
@@ -60,6 +68,8 @@ public final class AimAssistHack extends Hack
 
 	private final EntityFilterList entityFilters =
 		new EntityFilterList(FilterPlayersSetting.genericCombat(false),
+			FilterTeammatesSetting.genericCombat(false),
+			FilterNpcLikeSetting.genericCombat(false),
 			FilterSleepingSetting.genericCombat(false),
 			FilterFlyingSetting.genericCombat(0),
 			FilterHostileSetting.genericCombat(false),
@@ -103,6 +113,7 @@ public AimAssistHack()
 		addSetting(ignoreMouseInput);
 		addSetting(checkLOS);
 		addSetting(aimWhileBlocking);
+		addSetting(onlyHoldingWeapon);
 
 		entityFilters.forEach(this::addSetting);
 	}
@@ -142,6 +153,14 @@ public void onUpdate()
 		if(MC.currentScreen instanceof HandledScreen)
 			return;
 
+		Item itemInHand = MC.player.getInventory().getMainHandStack().getItem();
+		if(onlyHoldingWeapon.isChecked() && !(itemInHand instanceof SwordItem
+			|| itemInHand instanceof AxeItem || itemInHand == Items.STICK))
+		{
+			target = null;
+			return;
+		}
+
 		if(!aimWhileBlocking.isChecked() && MC.player.isUsingItem())
 			return;
 

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

@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2014-2024 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;
+
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.item.BlockItem;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.wurstclient.Category;
+import net.wurstclient.SearchTags;
+import net.wurstclient.events.UpdateListener;
+import net.wurstclient.hack.Hack;
+import net.wurstclient.settings.CheckboxSetting;
+import net.wurstclient.util.BlockUtils;
+
+@SearchTags({"bridge", "auto place"})
+public final class AutoPlaceHack extends Hack implements UpdateListener
+{
+	private final CheckboxSetting onlyBelowFeet =
+		new CheckboxSetting("Only Below Feet",
+			"Only place blocks when target block is 1 block below your feet.",
+			false);
+	private final CheckboxSetting fastPlace =
+		new CheckboxSetting("Always FastPlace",
+			"Builds as if FastPlace was enabled, even if it's not.", true);
+
+	public AutoPlaceHack()
+	{
+		super("AutoPlace");
+		setCategory(Category.BLOCKS);
+		addSetting(onlyBelowFeet);
+		addSetting(fastPlace);
+	}
+
+	@Override
+	public void onEnable()
+	{
+		EVENTS.add(UpdateListener.class, this);
+	}
+
+	@Override
+	public void onDisable()
+	{
+		EVENTS.remove(UpdateListener.class, this);
+	}
+
+	@Override
+	public void onUpdate()
+	{
+		if(MC.currentScreen instanceof HandledScreen)
+			return;
+
+		if(MC.itemUseCooldown != 0 && !fastPlace.isChecked())
+			return;
+
+		ClientPlayerEntity player = MC.player;
+		assert player != null;
+
+		// Item in hand is not a block
+		if(!(player.getInventory().getStack(player.getInventory().selectedSlot)
+			.getItem() instanceof BlockItem))
+			return;
+
+		HitResult hitResult = MC.crosshairTarget;
+		if(hitResult == null || hitResult.getType() != HitResult.Type.BLOCK)
+			return;
+
+		BlockHitResult blockHitResult = (BlockHitResult)hitResult;
+		if(blockHitResult.getSide() == Direction.UP
+			|| blockHitResult.getSide() == Direction.DOWN)
+			return;
+
+		if(!BlockUtils.canBeClicked(blockHitResult.getBlockPos()))
+			return;
+
+		BlockPos blockToPlacePos =
+			blockHitResult.getBlockPos().offset(blockHitResult.getSide());
+		if(!BlockUtils.getState(blockToPlacePos).isReplaceable())
+			return;
+
+		// Option: only below feet
+		if(blockToPlacePos.getY() != BlockPos.ofFloored(MC.player.getPos())
+			.down().getY() && onlyBelowFeet.isChecked())
+			return;
+
+		assert MC.interactionManager != null;
+		MC.interactionManager.interactItem(player, Hand.MAIN_HAND);
+		ActionResult actionResult = MC.interactionManager.interactBlock(player,
+			Hand.MAIN_HAND, blockHitResult);
+		if(actionResult.isAccepted())
+			MC.player.swingHand(Hand.MAIN_HAND);
+
+		MC.itemUseCooldown = 4;
+	}
+}

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

@@ -11,13 +11,18 @@
 import net.wurstclient.DontBlock;
 import net.wurstclient.SearchTags;
 import net.wurstclient.hack.Hack;
+import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
 
 @SearchTags({"auto reconnect", "AutoRejoin", "auto rejoin"})
 @DontBlock
 public final class AutoReconnectHack extends Hack
 {
+	private final CheckboxSetting buttons = new CheckboxSetting(
+		"Reconnect screen button", "Shows a button on the reconnect"
+			+ " screen that lets you quickly enable AutoReconnect.",
+		true);
 	private final SliderSetting waitTime =
 		new SliderSetting("Wait time", "Time before reconnecting in seconds.",
 			5, 0, 60, 0.5, ValueDisplay.DECIMAL.withSuffix("s"));
@@ -26,9 +31,15 @@ public AutoReconnectHack()
 	{
 		super("AutoReconnect");
 		setCategory(Category.OTHER);
+		addSetting(buttons);
 		addSetting(waitTime);
 	}
 
+	public boolean shouldShowButtons()
+	{
+		return buttons.isChecked();
+	}
+
 	public int getWaitTicks()
 	{
 		return (int)(waitTime.getValue() * 20);

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

@@ -77,6 +77,7 @@ public PlayerEspHack()
 	@Override
 	protected void onEnable()
 	{
+		WURST.getHax().teamEspHack.setEnabled(false);
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(CameraTransformViewBobbingListener.class, this);
 		EVENTS.add(RenderListener.class, this);

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

@@ -21,6 +21,18 @@
 	"speed bridge helper"})
 public final class SafeWalkHack extends Hack
 {
+	private final SliderSetting minDepth = new SliderSetting("Min depth",
+		"Won't sneak if it isn't at least this deep.\n"
+			+ "Increase to stop SafeWalk from stucking on stairs.\n"
+			+ "Decrease to make SafeWalk sneak even at the edge of carpets.",
+		2.0, 0.1, 10, 0.1, ValueDisplay.DECIMAL.withSuffix("m"));
+
+	private final SliderSetting motionPrediction = new SliderSetting(
+		"Motion prediction",
+		"Predict your motion to sneak earlier.\n"
+			+ "If not stopping at edges, increase; If not stopping near a wall, decrease.",
+		2.0, 1, 5, 0.5, ValueDisplay.DECIMAL.withSuffix("x"));
+
 	private final CheckboxSetting sneak =
 		new CheckboxSetting("Sneak at edges", "Visibly sneak at edges.", false);
 
@@ -36,6 +48,8 @@ public SafeWalkHack()
 	{
 		super("SafeWalk");
 		setCategory(Category.MOVEMENT);
+		addSetting(minDepth);
+		addSetting(motionPrediction);
 		addSetting(sneak);
 		addSetting(edgeDistance);
 	}
@@ -54,10 +68,25 @@ protected void onDisable()
 			setSneaking(false);
 	}
 
-	public void onClipAtLedge(boolean clipping)
+	public boolean shouldClip()
 	{
 		ClientPlayerEntity player = MC.player;
 
+		Box box = player.getBoundingBox();
+		Box adjustedBox = box
+			.offset(player.getVelocity().multiply(motionPrediction.getValue()))
+			.stretch(0, -minDepth.getValue(), 0)
+			.expand(-edgeDistance.getValue(), 0, -edgeDistance.getValue());
+
+		return this.isEnabled() && MC.world.isSpaceEmpty(player, adjustedBox);
+	}
+
+	public void onClipAtLedge()
+	{
+		boolean clipping = false;
+
+		ClientPlayerEntity player = MC.player;
+
 		if(!isEnabled() || !sneak.isChecked() || !player.isOnGround())
 		{
 			if(sneaking)
@@ -67,7 +96,9 @@ public void onClipAtLedge(boolean clipping)
 		}
 
 		Box box = player.getBoundingBox();
-		Box adjustedBox = box.stretch(0, -player.getStepHeight(), 0)
+		Box adjustedBox = box
+			.offset(player.getVelocity().multiply(motionPrediction.getValue()))
+			.stretch(0, -minDepth.getValue(), 0)
 			.expand(-edgeDistance.getValue(), 0, -edgeDistance.getValue());
 
 		if(MC.world.isSpaceEmpty(player, adjustedBox))