quick fix

Author: blade1234567

common/src/main/kotlin/com/lambda/Lambda.kt

@@ -20,12 +20,7 @@ package com.lambda
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.lambda.config.serializer.*
-import com.lambda.config.serializer.gui.CustomModuleWindowSerializer
-import com.lambda.config.serializer.gui.ModuleTagSerializer
-import com.lambda.config.serializer.gui.TagWindowSerializer
 import com.lambda.core.Loader
-import com.lambda.gui.impl.clickgui.windows.tag.CustomModuleWindow
-import com.lambda.gui.impl.clickgui.windows.tag.TagWindow
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.KeyCode
 import com.mojang.authlib.GameProfile
@@ -52,9 +47,6 @@ object Lambda {
 
     val gson: Gson = GsonBuilder()
         .setPrettyPrinting()
-        .registerTypeAdapter(ModuleTag::class.java, ModuleTagSerializer)
-        .registerTypeAdapter(CustomModuleWindow::class.java, CustomModuleWindowSerializer)
-        .registerTypeAdapter(TagWindow::class.java, TagWindowSerializer)
         .registerTypeAdapter(KeyCode::class.java, KeyCodeSerializer)
         .registerTypeAdapter(Color::class.java, ColorSerializer)
         .registerTypeAdapter(BlockPos::class.java, BlockPosSerializer)

common/src/main/kotlin/com/lambda/config/serializer/gui/CustomModuleWindowSerializer.kt

@@ -15,31 +15,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.gui.api
+package com.lambda.event.events
 
 import com.lambda.event.Event
 import com.lambda.util.KeyCode
 import com.lambda.util.Mouse
 import com.lambda.util.math.Vec2d
 
-abstract class GuiEvent : Event {
-    class Show : GuiEvent()
-    class Hide : GuiEvent()
-    class Tick : GuiEvent()
-    class Render : GuiEvent()
+sealed class GuiEvent : Event {
+    data object Show : GuiEvent()
+    data object Hide : GuiEvent()
+    data object Tick : GuiEvent()
+    data object Render : GuiEvent()
 
-    @Deprecated("Deprecated key press event", replaceWith = ReplaceWith("com.lambda.event.events.KeyboardEvent.Press"))
     class KeyPress(val key: KeyCode) : GuiEvent()
 
-    @Deprecated("Deprecated char event", replaceWith = ReplaceWith("com.lambda.event.events.KeyboardEvent.Char"))
     class CharTyped(val char: Char) : GuiEvent()
 
-    @Deprecated("Use the new global mouse events", replaceWith = ReplaceWith("com.lambda.event.events.MouseEvent.Click"))
     class MouseClick(val button: Mouse.Button, val action: Mouse.Action, val mouse: Vec2d) : GuiEvent()
 
-    @Deprecated("Use the new global mouse events", replaceWith = ReplaceWith("com.lambda.event.events.MouseEvent.Move"))
     class MouseMove(val mouse: Vec2d) : GuiEvent()
 
-    @Deprecated("Use the new global mouse events", replaceWith = ReplaceWith("com.lambda.event.events.MouseEvent.Scroll"))
     class MouseScroll(val mouse: Vec2d, val delta: Double) : GuiEvent()
 }

common/src/main/kotlin/com/lambda/config/serializer/gui/ModuleTagSerializer.kt

@@ -21,18 +21,20 @@ import com.lambda.Lambda.mc
 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.pipeline.UIPipeline
+import com.lambda.graphics.renderer.esp.global.DynamicESP
+import com.lambda.graphics.renderer.esp.global.StaticESP
 import com.lambda.util.math.Vec2d
 
 sealed class RenderEvent {
     class World : Event
 
     class StaticESP : Event {
-        val renderer = RenderPipeline.STATIC_ESP
+        val renderer = StaticESP
     }
 
     class DynamicESP : Event {
-        val renderer = RenderPipeline.DYNAMIC_ESP
+        val renderer = DynamicESP
     }
 
     sealed class GUI(val scale: Double) : Event {

common/src/main/kotlin/com/lambda/config/serializer/gui/TagWindowSerializer.kt

@@ -20,54 +20,39 @@ package com.lambda.graphics
 import com.lambda.Lambda.mc
 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.animation.Animation.Companion.exp
-import com.lambda.graphics.animation.AnimationTicker
 import com.lambda.graphics.buffer.FrameBuffer
 import com.lambda.graphics.gl.GlStateUtils.setupGL
 import com.lambda.graphics.gl.Matrices
 import com.lambda.graphics.gl.Matrices.resetMatrices
+import com.lambda.graphics.pipeline.UIPipeline
 import com.lambda.graphics.shader.Shader
-import com.lambda.gui.impl.hudgui.LambdaHudGui
-import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.modules.client.GuiSettings
 import com.lambda.util.math.Vec2d
 import com.mojang.blaze3d.systems.RenderSystem.getProjectionMatrix
 import org.joml.Matrix4f
 
 object RenderMain {
-    val projectionMatrix = Matrix4f()
-    val modelViewMatrix: Matrix4f get() = Matrices.peek()
-    var screenSize = Vec2d.ZERO
-
-    private val showHud get() = mc.currentScreen == null || LambdaHudGui.isOpen
+    private val projectionMatrix = Matrix4f()
+    private val modelViewMatrix get() = Matrices.peek()
+    val projModel get() = Matrix4f(projectionMatrix).mul(modelViewMatrix)
 
-    private val hudAnimation0 = with(AnimationTicker()) {
-        listen<TickEvent.Pre> {
-            tick()
-        }
-
-        exp(0.0, 1.0, {
-            if (showHud) ClickGui.closeSpeed else ClickGui.openSpeed
-        }) { showHud }
-    }
-
-    private val frameBuffer = FrameBuffer()
-    private val shader = Shader("post/cgui_animation", "renderer/pos_tex")
-    private val hudAnimation by hudAnimation0
+    var screenSize = Vec2d.ZERO
 
     @JvmStatic
     fun render2D() {
         resetMatrices(Matrix4f().translate(0f, 0f, -3000f))
 
         setupGL {
+            UIPipeline.reset()
+
             rescale(1.0)
             RenderEvent.GUI.Fixed().post()
 
             rescale(GuiSettings.scale)
-            drawHUD()
+            RenderEvent.GUI.HUD(GuiSettings.scale).post()
             RenderEvent.GUI.Scaled(GuiSettings.scale).post()
+
+            UIPipeline.render()
         }
     }
 
@@ -91,19 +76,4 @@ object RenderMain {
         screenSize = Vec2d(scaledWidth, scaledHeight)
         projectionMatrix.setOrtho(0f, scaledWidth.toFloat(), scaledHeight.toFloat(), 0f, 1000f, 21000f)
     }
-
-    private fun drawHUD() {
-        if (hudAnimation < 0.001) return
-
-        if (hudAnimation > 0.999) {
-            RenderEvent.GUI.HUD(GuiSettings.scale).post()
-            return
-        }
-
-        frameBuffer.write {
-            RenderEvent.GUI.HUD(GuiSettings.scale).post()
-        }.read(shader) {
-            it["u_Progress"] = hudAnimation
-        }
-    }
 }