FPS & TPS Graph

Author: cev-api

README.md

@@ -284,6 +284,7 @@ A ready-to-publish starter project is included here: [https://github.com/cev-api
 - Adjustable Tri-state Beacon Mode on waypoints (On/Off/ESP) that matches the waypoint's color.
 - Toggleable automatic portal logging, logs numerically each portal you enter and matches it in the opposite dimension with the same number.
 - Optional distance based label scaling
+- Optional dimming or hiding of on-screen waypoints unless looking directly at them
 
 
 #### Waypoint Commands
@@ -863,6 +864,10 @@ Purpose: helps you avoid and debug anticheat flags by cleaning risky movement pa
 - FPS/TPS/Ping show running averages in brackets (e.g. `Ping: 30 (21)`)
 - Style settings: font size, font opacity, font color, font stroke, background box toggle, background color, and background opacity
 - Per-stat visibility toggles plus a universal `Show Prefixes` and `Show Averages` toggle for labels
+- FPS and TPS graph
+  - Can be embedded into GameStats or detached
+  - When detached can be resizable via settings or dragging bottom right corner
+  - Adjustable colors
 
 ![FPS](https://i.imgur.com/MhmAno5.png)
 

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

@@ -102,6 +102,30 @@ public final class GameStatsHack extends Hack implements PacketInputListener,
 	private final CheckboxSetting showAverages =
 		new CheckboxSetting("Show Averages", true);
 
+	private final CheckboxSetting showGraph =
+		new CheckboxSetting("Show graph", false);
+	
+	private final CheckboxSetting separateGraphWindow =
+		new CheckboxSetting("Separate graph window", false);
+	
+	private final ColorSetting fpsGraphColor =
+		new ColorSetting("FPS graph color", new Color(0x53, 0xC7, 0xFF, 0xFF));
+	
+	private final ColorSetting tpsGraphColor =
+		new ColorSetting("TPS graph color", new Color(0xFF, 0xB3, 0x47, 0xFF));
+	
+	private final SliderSetting graphWindowWidth = new SliderSetting(
+		"Graph width", 220, 120, 1000, 1, ValueDisplay.INTEGER);
+	
+	private final SliderSetting graphWindowHeight = new SliderSetting(
+		"Graph height", 120, 70, 800, 1, ValueDisplay.INTEGER);
+	
+	private final SliderSetting graphWindowOffsetX = new SliderSetting(
+		"Graph X offset", 180, -2000, 2000, 1, ValueDisplay.INTEGER);
+	
+	private final SliderSetting graphWindowOffsetY = new SliderSetting(
+		"Graph Y offset", 0, -2000, 2000, 1, ValueDisplay.INTEGER);
+	
 	private final ArrayDeque<Long> incomingPacketTimes = new ArrayDeque<>();
 	private final ArrayDeque<Long> outgoingPacketTimes = new ArrayDeque<>();
 	private final Object packetTimesLock = new Object();
@@ -135,6 +159,14 @@ public GameStatsHack()
 		addSetting(hudOffsetY);
 		addSetting(showPrefixes);
 		addSetting(showAverages);
+		addSetting(showGraph);
+		addSetting(separateGraphWindow);
+		addSetting(fpsGraphColor);
+		addSetting(tpsGraphColor);
+		addSetting(graphWindowWidth);
+		addSetting(graphWindowHeight);
+		addSetting(graphWindowOffsetX);
+		addSetting(graphWindowOffsetY);
 	}
 
 	@Override
@@ -343,6 +375,98 @@ public boolean showAverages()
 		return showAverages.isChecked();
 	}
 
