Merge branch '1.21.5' into settings/custom-settings

beanbag44 · beanbag44 · commit 7b9e7c0a006d · 2025-10-16T00:30:51.000+01:00
# Conflicts:
#	src/main/kotlin/com/lambda/interaction/construction/context/InteractionContext.kt
#	src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt
diff --git a/src/main/java/com/lambda/mixin/MinecraftClientMixin.java b/src/main/java/com/lambda/mixin/MinecraftClientMixin.java
@@ -23,9 +23,11 @@
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.TickEvent;
 import com.lambda.gui.DearImGui;
+import com.lambda.gui.components.ClickGuiLayout;
 import com.lambda.module.modules.player.Interact;
 import com.lambda.module.modules.player.InventoryMove;
 import com.lambda.module.modules.player.PacketMine;
+import com.lambda.util.WindowUtils;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -196,4 +198,11 @@ float getTargetMillisPerTick(float millis, Operation<Float> original) {
         else
             return (float) TimerManager.INSTANCE.getLength();
     }
+
+    @Inject(method = "updateWindowTitle", at = @At("HEAD"), cancellable = true)
+    void updateWindowTitle(CallbackInfo ci) {
+        if (!ClickGuiLayout.getSetLambdaWindowTitle()) return;
+        WindowUtils.setLambdaTitle();
+        ci.cancel();
+    }
 }
diff --git a/src/main/kotlin/com/lambda/Lambda.kt b/src/main/kotlin/com/lambda/Lambda.kt
@@ -31,7 +31,7 @@ import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.listenOnceUnsafe
 import com.lambda.gui.components.ClickGuiLayout
 import com.lambda.util.KeyCode
-import com.lambda.util.WindowIcons.setLambdaWindowIcon
+import com.lambda.util.WindowUtils.setLambdaWindowIcon
 import com.mojang.authlib.GameProfile
 import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.loader.api.FabricLoader
diff --git a/src/main/kotlin/com/lambda/gui/components/ClickGuiLayout.kt b/src/main/kotlin/com/lambda/gui/components/ClickGuiLayout.kt
@@ -37,7 +37,8 @@ import com.lambda.sound.SoundManager.play
 import com.lambda.util.Describable
 import com.lambda.util.KeyCode
 import com.lambda.util.NamedEnum
-import com.lambda.util.WindowIcons.setLambdaWindowIcon
+import com.lambda.util.WindowUtils.setLambdaTitle
+import com.lambda.util.WindowUtils.setLambdaWindowIcon
 import imgui.ImGui
 import imgui.extension.implot.ImPlot
 import imgui.flag.ImGuiCol
@@ -90,7 +91,8 @@ object ClickGuiLayout : Loadable, Configurable(GuiConfig) {
             mc.window.setIcon(mc.defaultResourcePack, icon)
         }
     }
-    val setLambdaWindowTitle by setting("Set Lambda Window Title", true).group(Group.General)
+    @JvmStatic val setLambdaWindowTitle by setting("Set Lambda Window Title", true).onValueChange { _, _ -> mc.updateWindowTitle() }.group(Group.General)
+    val lambdaTitleAppendixName by setting("Append Username", true) { setLambdaWindowTitle }.onValueChange { _, _ -> mc.updateWindowTitle() }.group(Group.General)
 
     // Sizing
     val windowPaddingX by setting("Window Padding X", 8.0f, 0.0f..20.0f, 0.1f).group(Group.Sizing)
diff --git a/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt b/src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt
@@ -17,6 +17,7 @@
 
 package com.lambda.interaction.construction.context
 
+import com.lambda.context.Automated
 import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
 import com.lambda.graphics.renderer.esp.ShapeBuilder
@@ -27,12 +28,16 @@ import com.lambda.interaction.request.LogContext.Companion.getLogContextBuilder
 import com.lambda.interaction.request.breaking.BreakConfig
 import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.rotating.RotationRequest
+import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils.emptyState
+import net.minecraft.block.Block
 import net.minecraft.block.BlockState
 import net.minecraft.block.FallingBlock
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Vec3d
 import java.awt.Color
