Updated Friends

Author: cev-api

src/main/java/net/wurstclient/FriendsList.java

@@ -126,9 +126,15 @@ public void middleClick(Entity entity)
 		String name = entity.getName().getString();
 
 		if(contains(name))
+		{
 			removeAndSave(name);
-		else
+			ChatUtils
+				.message("Removed \"" + name + "\" from your friends list.");
+		}else
+		{
 			addAndSave(name);
+			ChatUtils.message("Added \"" + name + "\" to your friends list.");
+		}
 	}
 
 	public boolean contains(String name)

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

@@ -26,18 +26,18 @@ public final class MaceDmgHack extends Hack
 	private static final double DEFAULT_HEIGHT = Math.sqrt(500);
 	private static final double MIN_FALL = 1.6;
 	private static final double SCAN_STEP = 0.25;
-
+	
 	private final SliderSetting height = new SliderSetting("Height",
 		"How high to fake before slamming. Height determines the damage boost.",
 		DEFAULT_HEIGHT, 1.6, 50, 0.1, ValueDisplay.DECIMAL);
-
+	
 	private final CheckboxSetting caveMode = new CheckboxSetting("Cave mode",
 		"Scans for an air gap above you to fall through, so smashes work under"
 			+ " a ceiling. Fully sealed spaces still can't be smashed.",
 		true);
-
+	
 	private long lastSmashTick = -1;
-
+	
 	public MaceDmgHack()
 	{
 		super("MaceDMG");
@@ -83,23 +83,23 @@ public void doSmash()
 		sendFakeY(findFallOffset());
 		sendFakeY(0);
 	}
-
+	
 	private double findFallOffset()
 	{
 		double cap = height.getValue();
 		if(!caveMode.isChecked() || MC.level == null)
 			return cap;
-
+		
 		for(double off = cap; off >= MIN_FALL; off -= SCAN_STEP)
 		{
 			AABB box = MC.player.getBoundingBox().move(0, off, 0);
 			if(MC.level.noCollision(MC.player, box))
 				return off;
 		}
-
+		
 		return cap;
 	}
-
+	
 	private void sendFakeY(double offset)
 	{
 		MC.player.connection

src/main/java/net/wurstclient/mixin/MinecraftMixin.java

@@ -30,8 +30,11 @@
 import net.minecraft.client.multiplayer.ProfileKeyPairManager;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.util.thread.ReentrantBlockableEventLoop;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.projectile.ProjectileUtil;
+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.event.EventManager;
 import net.wurstclient.events.HandleBlockBreakingListener.HandleBlockBreakingEvent;
@@ -131,12 +134,30 @@ private void onDoItemPick(CallbackInfo ci)
 	{
 		if(!WurstClient.INSTANCE.isEnabled())
 			return;
+			
+		// Do a custom long-range entity raycast to find players
+		// at greater distances than the vanilla reach limit
+		LocalPlayer localPlayer = WurstClient.MC.player;
+		if(localPlayer == null)
+			return;
+		
+		double reach = 64.0;
+		Vec3 eyePos = localPlayer.getEyePosition(1.0F);
+		Vec3 lookVec = localPlayer.getViewVector(1.0F);
+		Vec3 endPos =
+			eyePos.add(lookVec.x * reach, lookVec.y * reach, lookVec.z * reach);
+		
+		AABB searchBox = localPlayer.getBoundingBox()
+			.expandTowards(lookVec.scale(reach)).inflate(1.0);
+		
+		EntityHitResult hit = ProjectileUtil.getEntityHitResult(localPlayer,
+			eyePos, endPos, searchBox,
+			e -> e instanceof Player && !e.isSpectator(), reach * reach);
 
-		HitResult hitResult = WurstClient.MC.hitResult;
-		if(!(hitResult instanceof EntityHitResult eHitResult))
+		if(hit == null)
 			return;
 
-		WurstClient.INSTANCE.getFriends().middleClick(eHitResult.getEntity());
+		WurstClient.INSTANCE.getFriends().middleClick(hit.getEntity());
 	}
 
 	/**