Move rubberband analysis to module

Author: Avanatiker

common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt

@@ -106,7 +106,7 @@ object ModuleCommand : LambdaCommand {
                                             literal("$name already ")
                                             literal(if (module.isEnabled) "enabled" else "disabled")
                                         }
-                                    }, "")
+                                    })
                                     return@runSafe success()
                                 }
 

common/src/main/kotlin/com/lambda/interaction/PlayerPacketManager.kt

@@ -28,7 +28,7 @@ import net.minecraft.util.math.MathHelper.square
 import net.minecraft.util.math.Vec3d
 
 object PlayerPacketManager : Loadable {
-    private val configurations = LimitedOrderedSet<PlayerPacketEvent.Pre>(100)
+    val configurations = LimitedOrderedSet<PlayerPacketEvent.Pre>(100)
     private var sendTicks = 0
 
     @JvmStatic
@@ -46,35 +46,6 @@ object PlayerPacketManager : Loadable {
         }
     }
 
-    init {
-        listener<PacketEvent.Receive.Pre> { event ->
-            if (event.packet !is PlayerPositionLookS2CPacket) return@listener
-
-            if (configurations.isEmpty()) {
-                warn("Position was reverted", "Rubberband")
-                return@listener
-            }
-
-            val newPos = Vec3d(event.packet.x, event.packet.y, event.packet.z)
-            val last = configurations.minBy {
-                it.position distSq newPos
-            }
-            val delta = last.position dist newPos
-
-            warn(buildText {
-                literal("Reverted position by ")
-                color(Color.YELLOW) {
-                    literal("${configurations.reversed().indexOf(last) + 1}")
-                }
-                literal(" ticks (derivation: ")
-                color(Color.YELLOW) {
-                    literal("%.3f".format(delta))
-                }
-                literal(")")
-            }, "Rubberband")
-        }
-    }
-
     private fun SafeContext.updatePlayerPackets(new: PlayerPacketEvent.Pre) {
         val previous = configurations.lastOrNull() ?: new
         configurations.add(new)

common/src/main/kotlin/com/lambda/module/modules/client/Rubberband.kt

@@ -0,0 +1,56 @@
+package com.lambda.module.modules.client
+
+import com.lambda.event.events.PacketEvent
+import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.interaction.PlayerPacketManager
+import com.lambda.module.Module
+import com.lambda.module.tag.ModuleTag
+import com.lambda.util.Communication.warn
+import com.lambda.util.math.VecUtils.dist
+import com.lambda.util.math.VecUtils.distSq
+import com.lambda.util.text.Color
+import com.lambda.util.text.buildText
+import com.lambda.util.text.color
+import com.lambda.util.text.literal
+import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket
+import net.minecraft.util.math.Vec3d
+
+// ToDo: Should also include last packet info as HUD element and connection state. We may find a better name.
+object Rubberband : Module(
+    name = "Rubberband",
+    description = "Info about rubberbands",
+    defaultTags = setOf(ModuleTag.CLIENT)
+) {
+    private val showLastPacketInfo by setting("Show Last Packet", true)
+    private val showConnectionState by setting("Show Connection State", true)
+    private val showRubberbandInfo by setting("Show Rubberband Info", true)
+
+    init {
+        listener<PacketEvent.Receive.Pre> { event ->
+            if (!showRubberbandInfo) return@listener
+            if (event.packet !is PlayerPositionLookS2CPacket) return@listener
+
+            if (PlayerPacketManager.configurations.isEmpty()) {
+                this@Rubberband.warn("Position was reverted")
+                return@listener
+            }
+
+            val newPos = Vec3d(event.packet.x, event.packet.y, event.packet.z)
+            val last = PlayerPacketManager.configurations.minBy {
+                it.position distSq newPos
+            }
+
+            this@Rubberband.warn(buildText {
+                literal("Reverted position by ")
+                color(Color.YELLOW) {
+                    literal("${PlayerPacketManager.configurations.reversed().indexOf(last) + 1}")
+                }
+                literal(" ticks (derivation: ")
+                color(Color.YELLOW) {
+                    literal("%.3f".format(last.position dist newPos))
+                }
+                literal(")")
+            })
+        }
+    }
+}

common/src/main/kotlin/com/lambda/util/Communication.kt

@@ -14,7 +14,6 @@ object Communication {
     fun Any.info(message: String, source: String = "") = log(LogLevel.INFO.text(message), LogLevel.INFO, source)
     fun Any.info(message: Text, source: Text = Text.empty()) = log(message, LogLevel.INFO, textSource = source)
     fun Any.warn(message: String, source: String = "") = log(LogLevel.WARN.text(message), LogLevel.WARN, source)
-    fun Any.warn(message: Text, source: String = "") = log(message, LogLevel.WARN, source)
     fun Any.warn(message: Text, source: Text = Text.empty()) = log(message, LogLevel.WARN, textSource = source)
     fun Any.logError(message: String, source: String = "") = log(LogLevel.ERROR.text(message), LogLevel.ERROR, source)
     fun Any.logError(message: Text, source: Text = Text.empty()) = log(message, LogLevel.ERROR, textSource = source)