Updated PerformanceOverlay, GameStats, ClientChatOverlay

Author: cev-api

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

@@ -36,6 +36,10 @@ public final class ClientChatOverlayHack extends Hack
 		new CheckboxSetting("Only Wurst messages", false);
 	private final CheckboxSetting extraPanelForWurstMessages =
 		new CheckboxSetting("Extra panel for Wurst-only messages", false);
+	private final CheckboxSetting holdTabOpensChat = new CheckboxSetting(
+		"Hold Tab opens chat",
+		"While held, opens vanilla chat like pressing T. Releasing Tab closes it.",
+		false);
 	private final TextFieldSetting forceClientKeywords = new TextFieldSetting(
 		"Force client chat keywords",
 		"Comma-separated keywords that force a message into client chat.", "");
@@ -77,6 +81,7 @@ public ClientChatOverlayHack()
 		addSetting(routeToConsole);
 		addSetting(onlyWurstMessages);
 		addSetting(extraPanelForWurstMessages);
+		addSetting(holdTabOpensChat);
 		addSetting(forceClientKeywords);
 		addSetting(forceNormalKeywords);
 		addSetting(colorUsernames);
@@ -114,6 +119,11 @@ public boolean isExtraPanelForWurstMessages()
 		return extraPanelForWurstMessages.isChecked();
 	}
 
+	public boolean shouldHoldTabOpenChat()
+	{
+		return holdTabOpensChat.isChecked();
+	}
+	
 	public boolean matchesForceClientKeyword(String text)
 	{
 		return matchesAnyKeyword(text, getForceClientKeywords());

src/main/java/net/wurstclient/hud/ClientMessageOverlay.java

@@ -90,6 +90,7 @@ public final class ClientMessageOverlay
 	private int lastWurstY1;
 	private int lastWurstX2;
 	private int lastWurstY2;
+	private boolean tabHeldForOverlay;
 
 	private ClientMessageOverlay()
 	{}
@@ -228,24 +229,34 @@ public void render(GuiGraphicsExtractor context)
 		if(hack == null || !hack.isEnabled())
 			return;
 
+		handleHoldTabOpensChat(hack);
+		
 		boolean splitWurstPanel = hack.isExtraPanelForWurstMessages();
-		if(messages.isEmpty() && (!splitWurstPanel || wurstMessages.isEmpty()))
+		boolean hasVanillaMessages =
+			tabHeldForOverlay && hasVanillaChatMessages();
+		if(messages.isEmpty() && (!splitWurstPanel || wurstMessages.isEmpty())
+			&& !hasVanillaMessages)
 			return;
 
 		float chatScale = WurstClient.MC.options.chatScale().get().floatValue();
 		if(chatScale <= 0)
 			return;
 
-		boolean chatOpen = WurstClient.MC.screen instanceof ChatScreen;
+		boolean chatOpen =
+			WurstClient.MC.screen instanceof ChatScreen || tabHeldForOverlay;
 		int maxLines = hack.getMaxLines();
 		int maxWidth = Mth.floor(
 			ChatComponent.getWidth(WurstClient.MC.options.chatWidth().get())
 				/ chatScale);
 		if(maxWidth <= 0)
 			return;
 
-		List<RenderLine> allLines =
-			buildAllLines(messages, maxWidth, chatOpen || hoveredMainPanel);
+		List<RenderLine> allLines;
+		if(tabHeldForOverlay)
+			allLines = buildCombinedLines(messages, maxWidth);
+		else
+			allLines =
+				buildAllLines(messages, maxWidth, chatOpen || hoveredMainPanel);
 		totalLineCount = allLines.size();
 		int maxScroll = Math.max(0, totalLineCount - maxLines);
 		scrollOffset = Mth.clamp(scrollOffset, 0, maxScroll);
@@ -1013,6 +1024,62 @@ private static String extractLastUsernameToken(String text)
 		return last;
 	}
 
