Merge branch '1.21.5' into 1.21.11

Author: Avanatiker

README.md

@@ -14,7 +14,7 @@
 Lambda is a free, open-source Minecraft Fabric utility mod focused on advanced automation to execute complex, repeatable tasks with minimal micromanagement. This is a complete, ground-up rewrite of the original client that you can find here: [Lambda Legacy](https://github.com/lambda-client/lambda-legacy).
 
 <p align="center">
-    <a href="https://github.com/lambda-client/lambda/releases/download/0.0.1%2B1.21.5/lambda-0.0.1+1.21.5.jar"><img alt="lambda-0.0.1+1.21.5.jar" src="https://raw.githubusercontent.com/lambda-client/assets/refs/heads/main/download_button_0.0.1.png" width="70%" height="70%"></a>
+    <a href="https://github.com/lambda-client/lambda/releases/download/0.0.2%2B1.21.5/lambda-0.0.2+1.21.5.jar"><img alt="lambda-0.0.1+1.21.5.jar" src="https://raw.githubusercontent.com/lambda-client/assets/refs/heads/main/download_button_0.0.2.png" width="70%" height="70%"></a>
 </p>
 
 <p align="center">
@@ -57,7 +57,7 @@ Find our backup matrix space at [\#lambda-client:matrix.org](https://app.element
 <a href="https://fabricmc.net/wiki/install"><img src="https://cdn.jonasjones.dev/mod-badges/support-fabric.png" width="150px" alt="Fabric Supported"></a>
 1. Install Minecraft 1.21.5 [(download)](https://www.minecraft.net/)
 2. Install Fabric [(download)](https://fabricmc.net/use/installer/)
-3. Get the latest Lambda version here [(download)](https://github.com/lambda-client/lambda/releases/download/0.0.1%2B1.21.5/lambda-0.0.1+1.21.5.jar)
+3. Get the latest Lambda version here [(download)](https://github.com/lambda-client/lambda/releases/download/0.0.2%2B1.21.5/lambda-0.0.2+1.21.5.jar)
 4. Put the file in your `.minecraft/mods` folder
 
 ## Getting Started

src/main/kotlin/com/lambda/config/groups/Targeting.kt

@@ -33,6 +33,7 @@ import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.client.network.OtherClientPlayerEntity
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.decoration.ArmorStandEntity
+import net.minecraft.entity.mob.HostileEntity
 import net.minecraft.entity.mob.MobEntity
 import net.minecraft.entity.passive.PassiveEntity
 import java.util.*
@@ -115,9 +116,10 @@ abstract class Targeting(
      * @return `true` if the entity is valid for targeting, `false` otherwise.
      */
     open fun validate(player: ClientPlayerEntity, entity: LivingEntity) = when {
-        !players || (entity is OtherClientPlayerEntity && entity.isFriend) -> false
+        !players && entity is OtherClientPlayerEntity -> false
+        players && entity is OtherClientPlayerEntity && entity.isFriend -> false
         !animals && entity is PassiveEntity -> false
-        !hostiles && entity is MobEntity -> false
+        !hostiles && entity is HostileEntity -> false
         entity is ArmorStandEntity -> false
 
         !invisible && entity.isInvisibleTo(player) -> false

src/main/kotlin/com/lambda/graphics/animation/Animation.kt

@@ -19,13 +19,11 @@ package com.lambda.graphics.renderer.esp
 
 import com.lambda.graphics.pipeline.VertexBuilder
 import com.lambda.graphics.renderer.esp.DirectionMask.hasDirection
-import com.lambda.graphics.renderer.esp.Treed.Companion.cameraPos
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.extension.max
 import com.lambda.util.extension.min
 import com.lambda.util.extension.outlineShape
-import com.lambda.util.math.minus
 import net.minecraft.block.BlockState
 import net.minecraft.block.entity.BlockEntity
 import net.minecraft.entity.Entity
@@ -48,12 +46,11 @@ class ShapeBuilder(
         sides   : Int = DirectionMask.ALL,
     ) = faces.apply {
         val boxes = box.pair ?: return@apply
-        val camera = cameraPos
 
-        val pos11 = boxes.first.min - camera
-        val pos12 = boxes.first.max - camera
-        val pos21 = boxes.second.min - camera
-        val pos22 = boxes.second.max - camera
+        val pos11 = boxes.first.min
+        val pos12 = boxes.first.max
+        val pos21 = boxes.second.min
+        val pos22 = boxes.second.max
 
         val blb by lazy { vertex { vec3(pos11.x, pos11.y, pos11.z).vec3(pos21.x, pos21.y, pos21.z).color(color) } }
         val blf by lazy { vertex { vec3(pos11.x, pos11.y, pos12.z).vec3(pos21.x, pos21.y, pos22.z).color(color) } }
@@ -79,9 +76,8 @@ class ShapeBuilder(
         topColor    : Color = bottomColor,
         sides       : Int = DirectionMask.ALL
     ) = faces.apply {
-        val camera = cameraPos
-        val pos1 = box.min - camera
-        val pos2 = box.max - camera
+        val pos1 = box.min
+        val pos2 = box.max
 
         val blb by lazy { vertex { vec3(pos1.x, pos1.y, pos1.z).color(bottomColor) } }
         val blf by lazy { vertex { vec3(pos1.x, pos1.y, pos2.z).color(bottomColor) } }
@@ -156,12 +152,11 @@ class ShapeBuilder(
         mode    : DirectionMask.OutlineMode = DirectionMask.OutlineMode.Or,
     ) = edges.apply {
         val boxes = box.pair ?: return@apply
-        val camera = cameraPos
 
-        val pos11 = boxes.first.min - camera
-        val pos12 = boxes.first.max - camera
-        val pos21 = boxes.second.min - camera
-        val pos22 = boxes.second.max - camera
+        val pos11 = boxes.first.min
+        val pos12 = boxes.first.max
+        val pos21 = boxes.second.min
+        val pos22 = boxes.second.max
 
         val blb by lazy { vertex { vec3(pos11.x, pos11.y, pos11.z).vec3(pos21.x, pos21.y, pos21.z).color(color) } }
         val blf by lazy { vertex { vec3(pos11.x, pos11.y, pos12.z).vec3(pos21.x, pos21.y, pos22.z).color(color) } }
@@ -203,9 +198,8 @@ class ShapeBuilder(
         sides       : Int = DirectionMask.ALL,
         mode        : DirectionMask.OutlineMode = DirectionMask.OutlineMode.Or,
     ) = edges.apply {
-        val camera = cameraPos
-        val pos1 = box.min - camera
-        val pos2 = box.max - camera
+        val pos1 = box.min
+        val pos2 = box.max
 
         val blb by lazy { vertex { vec3(pos1.x, pos1.y, pos1.z).color(bottomColor) } }
         val blf by lazy { vertex { vec3(pos1.x, pos1.y, pos2.z).color(bottomColor) } }

src/main/kotlin/com/lambda/graphics/animation/AnimationTicker.kt

@@ -23,16 +23,14 @@ import com.lambda.graphics.buffer.vertex.attributes.VertexMode
 import com.lambda.graphics.gl.GlStateUtils
 import com.lambda.graphics.pipeline.VertexBuilder
 import com.lambda.graphics.pipeline.VertexPipeline
-import com.lambda.graphics.shader.Shader.Companion.shader
+import com.lambda.graphics.shader.Shader
 import com.lambda.module.modules.client.StyleEditor
 import com.lambda.util.extension.partialTicks
-import com.lambda.util.math.minus
-import net.minecraft.util.math.Vec3d
 
 /**
  * Open class for 3d rendering. It contains two pipelines, one for edges and the other for faces.
  */
-open class Treed(static: Boolean) {
+open class Treed(private val static: Boolean) {
     val shader = if (static) staticMode.first else dynamicMode.first
 
     val faces = VertexPipeline(VertexMode.Triangles, if (static) staticMode.second else dynamicMode.second)
@@ -48,8 +46,9 @@ open class Treed(static: Boolean) {
 
     fun render() {
         shader.use()
-        shader["u_TickDelta"] = mc.partialTicks
-        shader["u_CameraLerp"] = cachedCameraPos - mc.gameRenderer.camera.pos
+
+        if (!static)
+            shader["u_TickDelta"] = mc.partialTicks
 
         GlStateUtils.withFaceCulling(faces::render)
         GlStateUtils.withLineWidth(StyleEditor.outlineWidth, edges::render)
@@ -76,14 +75,7 @@ open class Treed(static: Boolean) {
     object Dynamic : Treed(false)
 
     companion object {
-        private val staticMode = shader("renderer/box_static") to VertexAttrib.Group.STATIC_RENDERER
-        private val dynamicMode = shader("renderer/box_dynamic") to VertexAttrib.Group.DYNAMIC_RENDERER
-
-        var cachedCameraPos: Vec3d = Vec3d.ZERO
-        val cameraPos: Vec3d
-            get() {
-                cachedCameraPos = mc.gameRenderer.camera.pos
-                return cachedCameraPos
-            }
+        private val staticMode = Shader("shaders/vertex/box_static.glsl", "shaders/fragment/pos_color.glsl") to VertexAttrib.Group.STATIC_RENDERER
+        private val dynamicMode = Shader("shaders/vertex/box_dynamic.glsl", "shaders/fragment/pos_color.glsl") to VertexAttrib.Group.DYNAMIC_RENDERER
     }
 }

src/main/kotlin/com/lambda/graphics/renderer/esp/ShapeDsl.kt

@@ -22,7 +22,6 @@ import com.lambda.graphics.pipeline.VertexBuilder
 import com.lambda.graphics.renderer.gui.font.core.GlyphInfo
 import com.lambda.graphics.renderer.gui.font.core.LambdaAtlas.get
 import com.lambda.graphics.renderer.gui.font.core.LambdaAtlas.height
-import com.lambda.graphics.shader.Shader.Companion.shader
 import com.lambda.graphics.texture.TextureOwner.bind
 import com.lambda.gui.components.ClickGuiLayout
 import com.lambda.module.modules.client.LambdaMoji
@@ -39,7 +38,7 @@ import java.awt.Color
  * Renders text and emoji glyphs using a shader-based font rendering system.
  * This class handles text and emoji rendering, shadow effects, and text scaling.
  */
-object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("renderer/font")) {
+/*object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("renderer/font")) {
     private val chars get() = StyleEditor.textFont
     private val emojis get() = StyleEditor.emojiFont
 
@@ -278,4 +277,4 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("rende
         (color.blue * StyleEditor.shadowBrightness).toInt(),
         color.alpha
     )
-}
+}*/