fixed incomplete merge conflicts

Author: emyfops

common/src/main/kotlin/com/lambda/event/events/RenderEvent.kt

@@ -22,7 +22,6 @@ import com.lambda.event.Event
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
 import com.lambda.graphics.RenderPipeline
-import com.lambda.graphics.renderer.esp.global.StaticESP
 import com.lambda.util.math.Vec2d
 
 sealed class RenderEvent {

common/src/main/kotlin/com/lambda/graphics/RenderPipeline.kt

@@ -15,20 +15,39 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.graphics.renderer.esp.global
+package com.lambda.graphics
 
+import com.lambda.core.Loadable
 import com.lambda.event.EventFlow.post
 import com.lambda.event.events.RenderEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.graphics.renderer.esp.impl.DynamicESPRenderer
+import com.lambda.graphics.renderer.esp.impl.StaticESPRenderer
+
+object RenderPipeline : Loadable {
+    // Updates once a tick, stays fixed, uses less memory
+    val STATIC_ESP = StaticESPRenderer()
+
+    // Updates once a tick, interpolates within frames
+    val DYNAMIC_ESP = DynamicESPRenderer()
 
-object DynamicESP : DynamicESPRenderer() {
     init {
+        // Ticked 3d renderers update
         listen<TickEvent.Post> {
-            clear()
+            STATIC_ESP.clear()
+            RenderEvent.StaticESP().post()
+            STATIC_ESP.upload()
+
+            DYNAMIC_ESP.clear()
             RenderEvent.DynamicESP().post()
-            upload()
+            DYNAMIC_ESP.upload()
+        }
+
+        // 3d renderers drawcall
+        listen<RenderEvent.World> {
+            STATIC_ESP.render()
+            DYNAMIC_ESP.render()
         }
     }
 }

common/src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt

@@ -20,10 +20,10 @@ package com.lambda.module.modules.player
 import com.lambda.context.SafeContext
 import com.lambda.event.events.*
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.graphics.RenderPipeline
 import com.lambda.graphics.renderer.esp.DynamicAABB
 import com.lambda.graphics.renderer.esp.builders.buildFilled
 import com.lambda.graphics.renderer.esp.builders.buildOutline
-import com.lambda.graphics.renderer.esp.global.DynamicESP
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.math.lerp
@@ -60,7 +60,7 @@ object FastBreak : Module(
     private val outlineWidth by setting("Outline Width", 1f, 0f..3f, 0.1f, "the thickness of the outline", visibility = { page == Page.Render && renderMode.isEnabled() && renderSetting != RenderSetting.Fill })
 
 
-    private val renderer = DynamicESP
+    private val renderer = RenderPipeline.DYNAMIC_ESP
     private var boxSet = emptySet<Box>()
 
     private enum class Page {

common/src/main/kotlin/com/lambda/module/modules/player/PacketMine.kt

@@ -21,10 +21,10 @@ import com.lambda.Lambda.mc
 import com.lambda.context.SafeContext
 import com.lambda.event.events.*
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.graphics.RenderPipeline
 import com.lambda.graphics.renderer.esp.DynamicAABB
 import com.lambda.graphics.renderer.esp.builders.buildFilled
 import com.lambda.graphics.renderer.esp.builders.buildOutline
-import com.lambda.graphics.renderer.esp.global.DynamicESP
 import com.lambda.interaction.RotationManager
 import com.lambda.interaction.rotation.RotationContext
 import com.lambda.interaction.visibilty.VisibilityChecker.findRotation
@@ -246,7 +246,7 @@ object PacketMine : Module(
             this == Primary
     }
 
-    val renderer = DynamicESP
+    val renderer = RenderPipeline.DYNAMIC_ESP
     private var currentMiningBlock = Array<BreakingContext?>(2) { null }
     private var lastNonEmptyState: BlockState? = null
     private val blockQueue = ArrayDeque<BlockPos>()