+	public boolean showGraph()
+	{
+		return showGraph.isChecked();
+	}
+	
+	public boolean separateGraphWindow()
+	{
+		return separateGraphWindow.isChecked();
+	}
+	
+	public int getFpsGraphColorI()
+	{
+		return fpsGraphColor.getColorI();
+	}
+	
+	public int getTpsGraphColorI()
+	{
+		return tpsGraphColor.getColorI();
+	}
+	
+	public int getGraphWindowWidth()
+	{
+		return graphWindowWidth.getValueI();
+	}
+	
+	public int getGraphWindowHeight()
+	{
+		return graphWindowHeight.getValueI();
+	}
+	
+	public int getGraphWindowOffsetX()
+	{
+		return graphWindowOffsetX.getValueI();
+	}
+	
+	public int getGraphWindowOffsetY()
+	{
+		return graphWindowOffsetY.getValueI();
+	}
+	
+	public int getGraphWindowMinWidth()
+	{
+		return (int)graphWindowWidth.getMinimum();
+	}
+	
+	public int getGraphWindowMaxWidth()
+	{
+		return (int)graphWindowWidth.getMaximum();
+	}
+	
+	public int getGraphWindowMinHeight()
+	{
+		return (int)graphWindowHeight.getMinimum();
+	}
+	
+	public int getGraphWindowMaxHeight()
+	{
+		return (int)graphWindowHeight.getMaximum();
+	}
+	
+	public int getGraphWindowMinOffsetX()
+	{
+		return (int)graphWindowOffsetX.getMinimum();
+	}
+	
+	public int getGraphWindowMaxOffsetX()
+	{
+		return (int)graphWindowOffsetX.getMaximum();
+	}
+	
+	public int getGraphWindowMinOffsetY()
+	{
+		return (int)graphWindowOffsetY.getMinimum();
+	}
+	
+	public int getGraphWindowMaxOffsetY()
+	{
+		return (int)graphWindowOffsetY.getMaximum();
+	}
+	
+	public void setGraphWindowOffsets(int x, int y)
+	{
+		graphWindowOffsetX.setValue(x);
+		graphWindowOffsetY.setValue(y);
+	}
+	
+	public void setGraphWindowSize(int width, int height)
+	{
+		graphWindowWidth.setValue(width);
+		graphWindowHeight.setValue(height);
+	}
+	
 	public int getHudOffsetX()
 	{
 		return hudOffsetX.getValueI();

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

@@ -43,6 +43,7 @@
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.ColorSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
+import net.wurstclient.util.BlockUtils;
 import net.wurstclient.util.RenderUtils;
 import net.wurstclient.waypoints.Waypoint;
 import net.wurstclient.waypoints.WaypointDimension;
@@ -141,6 +142,14 @@ public void update()
 		new CheckboxSetting("Compass text outline", true);
 	private final SliderSetting compassOutlineOpacity = new SliderSetting(
 		"Compass outline opacity", 100, 0, 100, 1, ValueDisplay.INTEGER);
+	private final CheckboxSetting dimObscuredOnScreenWaypoints =
+		new CheckboxSetting("Dim obscured on-screen waypoints",
+			"When a waypoint is hidden behind blocks, greatly dim its on-screen compass marker unless you're looking directly at it.",
+			false);
+	private final CheckboxSetting iconOnlyForObscuredOnScreenWaypoints =
+		new CheckboxSetting("Icon-only when obscured",
+			"When a waypoint is hidden behind blocks, only show its icon on the on-screen compass unless you're looking directly at it.",
+			false);
 
 	// Waypoint world-label outline settings
 	private final CheckboxSetting waypointOutline =
@@ -196,6 +205,8 @@ public WaypointsHack()
 		addSetting(compassOpacity);
 		addSetting(compassOutline);
 		addSetting(compassOutlineOpacity);
+		addSetting(dimObscuredOnScreenWaypoints);
+		addSetting(iconOnlyForObscuredOnScreenWaypoints);
 		addSetting(waypointOutline);
 		addSetting(waypointOutlineOpacity);
 		addSetting(compassBackgroundOpacity);
@@ -781,6 +792,20 @@ public void onRender(PoseStack matrices, float partialTicks)
 
 			double distSq = MC.player.distanceToSqr(wp.getX() + 0.5,
 				wp.getY() + 0.5, wp.getZ() + 0.5);
+			boolean applyObscuredRules =
+				dimObscuredOnScreenWaypoints.isChecked()
+					|| iconOnlyForObscuredOnScreenWaypoints.isChecked();
+			boolean obscured = applyObscuredRules && isWaypointObscured(wp);
+			boolean directlyLooked =
+				obscured && isDirectlyLookingAtWaypoint(wp, 5.0);
+			boolean suppressDetails = obscured && !directlyLooked
+				&& iconOnlyForObscuredOnScreenWaypoints.isChecked();
+			int waypointColor = applyFade(w.getColor(), distSq);
+			if(obscured && !directlyLooked
+				&& dimObscuredOnScreenWaypoints.isChecked())
+			{
+				waypointColor = dimForObscured(waypointColor);
+			}
 			double dist = Math.sqrt(distSq);
 			double trd = waypointRenderDistance.getValue();
 			boolean infiniteLabels = trd >= DISTANCE_SLIDER_INFINITE;
@@ -800,12 +825,10 @@ public void onRender(PoseStack matrices, float partialTicks)
 			{
 				RenderUtils.drawTracer(matrices, partialTicks,
 					new Vec3(wp.getX() + 0.5, wp.getY() + 0.5, wp.getZ() + 0.5),
-					applyFade(w.getColor(), distSq), false);
-				RenderUtils
-					.drawOutlinedBoxes(matrices,
-						java.util.List.of(new RenderUtils.ColoredBox(
-							new AABB(wp), applyFade(w.getColor(), distSq))),
-						false);
+					waypointColor, false);
+				RenderUtils.drawOutlinedBoxes(matrices, java.util.List.of(
+					new RenderUtils.ColoredBox(new AABB(wp), waypointColor)),
+					false);
 			}
 
 			if(!beyondMaxVisible)
