TaskFlow ESP fix

Author: bladekt

common/src/main/kotlin/com/lambda/graphics/renderer/esp/ChunkedESP.kt

@@ -33,15 +33,15 @@ class ChunkedESP private constructor(
 
     init {
         concurrentListener<WorldEvent.BlockUpdate> { event ->
-            world.getWorldChunk(event.pos).renderer.notify()
+            world.getWorldChunk(event.pos).renderer.notifyChunks()
         }
 
         concurrentListener<WorldEvent.ChunkEvent.Load> { event ->
-            event.chunk.renderer.notify()
+            event.chunk.renderer.notifyChunks()
         }
 
         concurrentListener<WorldEvent.ChunkEvent.Unload> { event ->
-            rendererMap.remove(event.chunk.pos.toLong())?.notify()
+            rendererMap.remove(event.chunk.pos.toLong())?.notifyChunks()
         }
 
         owner.concurrentListener<TickEvent.Pre> {
@@ -86,7 +86,7 @@ class ChunkedESP private constructor(
             ChunkPos(chunk.pos.x + it.first, chunk.pos.z + it.second)
         }.toTypedArray()
 
-        fun notify() {
+        fun notifyChunks() {
             neighbors.forEach {
                 owner.rendererMap[it.toLong()]?.let {
                     owner.rebuildQueue.apply {

common/src/main/kotlin/com/lambda/graphics/renderer/esp/EspRenderer.kt

@@ -227,13 +227,9 @@ class EspRenderer(
         x: Double, y: Double, z: Double,
         color: Color
     ) = lazy {
-        val newVertex = {
+        faceVertices.getOrPut(Vertex(x, y, z, color)) {
             vec3(x, y, z).color(color).end()
         }
-
-        if (RenderSettings.vertexMapping) {
-            faceVertices.getOrPut(Vertex(x, y, z, color), newVertex)
-        } else newVertex()
     }
 
     data class Vertex(val x: Double, val y: Double, val z: Double, val color: Color)

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

@@ -21,7 +21,6 @@ object RenderSettings : Module(
     // ESP
     val uploadsPerTick by setting("Uploads", 16, 1..256, 1, unit = " chunk/tick") { page == Page.ESP }
     val rebuildsPerTick by setting("Rebuilds", 64, 1..256, 1, unit = " chunk/tick") { page == Page.ESP }
-    val vertexMapping by setting("Vertex Mapping", true) { page == Page.ESP }
     val updateFrequency by setting("Update Frequency", 2, 1..10, 1, "Frequency of block updates", unit = " ticks") { page == Page.ESP }
     val outlineWidth by setting("Outline Width", 1.0, 0.1..5.0, 0.1, "Width of block outlines", unit = "px") { page == Page.ESP }
 

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

@@ -3,7 +3,9 @@ package com.lambda.module.modules.client
 import com.lambda.config.groups.InteractionSettings
 import com.lambda.config.groups.BuildSettings
 import com.lambda.config.groups.RotationSettings
-import com.lambda.graphics.renderer.esp.ChunkedESP.Companion.newChunkedESP
+import com.lambda.event.events.RenderEvent
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.graphics.renderer.esp.EspRenderer
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
@@ -39,4 +41,18 @@ object TaskFlow : Module(
     val esp by mainThread {
         EspRenderer()
     }
+
+    init {
+        listener<TickEvent.Pre>(Int.MAX_VALUE) {
+            esp.clear()
+        }
+
+        listener<TickEvent.Post> {
+            esp.upload()
+        }
+
+        listener<RenderEvent.World> {
+            esp.render()
+        }
+    }
 }

common/src/main/kotlin/com/lambda/task/tasks/BuildStructure.kt

@@ -32,9 +32,7 @@ class BuildStructure @Ta5kBuilder constructor(
     private val cancelOnUnsolvable: Boolean = true,
 ) : Task<Unit>() {
 
-    abstract class PathingStrategy {
-
-    }
+    abstract class PathingStrategy
 
     override fun SafeContext.onStart() {
         (blueprint as? DynamicBlueprint)?.create(this)
@@ -52,8 +50,6 @@ class BuildStructure @Ta5kBuilder constructor(
             val results = blueprint.simulate(player.getCameraPosVec(mc.tickDelta))
             val resBlock = results.associateBy { it.blockPos }
 
-            TaskFlow.esp.clear()
-
             var sides = DirectionMask.ALL
 
             resBlock.forEach { (pos, res) ->
@@ -69,7 +65,6 @@ class BuildStructure @Ta5kBuilder constructor(
                     DirectionMask.OutlineMode.AND
                 )
             }
-            TaskFlow.esp.upload()
 
             val instantResults = results.filterIsInstance<BreakResult.Success>()
                 .filter { it.context.instantBreak }
@@ -104,10 +99,6 @@ class BuildStructure @Ta5kBuilder constructor(
                 }
             }
         }
-
-        listener<RenderEvent.World> {
-            TaskFlow.esp.render()
-        }
     }
 
     private fun SafeContext.checkDone() {