+import kotlin.math.sqrt
 import kotlin.random.Random
 
 data class BreakContext(
@@ -42,8 +47,9 @@ data class BreakContext(
     var itemSelection: StackSelection,
     var instantBreak: Boolean,
     override var cachedState: BlockState,
-    val sortMode: BreakConfig.SortMode
-) : BuildContext(), LogContext {
+    val sortMode: BreakConfig.SortMode,
+    private val automated: Automated
+) : BuildContext(), LogContext, Automated by automated {
     private val baseColor = Color(222, 0, 0, 25)
     private val sideColor = Color(222, 0, 0, 100)
 
@@ -52,28 +58,37 @@ data class BreakContext(
 
     val random = Random.nextDouble()
 
-    override fun compareTo(other: BuildContext): Int {
+    override fun compareTo(other: BuildContext): Int = runSafe {
         return when (other) {
-            is BreakContext -> compareBy<BreakContext> {
+            is BreakContext -> compareByDescending<BreakContext> {
+                if (sortMode == BreakConfig.SortMode.Tool) it.hotbarIndex == HotbarManager.serverSlot
+                else 0
+            }.thenBy {
                 when (sortMode) {
-                    BreakConfig.SortMode.Closest -> it.distance
-                    BreakConfig.SortMode.Farthest -> -it.distance
-                    BreakConfig.SortMode.Tool -> it.hotbarIndex != HotbarManager.serverSlot
+                    BreakConfig.SortMode.Tool,
+                    BreakConfig.SortMode.Closest -> player.eyePos.distance(it.result.pos, it.cachedState.block)
+                    BreakConfig.SortMode.Farthest -> -player.eyePos.distance(it.result.pos, it.cachedState.block)
                     BreakConfig.SortMode.Rotation -> it.rotation.target.angleDistance
                     BreakConfig.SortMode.Random -> it.random
                 }
-            }.thenBy {
-                it.distance
-            }.thenBy {
-                it.instantBreak
             }.thenByDescending {
-                if (it.cachedState.block is FallingBlock) it.blockPos.y else 0
-            }.thenBy {
                 it.hotbarIndex == HotbarManager.serverSlot
-            }.compare(this, other)
+            }.thenBy {
+                it.instantBreak
+            }.compare(this@BreakContext, other)
 
             else -> 1
         }
+    } ?: 0
+
+    private fun Vec3d.distance(vec: Vec3d, block: Block): Double {
+        val d = vec.x - x
+        val e = (vec.y - y).let {
+            if (block is FallingBlock) it - (interactionConfig.attackReach / 2)
+            else it
+        }
+        val f = vec.z - z
+        return sqrt(d * d + e * e + f * f)
     }
 
     override fun ShapeBuilder.buildRenderer() {
diff --git a/src/main/kotlin/com/lambda/interaction/construction/context/BuildContext.kt b/src/main/kotlin/com/lambda/interaction/construction/context/BuildContext.kt
@@ -17,14 +17,15 @@
 
 package com.lambda.interaction.construction.context
 
+import com.lambda.context.Automated
 import com.lambda.interaction.construction.result.Drawable
 import com.lambda.interaction.request.rotating.RotationRequest
 import com.lambda.threading.runSafe
 import net.minecraft.block.BlockState
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
 
-abstract class BuildContext : Comparable<BuildContext>, Drawable {
+abstract class BuildContext : Comparable<BuildContext>, Drawable, Automated {
     abstract val result: BlockHitResult
     abstract val rotation: RotationRequest
     abstract val hotbarIndex: Int
diff --git a/src/main/kotlin/com/lambda/interaction/construction/context/InteractionContext.kt b/src/main/kotlin/com/lambda/interaction/construction/context/InteractionContext.kt
@@ -17,6 +17,8 @@
 
 package com.lambda.interaction.construction.context
 
+import com.lambda.context.Automated
+import com.lambda.context.interactConfig
 import com.lambda.graphics.renderer.esp.DirectionMask.mask
 import com.lambda.graphics.renderer.esp.ShapeBuilder
 import com.lambda.interaction.request.LogContext
@@ -39,7 +41,8 @@ class InteractionContext(
     override var hotbarIndex: Int,
     override var cachedState: BlockState,
     override val expectedState: BlockState,
-) : BuildContext(), LogContext {
+    val automated: Automated
+) : BuildContext(), LogContext, Automated by automated {
     private val baseColor = Color(35, 254, 79, 25)
     private val sideColor = Color(35, 254, 79, 100)
 
diff --git a/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt b/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt
@@ -276,7 +276,8 @@ object BuildSimulator {
                         RotationRequest(rotationTarget, this),
                         player.inventory.selectedSlot,
                         state,
-                        expectedState
+                        expectedState,
+                        this
                     )
 
                     val stackSelection = (item ?: player.mainHandStack.item).select()
@@ -746,7 +747,8 @@ object BuildSimulator {
                     StackSelection.EVERYTHING.select(),
                     instantBreakable(state, pos, breakConfig.breakThreshold),
                     state,
-                    breakConfig.sorter
+                    breakConfig.sorter,
+                    this
                 )
                 acc.add(BreakResult.Break(pos, breakContext))
                 return acc
@@ -803,7 +805,8 @@ object BuildSimulator {
             StackSelection.EVERYTHING.select(),
             instant,
             state,
-            breakConfig.sorter
+            breakConfig.sorter,
+            this
         )
 
         if (gamemode.isCreative) {
diff --git a/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt b/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt
@@ -145,7 +145,7 @@ object BreakManager : RequestHandler<BreakRequest>(
     private var activeRequest: BreakRequest? = null
 
     private var hotbarRequest: HotbarRequest? = null
-    val swapped get() = hotbarRequest?.done != false
+    private val swapped get() = hotbarRequest?.done != false
 
     private var rotationRequest: RotationRequest? = null
     private val rotated get() = rotationRequest?.done != false
diff --git a/src/main/kotlin/com/lambda/module/hud/AccountName.kt b/src/main/kotlin/com/lambda/module/hud/AccountName.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.module.hud
+
+import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.module.HudModule
+import com.lambda.module.tag.ModuleTag
+import com.lambda.threading.runSafe
+
+object AccountName : HudModule(
+    name = "AccountName",
+    description = "Displays the current accounts name",
+    tag = ModuleTag.HUD
+) {
+    override fun ImGuiBuilder.buildLayout() {
+        runSafe { text(player.name.string) }
+    }
+}
diff --git a/src/main/kotlin/com/lambda/module/hud/ManagerDebugLoggers.kt b/src/main/kotlin/com/lambda/module/hud/ManagerDebugLoggers.kt
@@ -25,7 +25,7 @@ import com.lambda.util.NamedEnum
 
 @Suppress("Unused")
 object ManagerDebugLoggers : HudModule(
-    "Manager Debug Loggers",
+    "ManagerDebugLoggers",
     "debug loggers for all action managers in lambda",
     ModuleTag.HUD,
     customWindow = true
diff --git a/src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt b/src/main/kotlin/com/lambda/module/modules/player/FastBreak.kt
@@ -174,7 +174,8 @@ object FastBreak : Module(
                     breakConfig.breakThreshold
                 ),
                 state,
-                breakConfig.sorter
+                breakConfig.sorter,
+                this@FastBreak
             )
 
             BreakRequest(setOf(breakContext), pendingInteractions, this@FastBreak).submit()
diff --git a/src/main/kotlin/com/lambda/util/WindowUtils.kt b/src/main/kotlin/com/lambda/util/WindowUtils.kt
@@ -17,7 +17,11 @@
 
 package com.lambda.util
 
+import com.lambda.Lambda.MOD_NAME
+import com.lambda.Lambda.SYMBOL
+import com.lambda.Lambda.VERSION
 import com.lambda.Lambda.mc
+import com.lambda.gui.components.ClickGuiLayout.lambdaTitleAppendixName
 import net.minecraft.client.util.MacWindowUtil
 import org.lwjgl.glfw.GLFW
 import org.lwjgl.glfw.GLFWImage
@@ -29,7 +33,19 @@ import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer
 import javax.imageio.ImageIO
 
-object WindowIcons {
+object WindowUtils {
+    /**
+     * Updates the Lambda title for the application window.
+     *
+     * Constructs and sets the window title based on the current application symbol, name, version,
+     * and additional dynamic details (e.g., username if `lambdaTitleAppendixName` is enabled).
+     */
+    @JvmStatic
+    fun setLambdaTitle() {
+        val name = if (lambdaTitleAppendixName) " - ${mc.session.username}" else ""
+        mc.window.setTitle("$SYMBOL $MOD_NAME $VERSION - ${mc.windowTitle}$name")
+    }
+
     /**
      * Sets the window icon for the application using a predefined set of icon sizes.
      *
