Added packet info HUD element

Author: Avanatiker

src/main/kotlin/com/lambda/client/gui/hudgui/elements/misc/FPS.kt

@@ -4,8 +4,6 @@ import com.lambda.client.event.SafeClientEvent
 import com.lambda.client.gui.hudgui.LabelHud
 import com.lambda.client.util.CircularArray
 import com.lambda.client.util.graphics.AnimationUtils
-import kotlin.math.max
-import kotlin.math.min
 import kotlin.math.roundToInt
 
 internal object FPS : LabelHud(
@@ -14,9 +12,9 @@ internal object FPS : LabelHud(
     description = "Frames per second in game"
 ) {
 
-    private val showAverage = setting("Show Average", true)
-    private val showMin = setting("Show Min", false)
-    private val showMax = setting("Show Max", false)
+    private val showAverage by setting("Show Average", true)
+    private val showMin by setting("Show Min", false)
+    private val showMax by setting("Show Max", false)
 
     private var updateTime = 0L
     private var prevFps = 0
@@ -44,29 +42,22 @@ internal object FPS : LabelHud(
         val fps = (prevFps + (currentFps - prevFps) * deltaTime).roundToInt()
         val avg = (prevAvgFps + (currentAvgFps - prevAvgFps) * deltaTime).roundToInt()
 
-        var min = 6969
-        var max = 0
-        for (value in longFps) {
-            if (value != 0) min = min(value, min)
-            max = max(value, max)
-        }
-
         displayText.add("FPS", secondaryColor)
         displayText.add(fps.toString(), primaryColor)
 
-        if (showAverage.value) {
+        if (showAverage) {
             displayText.add("AVG", secondaryColor)
             displayText.add(avg.toString(), primaryColor)
         }
 
-        if (showMin.value) {
+        if (showMin) {
             displayText.add("MIN", secondaryColor)
-            displayText.add(min.toString(), primaryColor)
+            displayText.add(longFps.min().toString(), primaryColor)
         }
 
-        if (showMax.value) {
+        if (showMax) {
             displayText.add("MAX", secondaryColor)
-            displayText.add(max.toString(), primaryColor)
+            displayText.add(longFps.max().toString(), primaryColor)
         }
     }
 

src/main/kotlin/com/lambda/client/gui/hudgui/elements/misc/Packets.kt

@@ -0,0 +1,48 @@
+package com.lambda.client.gui.hudgui.elements.misc
+
+import com.lambda.client.event.SafeClientEvent
+import com.lambda.client.gui.hudgui.LabelHud
+import com.lambda.client.manager.managers.PacketManager
+
+internal object Packets : LabelHud(
+    name = "Packets",
+    category = Category.MISC,
+    description = "Information about your packet traffic."
+) {
+    private val perSecond by setting("Per second", true)
+    private val total by setting("Total", true)
+    private val lastSent by setting("Last sent packet info", true)
+    private val lastReceived by setting("Last received packet info", true)
+
+    override fun SafeClientEvent.updateText() {
+        if (perSecond) {
+            displayText.add("Sent/s", secondaryColor)
+            displayText.add(PacketManager.recentSent.count().toString(), primaryColor)
+            displayText.add("Received/s", secondaryColor)
+            displayText.addLine(PacketManager.recentReceived.count().toString(), primaryColor)
+        }
+
+        if (total) {
+            displayText.add("Total sent", secondaryColor)
+            displayText.add(PacketManager.totalSent.toString(), primaryColor)
+            displayText.add("Total received", secondaryColor)
+            displayText.addLine(PacketManager.totalReceived.toString(), primaryColor)
+        }
+
+        if (lastSent) {
+            PacketManager.recentSent.lastOrNull()?.let {
+                displayText.add("Last sent", secondaryColor)
+                displayText.add(it.first.javaClass.simpleName ?: "None", primaryColor)
+                displayText.addLine("${System.currentTimeMillis() - it.second}ms", primaryColor)
+            }
+        }
+
+        if (lastReceived) {
+            PacketManager.recentReceived.lastOrNull()?.let {
+                displayText.add("Last received", secondaryColor)
+                displayText.add(it.first.javaClass.simpleName ?: "None", primaryColor)
+                displayText.addLine("${System.currentTimeMillis() - it.second}ms", primaryColor)
+            }
+        }
+    }
+}

src/main/kotlin/com/lambda/client/manager/managers/PacketManager.kt

@@ -5,13 +5,32 @@ import com.lambda.client.event.events.PacketEvent
 import com.lambda.client.event.listener.listener
 import com.lambda.client.manager.Manager
 import com.lambda.client.util.threads.safeListener
+import net.minecraft.network.Packet
 import net.minecraft.network.play.server.SPacketPlayerPosLook
+import net.minecraftforge.fml.common.gameevent.TickEvent
+import java.util.concurrent.ConcurrentLinkedDeque
 
 object PacketManager : Manager {
+    private const val maxAge = 1000L
+
+    val recentReceived = ConcurrentLinkedDeque<Pair<Packet<*>,Long>>()
+    var totalReceived = 0
+
+    val recentSent = ConcurrentLinkedDeque<Pair<Packet<*>,Long>>()
+    var totalSent = 0
+
     var lastTeleportId = -1
 
     init {
-        listener<PacketEvent.Receive> {
+        listener<PacketEvent.PostSend> {
+            recentSent.add(Pair(it.packet, System.currentTimeMillis()))
+            totalSent++
+        }
+
+        listener<PacketEvent.PostReceive> {
+            recentReceived.add(Pair(it.packet, System.currentTimeMillis()))
+            totalReceived++
+
             when (it.packet) {
                 is SPacketPlayerPosLook -> {
                     lastTeleportId = it.packet.teleportId
@@ -22,5 +41,12 @@ object PacketManager : Manager {
         safeListener<ConnectionEvent> {
             lastTeleportId = -1
         }
+
+        safeListener<TickEvent.ClientTickEvent> {
+            val currentTime = System.currentTimeMillis()
+
+            recentReceived.removeIf { currentTime - it.second > maxAge }
+            recentSent.removeIf { currentTime - it.second > maxAge }
+        }
     }
 }