@@ -829,16 +852,18 @@ public void onRender(PoseStack matrices, float partialTicks)
 				if(beaconsEnabled && beaconMode != Waypoint.BeaconMode.OFF)
 				{
 					if(beaconInfinite || distSq <= beaconRangeSq)
-						drawBeaconBeam(matrices, wp,
-							applyFade(w.getColor(), distSq), beaconMode);
+						drawBeaconBeam(matrices, wp, waypointColor, beaconMode);
 				}
 			}
 
 			if(renderLabel)
 			{
 				String title = w.getName() == null ? "" : w.getName();
 				String icon = iconChar(w.getIcon());
-				if(!icon.isEmpty())
+				if(suppressDetails)
+				{
+					title = icon.isEmpty() ? "●" : icon;
+				}else if(!icon.isEmpty())
 					title = icon + (title.isEmpty() ? "" : " " + title);
 				String distanceText = (int)dist + " blocks";
 				double baseY = wp.getY() + 1.2;
@@ -919,10 +944,11 @@ public void onRender(PoseStack matrices, float partialTicks)
 				}
 				// Keep a constant 10px separation using local pixel offset
 				float sepPx = 10.0f;
-				drawWorldLabel(matrices, title, lx, ly, lz,
-					applyFade(w.getColor(), distSq), scale, -sepPx);
-				drawWorldLabel(matrices, distanceText, lx, ly, lz,
-					applyFade(w.getColor(), distSq), (float)(scale * 0.9f), 0f);
+				drawWorldLabel(matrices, title, lx, ly, lz, waypointColor,
+					scale, -sepPx);
+				if(!suppressDetails)
+					drawWorldLabel(matrices, distanceText, lx, ly, lz,
+						waypointColor, (float)(scale * 0.9f), 0f);
 			}
 		}
 	}
@@ -1476,7 +1502,9 @@ public void onRenderGUI(GuiGraphicsExtractor context, float partialTicks)
 		for(WaypointEntry e : entries)
 		{
 			int ix = (int)Math.round(e.x);
-			if(selected != null && e.w.getUuid().equals(selected.w.getUuid()))
+			boolean directlyLooked =
+				selected != null && e.w.getUuid().equals(selected.w.getUuid());
+			if(directlyLooked)
 				ix = centerX; // center selected
 			String icon = iconChar(e.w.getIcon());
 			if(icon == null)
@@ -1618,6 +1646,48 @@ private static String cardinalFromYaw(double yaw)
 		}
 	}
 
+	private boolean isWaypointObscured(BlockPos waypointPos)
+	{
+		if(MC.player == null || MC.level == null || waypointPos == null)
+			return false;
+		
+		Vec3 eyes = MC.player.getEyePosition(1.0F);
+		Vec3 target = new Vec3(waypointPos.getX() + 0.5,
+			waypointPos.getY() + 1.2, waypointPos.getZ() + 0.5);
+		return !BlockUtils.hasLineOfSight(eyes, target);
+	}
+	
+	private boolean isDirectlyLookingAtWaypoint(BlockPos waypointPos,
+		double maxAngleDeg)
+	{
+		if(MC.player == null || waypointPos == null)
+			return false;
+		
+		Vec3 eyes = MC.player.getEyePosition(1.0F);
+		Vec3 target = new Vec3(waypointPos.getX() + 0.5,
+			waypointPos.getY() + 1.2, waypointPos.getZ() + 0.5);
+		Vec3 toWp = target.subtract(eyes);
+		double len = toWp.length();
+		if(len < 1.0E-6)
+			return true;
+		
+		Vec3 dir = toWp.scale(1.0 / len);
+		Vec3 look = MC.player.getLookAngle();
+		double dot = look.dot(dir);
+		dot = Math.max(-1.0, Math.min(1.0, dot));
+		double angle = Math.toDegrees(Math.acos(dot));
+		return angle <= maxAngleDeg;
+	}
+	
+	private int dimForObscured(int argb)
+	{
+		int a = (argb >>> 24) & 0xFF;
+		if(a <= 0)
+			a = 0xFF;
+		int dimmedAlpha = Math.max(14, (int)Math.round(a * 0.2));
+		return withAlpha(argb, dimmedAlpha);
+	}
+	
 	private static final class WaypointEntry
 	{
 		final Waypoint w;