Merge branch '1.21.5' into feature/manager-loggers

# Conflicts:
#	src/main/kotlin/com/lambda/interaction/request/rotating/RotationManager.kt

Author: beanbag44

src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -17,6 +17,7 @@
 
 package com.lambda.mixin;
 
+import com.lambda.core.TimerManager;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ClientEvent;
 import com.lambda.event.events.InventoryEvent;
@@ -171,4 +172,14 @@ void injectFastPlace(CallbackInfo ci) {
 
         itemUseCooldown = Interact.getPlaceDelay();
     }
+
+    @WrapMethod(method = "getTargetMillisPerTick")
+    float getTargetMillisPerTick(float millis, Operation<Float> original) {
+        var length = TimerManager.INSTANCE.getLength();
+
+        if (length == TimerManager.DEFAULT_LENGTH)
+            return original.call(millis);
+        else
+            return (float) TimerManager.INSTANCE.getLength();
+    }
 }

src/main/java/com/lambda/mixin/baritone/MixinBaritonePlayerContext.java

@@ -20,8 +20,8 @@
 import baritone.Baritone;
 import baritone.api.utils.Rotation;
 import baritone.utils.player.BaritonePlayerContext;
+import com.lambda.interaction.BaritoneManager;
 import com.lambda.interaction.request.rotating.RotationManager;
