Added WebhookAlert & OppStats

Author: cev-api

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

@@ -285,6 +285,8 @@ public final class HackList implements UpdateListener
 	public final XRayHack xRayHack = new XRayHack();
 	public final WaypointsHack waypointsHack = new WaypointsHack();
 	public final ViewmodelHack viewmodelHack = new ViewmodelHack();
+	public final WebhookAlertHack webhookAlertHack = new WebhookAlertHack();
+	public final OppStatsHack oppStatsHack = new OppStatsHack();
 	public final BreadcrumbsHack breadcrumbsHack = new BreadcrumbsHack();
 	public final LogoutSpotsHack logoutSpotsHack = new LogoutSpotsHack();
 	public final TridentEspHack tridentEspHack = new TridentEspHack();

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

@@ -1161,8 +1161,10 @@ private boolean checkStopOnPlayers()
 				continue;
 
 			String name = safeString(p.getName().getString());
-			ChatUtils.message("Disabled: Player detected"
-				+ (name.isBlank() ? "" : " (" + name + ")"));
+			String message = "Disabled: Player detected"
+				+ (name.isBlank() ? "" : " (" + name + ")");
+			ChatUtils.message(message);
+			WURST.getHax().webhookAlertHack.onAutoFlyStopped(message);
 			setEnabled(false);
 			return true;
 		}
@@ -1178,7 +1180,9 @@ private boolean checkDisableOnDamage()
 		if(MC.player.hurtTime <= 0)
 			return false;
 
-		ChatUtils.message("Disabled: You took damage.");
+		String message = "Disabled: You took damage.";
+		ChatUtils.message(message);
+		WURST.getHax().webhookAlertHack.onAutoFlyStopped(message);
 		setEnabled(false);
 		return true;
 	}
@@ -1303,11 +1307,15 @@ private void stopAutoFly(String message)
 		if(disableAutoFlyOnStop.isChecked())
 		{
 			ChatUtils.message(message + " (AutoFly disabled)");
+			WURST.getHax().webhookAlertHack
+				.onAutoFlyStopped(message + " (AutoFly disabled)");
 			setEnabled(false);
 			return;
 		}
 
 		ChatUtils.message(message + " (use Next waypoint to continue)");
+		WURST.getHax().webhookAlertHack
+			.onAutoFlyStopped(message + " (use Next waypoint to continue)");
 		stopHold = true;
 		stopIgnoreTicks = 0;
 	}

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

@@ -7,27 +7,34 @@
  */
 package net.wurstclient.hacks;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
+import net.wurstclient.events.RenderListener;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
 import net.wurstclient.settings.AttackSpeedSliderSetting;
+import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.PauseAttackOnContainersSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
 import net.wurstclient.settings.SwingHandSetting;
 import net.wurstclient.settings.SwingHandSetting.SwingHand;
 import net.wurstclient.settings.filterlists.EntityFilterList;
 import net.wurstclient.util.EntityUtils;
+import net.wurstclient.util.NpcUtils;
+import net.wurstclient.util.RenderUtils;
 import net.wurstclient.util.RotationUtils;
 
 @SearchTags({"multi aura", "ForceField", "force field"})
-public final class MultiAuraHack extends Hack implements UpdateListener
+public final class MultiAuraHack extends Hack
+	implements UpdateListener, RenderListener
 {
 	private final SliderSetting range =
 		new SliderSetting("Range", 5, 1, 6, 0.05, ValueDisplay.DECIMAL);
@@ -47,6 +54,16 @@ public final class MultiAuraHack extends Hack implements UpdateListener
 	private final EntityFilterList entityFilters =
 		EntityFilterList.genericCombat();
 
+	private final CheckboxSetting ignoreNpcs = new CheckboxSetting(
+		"Ignore NPCs", "Skips likely server-side NPC players.", true);
+	
+	private final CheckboxSetting showAttackTracers =
+		new CheckboxSetting("Show attack tracers",
+			"Draw tracer lines to entities MultiAura is currently targeting.",
+			false);
+	
+	private final List<Entity> currentTargets = new ArrayList<>();
+	
 	public MultiAuraHack()
 	{
 		super("MultiAura");
@@ -57,6 +74,8 @@ public MultiAuraHack()
 		addSetting(fov);
 		addSetting(swingHand);
 		addSetting(pauseOnContainers);
+		addSetting(ignoreNpcs);
+		addSetting(showAttackTracers);
 
 		entityFilters.forEach(this::addSetting);
 	}
@@ -77,17 +96,21 @@ protected void onEnable()
 
 		speed.resetTimer();
 		EVENTS.add(UpdateListener.class, this);
+		EVENTS.add(RenderListener.class, this);
 	}
 
 	@Override
 	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
+		EVENTS.remove(RenderListener.class, this);
+		currentTargets.clear();
 	}
 
 	@Override
 	public void onUpdate()
 	{
+		currentTargets.clear();
 		speed.updateTimer();
 		if(!speed.isTimeToAttack())
 			return;
@@ -107,10 +130,16 @@ public void onUpdate()
 
 		stream = entityFilters.applyTo(stream);
 
+		if(ignoreNpcs.isChecked())
+			stream = stream.filter(
+				e -> !(e instanceof net.minecraft.world.entity.player.Player p)
+					|| !NpcUtils.isLikelyNpcPlayer(p));
+		
 		ArrayList<Entity> entities =
 			stream.collect(Collectors.toCollection(ArrayList::new));
 		if(entities.isEmpty())
 			return;
+		currentTargets.addAll(entities);
 
 		WURST.getHax().autoSwordHack.setSlot(entities.get(0));
 
@@ -127,4 +156,26 @@ public void onUpdate()
 		swingHand.swing(InteractionHand.MAIN_HAND);
 		speed.resetTimer();
 	}
+	
+	@Override
+	public void onRender(PoseStack matrixStack, float partialTicks)
+	{
+		if(!showAttackTracers.isChecked() || currentTargets.isEmpty())
+			return;
+		
+		ArrayList<RenderUtils.ColoredPoint> points = new ArrayList<>();
+		for(Entity e : currentTargets)
+		{
+			if(e == null || e.isRemoved())
+				continue;
+			points.add(new RenderUtils.ColoredPoint(
+				e.getBoundingBox().getCenter(), 0xFFFF4444));
+		}
+		
+		if(points.isEmpty())
+			return;
+		
+		RenderUtils.drawTracers("multiaura_debug", matrixStack, partialTicks,
+			points, false, 2.0);
+	}
 }

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

@@ -1185,6 +1185,7 @@ private void markNew(ChunkPos chunkPos)
 		indexRemove(idxOldGen, chunkPos);
 		if(saveChunkData.isChecked())
 			saveChunk(Paths.NewChunkData, chunkPos);
+		WURST.getHax().webhookAlertHack.onChunkDetected("new chunk", chunkPos);
 		triggerAlarm(AlarmType.NEW);
 	}
 
@@ -1203,6 +1204,7 @@ private void markOld(ChunkPos chunkPos)
 		indexRemove(idxOldGen, chunkPos);
 		if(saveChunkData.isChecked())
 			saveChunk(Paths.OldChunkData, chunkPos);
+		WURST.getHax().webhookAlertHack.onChunkDetected("old chunk", chunkPos);
 		triggerAlarm(AlarmType.OLD);
 	}