fix static and dynamic render events

Author: beanbag44

src/main/java/com/lambda/mixin/render/GameRendererMixin.java

@@ -21,6 +21,7 @@
 import com.lambda.event.events.RenderEvent;
 import com.lambda.graphics.RenderMain;
 import com.lambda.gui.DearImGui;
+import com.lambda.module.modules.render.BlockOutline;
 import com.lambda.module.modules.render.NoRender;
 import com.lambda.module.modules.render.Zoom;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
@@ -40,6 +41,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(GameRenderer.class)
 public class GameRendererMixin {
@@ -76,4 +78,9 @@ private float modifyGetFov(float original) {
     private void onGuiRenderComplete(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci) {
         DearImGui.INSTANCE.render();
     }
+
+    @Inject(method = "shouldRenderBlockOutline()Z", at = @At("HEAD"), cancellable = true)
+    private void injectShouldRenderBlockOutline(CallbackInfoReturnable<Boolean> cir) {
+        if (BlockOutline.INSTANCE.isEnabled()) cir.setReturnValue(false);
+    }
 }

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

@@ -23,16 +23,18 @@ import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.graphics.RenderMain
+import com.lambda.graphics.mc.ImmediateRegionESP
 import com.lambda.graphics.mc.TransientRegionESP
 
 fun Any.onStaticRender(block: SafeContext.(TransientRegionESP) -> Unit) =
-	listen<RenderEvent.Upload> { block(RenderMain.StaticESP) }
+	listen<RenderEvent.UploadStatic> { block(RenderMain.staticESP) }
 
-fun Any.onDynamicRender(block: SafeContext.(TransientRegionESP) -> Unit) =
-	listen<RenderEvent.Upload> { block(RenderMain.DynamicESP) }
+fun Any.onDynamicRender(block: SafeContext.(ImmediateRegionESP) -> Unit) =
+	listen<RenderEvent.UploadDynamic> { block(RenderMain.dynamicESP) }
 
 sealed class RenderEvent {
-    object Upload : Event
+    object UploadStatic : Event
+	object UploadDynamic: Event
     object Render : Event
 
     class UpdateTarget : ICancellable by Cancellable()

src/main/kotlin/com/lambda/graphics/RenderMain.kt

@@ -24,6 +24,7 @@ import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.graphics.gl.Matrices
 import com.lambda.graphics.gl.Matrices.resetMatrices
+import com.lambda.graphics.mc.ImmediateRegionESP
 import com.lambda.graphics.mc.TransientRegionESP
 import net.minecraft.util.math.Vec3d
 import org.joml.Matrix4f
@@ -32,10 +33,10 @@ import org.joml.Vector4f
 
 object RenderMain {
     @JvmStatic
-    val StaticESP = TransientRegionESP("Static")
+    val staticESP = TransientRegionESP("Static")
 
     @JvmStatic
-    val DynamicESP = TransientRegionESP("Dynamic")
+    val dynamicESP = ImmediateRegionESP("Dynamic")
 
     val projectionMatrix = Matrix4f()
     val modelViewMatrix
@@ -90,22 +91,22 @@ object RenderMain {
         resetMatrices(positionMatrix)
         projectionMatrix.set(projMatrix)
 
-        // Render transient ESPs using the new pipeline
-        StaticESP.render() // Uses internal depthTest flag (true)
-        DynamicESP.render() // Uses internal depthTest flag (false)
+        staticESP.render()
 
         RenderEvent.Render.post()
+        dynamicESP.render()
     }
 
     init {
         listen<TickEvent.Post> {
-            StaticESP.clear()
-            DynamicESP.clear()
-
-            RenderEvent.Upload.post()
-
-            StaticESP.upload()
-            DynamicESP.upload()
+            staticESP.clear()
+            RenderEvent.UploadStatic.post()
+            staticESP.upload()
+        }
+        listen<RenderEvent.Render> {
+            dynamicESP.clear()
+            RenderEvent.UploadDynamic.post()
+            dynamicESP.upload()
         }
     }
 }

src/main/kotlin/com/lambda/interaction/managers/breaking/BreakManager.kt

@@ -26,7 +26,6 @@ import com.lambda.event.events.WorldEvent
 import com.lambda.event.events.onDynamicRender
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
-import com.lambda.graphics.renderer.esp.DynamicAABB
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.simulation.BuildSimulator.simulate
 import com.lambda.interaction.construction.simulation.context.BreakContext
@@ -269,11 +268,9 @@ object BreakManager : Manager<BreakRequest>(
                             it.offset(pos)
                         }.forEach boxes@{ box ->
                             val animationMode = info.breakConfig.animation
-                            val currentProgressBox = interpolateBox(box, currentProgress, animationMode)
-                            val nextProgressBox = interpolateBox(box, nextTicksProgress, animationMode)
-                            val dynamicAABB = DynamicAABB().update(currentProgressBox).update(nextProgressBox)
-                            if (config.fill) filled(dynamicAABB, fillColor)
-                            if (config.outline) outline(dynamicAABB, outlineColor)
+                            val interpolatedBox = interpolateBox(box, interpolatedProgress, animationMode)
+                            if (config.fill) filled(interpolatedBox, fillColor)
+                            if (config.outline) outline(interpolatedBox, outlineColor)
                         }
                     }
                 }

src/main/kotlin/com/lambda/module/modules/movement/Blink.kt

@@ -22,7 +22,6 @@ import com.lambda.event.events.PacketEvent
 import com.lambda.event.events.RenderEvent
 import com.lambda.event.events.onDynamicRender
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.graphics.esp.ShapeScope
 import com.lambda.graphics.renderer.esp.DynamicAABB
 import com.lambda.gui.components.ClickGuiLayout
 import com.lambda.module.Module
@@ -59,7 +58,7 @@ object Blink : Module(
     private var lastBox = Box(BlockPos.ORIGIN)
 
     init {
-        listen<RenderEvent.Upload> {
+        listen<RenderEvent.UploadStatic> {
             val time = System.currentTimeMillis()
 
             if (isActive && time - lastUpdate < delay) return@listen

src/main/kotlin/com/lambda/module/modules/network/PacketDelay.kt

@@ -53,7 +53,7 @@ object PacketDelay : Module(
     private var inboundLastUpdate = 0L
 
     init {
-        listen<RenderEvent.Upload> {
+        listen<RenderEvent.UploadStatic> {
             if (mode != Mode.Static) return@listen
 
             flushPools(System.currentTimeMillis())

src/main/kotlin/com/lambda/module/modules/render/BlockOutline.kt

@@ -37,9 +37,9 @@ object BlockOutline : Module(
 	tag = ModuleTag.RENDER
 ) {
 	private val fill by setting("Fill", true)
-	private val fillColor by setting("Fill Color", Color(255, 255, 255, 60)) { fill }
+	private val fillColor by setting("Fill Color", Color(255, 255, 255, 20)) { fill }
 	private val outline by setting("Outline", true)
-	private val outlineColor by setting("Outline Color", Color.WHITE) { outline }
+	private val outlineColor by setting("Outline Color", Color(255, 255, 255, 120)) { outline }
 	private val lineWidth by setting("Line Width", 1.0f, 0.5f..10.0f, 0.1f) { outline }
 	private val interpolate by setting("Interpolate", true)
 	private val throughWalls by setting("ESP", true)