-import com.lambda.util.BaritoneUtils;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -38,7 +38,7 @@ public class MixinBaritonePlayerContext {
     // Let baritone know the actual rotation
     @Inject(method = "playerRotations", at = @At("HEAD"), cancellable = true, remap = false)
     void syncRotationWithBaritone(CallbackInfoReturnable<Rotation> cir) {
-        if (baritone != BaritoneUtils.getPrimary()) return;
+        if (baritone != BaritoneManager.getPrimary()) return;
 
         RotationManager rm = RotationManager.INSTANCE;
         cir.setReturnValue(new Rotation(

src/main/java/com/lambda/mixin/baritone/MixinLookBehavior.java

@@ -21,8 +21,8 @@
 import baritone.api.event.events.RotationMoveEvent;
 import baritone.api.utils.Rotation;
 import baritone.behavior.LookBehavior;
+import com.lambda.interaction.BaritoneManager;
 import com.lambda.interaction.request.rotating.RotationManager;
-import com.lambda.util.BaritoneUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -34,7 +34,7 @@ public class MixinLookBehavior {
     @Inject(method = "updateTarget", at = @At("HEAD"), remap = false, cancellable = true)
     void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
         LookBehavior instance = ((LookBehavior) (Object) this);
-        if (instance.baritone != BaritoneUtils.getPrimary()) return;
+        if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         RotationManager.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
         ci.cancel();
@@ -43,15 +43,15 @@ void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
     @Inject(method = "onPlayerUpdate", at = @At("HEAD"), remap = false, cancellable = true)
     void onUpdate(PlayerUpdateEvent event, CallbackInfo ci) {
         LookBehavior instance = ((LookBehavior) (Object) this);
-        if (instance.baritone != BaritoneUtils.getPrimary()) return;
+        if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         ci.cancel();
     }
 
     @Inject(method = "onPlayerRotationMove", at = @At("HEAD"), remap = false, cancellable = true)
     void onMovementUpdate(RotationMoveEvent event, CallbackInfo ci) {
         LookBehavior instance = ((LookBehavior) (Object) this);
-        if (instance.baritone != BaritoneUtils.getPrimary()) return;
+        if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         ci.cancel();
     }

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

@@ -20,9 +20,6 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.RenderEvent;
 import com.lambda.graphics.RenderMain;
-import com.lambda.gui.DearImGui;
-import com.lambda.gui.LambdaScreen;
-import com.lambda.module.modules.client.ClickGui;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.render.Camera;

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

@@ -29,7 +29,7 @@ import com.lambda.config.serializer.OptionalSerializer
 import com.lambda.core.Loader
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.listenOnceUnsafe
-import com.lambda.module.modules.client.ClickGui
+import com.lambda.gui.components.ClickGuiLayout
 import com.lambda.util.KeyCode
 import com.lambda.util.WindowIcons.setLambdaWindowIcon
 import com.mojang.authlib.GameProfile
@@ -82,7 +82,7 @@ object Lambda : ClientModInitializer {
         // We want the opengl context to be created
         listenOnceUnsafe<ClientEvent.Startup>(priority = Int.MAX_VALUE) {
             LOG.info("$MOD_NAME $VERSION initialized in ${Loader.initialize()} ms\n")
-            if (ClickGui.setLambdaWindowIcon) setLambdaWindowIcon()
+            if (ClickGuiLayout.setLambdaWindowIcon) setLambdaWindowIcon()
             true
         }
     }

src/main/kotlin/com/lambda/config/configurations/HudConfig.kt

@@ -0,0 +1,27 @@
+/*
+ * 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.config.configurations
+
+import com.lambda.config.Configuration
+import com.lambda.util.FolderRegister
+import java.io.File
+
+object HudConfig : Configuration() {
+    override val configName get() = "hud"
+    override val primary: File = FolderRegister.config.resolve("$configName.json").toFile()
+}

src/main/kotlin/com/lambda/config/configurations/SecretsConfig.kt

@@ -0,0 +1,27 @@
+/*
+ * 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.config.configurations
+
+import com.lambda.config.Configuration
+import com.lambda.util.FolderRegister
+import java.io.File
+
+object SecretsConfig : Configuration() {
+    override val configName get() = "secrets"
+    override val primary: File = FolderRegister.config.resolve("$configName.json").toFile()
+}

src/main/kotlin/com/lambda/config/settings/numeric/LongSetting.kt

@@ -45,6 +45,7 @@ class LongSetting(
     unit,
     visibility
 ) {
+    // ToDo: No worky for super large numbers
     private var valueIndex: Int
         get() = ((value - range.start) / step).toInt()
         set(index) {

src/main/kotlin/com/lambda/core/TimerManager.kt

@@ -23,13 +23,14 @@ import kotlin.concurrent.fixedRateTimer
 import kotlin.time.Duration.Companion.milliseconds
 
 object TimerManager : Loadable {
+    const val DEFAULT_LENGTH = 50.0
     var lastTickLength = 50.0
 
     override fun load() = "Loaded Timer Manager"
 
     val length: Double
         get() {
-            var length = 50.0
+            var length = DEFAULT_LENGTH
 
             ClientEvent.TimerUpdate(1.0).post {
                 length /= speed

src/main/kotlin/com/lambda/graphics/renderer/gui/AbstractGUIRenderer.kt

@@ -24,9 +24,7 @@ import com.lambda.graphics.buffer.vertex.attributes.VertexAttrib
 import com.lambda.graphics.buffer.vertex.attributes.VertexMode
 import com.lambda.graphics.pipeline.VertexPipeline
 import com.lambda.graphics.shader.Shader
-import com.lambda.module.modules.client.GuiSettings
-import com.lambda.module.modules.client.GuiSettings.primaryColor
-import com.lambda.module.modules.client.GuiSettings.secondaryColor
+import com.lambda.gui.components.ClickGuiLayout
 import com.lambda.module.modules.client.StyleEditor
 import com.lambda.util.math.MathUtils.toInt
 import com.lambda.util.math.Vec2d
@@ -59,11 +57,11 @@ open class AbstractGUIRenderer(
 
         shader["u_Shade"] = shade.toInt().toDouble()
         if (shade) {
-            shader["u_ShadeTime"] = GLFW.glfwGetTime() * GuiSettings.colorSpeed * 5.0
-            shader["u_ShadeColor1"] = primaryColor
-            shader["u_ShadeColor2"] = secondaryColor
+            shader["u_ShadeTime"] = GLFW.glfwGetTime() * ClickGuiLayout.colorSpeed * 5.0
+            shader["u_ShadeColor1"] = ClickGuiLayout.primaryColor
+            shader["u_ShadeColor2"] = ClickGuiLayout.secondaryColor
 
-            shader["u_ShadeSize"] = RenderMain.screenSize / Vec2d(GuiSettings.colorWidth, GuiSettings.colorHeight)
+            shader["u_ShadeSize"] = RenderMain.screenSize / Vec2d(ClickGuiLayout.colorWidth, ClickGuiLayout.colorHeight)
         }
 
         pipeline.apply {