+	private boolean hasVanillaChatMessages()
+	{
+		List<GuiMessage.Line> vanillaLines =
+			WurstClient.MC.gui.getChat().trimmedMessages;
+		return vanillaLines != null && !vanillaLines.isEmpty();
+	}
+	
+	private List<RenderLine> buildCombinedLines(Deque<Entry> overlayMessages,
+		int maxWidth)
+	{
+		List<TimedRenderLine> timed = new ArrayList<>();
+		long nowMs = System.currentTimeMillis();
+		int guiTicks = WurstClient.MC.gui.getGuiTicks();
+		
+		// Overlay entries (system/Wurst messages)
+		synchronized(overlayMessages)
+		{
+			for(Entry entry : overlayMessages)
+			{
+				Component renderComponent =
+					applyDefaultTextColorIfEnabled(entry.component());
+				List<FormattedCharSequence> wrapped =
+					ComponentRenderUtils.wrapComponents(renderComponent,
+						maxWidth, WurstClient.MC.font);
+				for(int i = wrapped.size() - 1; i >= 0; i--)
+					timed.add(
+						new TimedRenderLine(new RenderLine(wrapped.get(i), 255),
+							entry.timestamp()));
+			}
+		}
+		
+		// Vanilla chat entries (player chat messages)
+		List<GuiMessage.Line> vanillaLines =
+			WurstClient.MC.gui.getChat().trimmedMessages;
+		if(vanillaLines != null)
+			for(GuiMessage.Line line : vanillaLines)
+			{
+				int tickAge = guiTicks - line.addedTime();
+				if(tickAge >= 0)
+					timed.add(
+						new TimedRenderLine(new RenderLine(line.content(), 255),
+							nowMs - tickAge * 50L));
+			}
+		
+		// Sort newest first (matching buildAllLines order)
+		timed.sort((a, b) -> Long.compare(b.sortKey, a.sortKey));
+		
+		List<RenderLine> result = new ArrayList<>(timed.size());
+		for(TimedRenderLine t : timed)
+			result.add(t.line);
+		return result;
+	}
+	
+	private record TimedRenderLine(RenderLine line, long sortKey)
+	{}
+	
 	private List<RenderLine> buildAllLines(Deque<Entry> source, int maxWidth,
 		boolean fullOpacity)
 	{
@@ -1379,6 +1446,32 @@ private static boolean isMouseOverPanel(GuiGraphicsExtractor context,
 		return mouseX >= x1 && mouseX <= x2 && mouseY >= y1 && mouseY <= y2;
 	}
 
+	private void handleHoldTabOpensChat(ClientChatOverlayHack hack)
+	{
+		if(WurstClient.MC == null)
+			return;
+		
+		if(!hack.shouldHoldTabOpenChat())
+		{
+			tabHeldForOverlay = false;
+			return;
+		}
+		
+		Window window = WurstClient.MC.getWindow();
+		if(window == null)
+			return;
+		
+		boolean tabDown = GLFW.glfwGetKey(window.handle(),
+			GLFW.GLFW_KEY_TAB) == GLFW.GLFW_PRESS;
+		
+		tabHeldForOverlay = tabDown;
+	}
+	
+	public boolean isTabHeldForOverlay()
+	{
+		return tabHeldForOverlay;
+	}
+	
 	private record Entry(Component component, long timestamp)
 	{}
 

src/main/java/net/wurstclient/hud/GameStatsHud.java

@@ -913,8 +913,9 @@ private void commitGraphResize()
 	private void handleDrag(GuiGraphicsExtractor context, float x, float y,
 		float width, float height)
 	{
-		boolean containerOpen = MC.screen instanceof AbstractContainerScreen<?>;
-		if(!containerOpen)
+		boolean canEdit = MC.screen instanceof ChatScreen
+			|| MC.screen instanceof AbstractContainerScreen<?>;
+		if(!canEdit)
 		{
 			if(dragging)
 				commitDraggedOffset();

src/main/java/net/wurstclient/util/HackPerformanceOverlay.java

@@ -74,12 +74,11 @@ public void render(GuiGraphicsExtractor graphics)
 			return;
 
 		if(otf.shouldShowGraph())
-			updateGraphSample(snapshot.rows());
+			updateGraphSample(snapshot.allTotalMs());
 
 		int availableWidth = Math.max(120,
 			scaledWidth - HORIZONTAL_MARGIN * 2 - BOX_PADDING * 2);
-		ArrayList<String> lines =
-			buildLines(snapshot.rows(), snapshot.usingWindowData(), otf);
+		ArrayList<String> lines = buildLines(snapshot, otf);
 		if(lines.isEmpty())
 			return;
 
@@ -135,25 +134,59 @@ public void render(GuiGraphicsExtractor graphics)
 		}
 	}
 
-	private ArrayList<String> buildLines(List<HackPerformanceTracker.Row> rows,
-		boolean usingWindowData, PerformanceOverlayOtf otf)
+	private ArrayList<String> buildLines(
+		HackPerformanceTracker.ListSnapshot snapshot, PerformanceOverlayOtf otf)
 	{
 		ArrayList<String> lines = new ArrayList<>();
-		String mode = usingWindowData ? "1s" : "live";
-		lines.add("Hack Perf [" + mode + "] sort="
+		List<HackPerformanceTracker.Row> rows = snapshot.rows();
+		boolean usingWindowData = snapshot.usingWindowData();
+		String mode = usingWindowData ? "1s window" : "live";
+		lines.add("Hack Performance [" + mode + "] sort="
 			+ (otf.getSortMode() == SortMode.PEAK_TIME ? "peak" : "total"));
 
+		double fps = Math.max(1, MC.getFps());
+		double frameMs = 1000.0 / fps;
+		double unattributedMs = Math.max(0, frameMs - snapshot.allTotalMs());
+		lines.add("Frame " + formatMs(frameMs) + " | Hacks "
+			+ formatMs(snapshot.allTotalMs()) + " | Other "
+			+ formatMs(unattributedMs));
+		lines.add("Top hacks: total " + (usingWindowData ? "ms/s" : "ms")
+			+ " (peak callback ms)");
+		if(snapshot.hiddenRowsTotalMs() > 0.01)
+			lines.add("Hidden by row limit: "
+				+ formatMs(snapshot.hiddenRowsTotalMs()));
+		
 		for(HackPerformanceTracker.Row row : rows)
 		{
 			StringBuilder sb = new StringBuilder(row.name());
-			sb.append(" | T ").append(formatMs(row.totalMs()));
-			if(otf.shouldShowUpdate())
-				sb.append(" U ").append(formatMs(row.updateMs()));
-			if(otf.shouldShowRender())
-				sb.append(" R ").append(formatMs(row.renderMs()));
-			if(otf.shouldShowGui())
-				sb.append(" G ").append(formatMs(row.guiMs()));
-			sb.append(" | P ").append(formatMs(row.peakMs()));
+			sb.append(" | ").append(formatMs(row.totalMs()));
+			sb.append(" (peak ").append(formatMs(row.peakMs())).append(")");
+			
+			if(otf.shouldShowUpdate() || otf.shouldShowRender()
+				|| otf.shouldShowGui())
+			{
+				sb.append(" [");
+				boolean wroteAnyBreakdown = false;
+				if(otf.shouldShowUpdate())
+				{
+					sb.append("update ").append(formatMs(row.updateMs()));
+					wroteAnyBreakdown = true;
+				}
+				if(otf.shouldShowRender())
+				{
+					if(wroteAnyBreakdown)
+						sb.append(", ");
+					sb.append("world ").append(formatMs(row.renderMs()));
+					wroteAnyBreakdown = true;
+				}
+				if(otf.shouldShowGui())
+				{
+					if(wroteAnyBreakdown)
+						sb.append(", ");
+					sb.append("gui ").append(formatMs(row.guiMs()));
+				}
+				sb.append("]");
+			}
 			lines.add(sb.toString());
 		}
 
@@ -191,18 +224,14 @@ private PerformanceOverlayOtf getSettings()
 		return WurstClient.INSTANCE.getOtfs().performanceOverlayOtf;
 	}
 
-	private void updateGraphSample(List<HackPerformanceTracker.Row> rows)
+	private void updateGraphSample(double allHackTotalMs)
 	{
 		long now = System.currentTimeMillis();
 		if(now - lastGraphSampleMs < GRAPH_SAMPLE_INTERVAL_MS)
 			return;
 
 		lastGraphSampleMs = now;
-		double totalMs = 0;
-		for(HackPerformanceTracker.Row row : rows)
-			totalMs += row.totalMs();
-		
-		pushGraphSample(totalMs);
+		pushGraphSample(allHackTotalMs);
 	}
 
 	private void pushGraphSample(double value)

src/main/java/net/wurstclient/util/HackPerformanceTracker.java

@@ -90,10 +90,29 @@ public static ListSnapshot getTopRows(int maxRows, SortMode sortMode)
 				rows.sort(Comparator.comparingDouble(Row::totalMs).reversed());
 
 			int limit = Math.max(1, maxRows);
-			if(rows.size() > limit)
-				rows = new ArrayList<>(rows.subList(0, limit));
+			double allUpdateMs = 0;
+			double allRenderMs = 0;
+			double allGuiMs = 0;
+			double allTotalMs = 0;
+			for(Row row : rows)
+			{
+				allUpdateMs += row.updateMs();
+				allRenderMs += row.renderMs();
+				allGuiMs += row.guiMs();
+				allTotalMs += row.totalMs();
+			}
+			
+			ArrayList<Row> visibleRows = rows;
+			if(visibleRows.size() > limit)
+				visibleRows = new ArrayList<>(visibleRows.subList(0, limit));
+			
+			double visibleTotalMs = 0;
+			for(Row row : visibleRows)
+				visibleTotalMs += row.totalMs();
 
-			return new ListSnapshot(rows, hasCompletedWindow);
+			return new ListSnapshot(visibleRows, hasCompletedWindow,
+				allUpdateMs, allRenderMs, allGuiMs, allTotalMs,
+				allTotalMs - visibleTotalMs);
 		}
 	}
 
@@ -193,6 +212,8 @@ public record Row(String name, double updateMs, double renderMs,
 		double guiMs, double totalMs, double peakMs)
 	{}
 
-	public record ListSnapshot(ArrayList<Row> rows, boolean usingWindowData)
+	public record ListSnapshot(ArrayList<Row> rows, boolean usingWindowData,
+		double allUpdateMs, double allRenderMs, double allGuiMs,
+		double allTotalMs, double hiddenRowsTotalMs)
 	{}
 }