Merge branch '1.21.5' into refactor/rendering

Author: Avanatiker

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

@@ -36,7 +36,7 @@ void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
         LookBehavior instance = ((LookBehavior) (Object) this);
         if (instance.baritone != BaritoneManager.getPrimary()) return;
 
-        RotationManager.handleBaritoneRotation(rotation.getYaw());
+        RotationManager.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
         ci.cancel();
     }
 

src/main/kotlin/com/lambda/config/AutomationConfig.kt

@@ -62,7 +62,7 @@ open class AutomationConfig(
 	        name: String = module.name,
 	        edits: (AutomationConfig.() -> Unit)? = null
 		) {
-			defaultAutomationConfig = AutomationConfig("$name Automation Config").apply { edits?.invoke(this) }
+			this.defaultAutomationConfig = AutomationConfig("$name Automation Config").apply { edits?.invoke(this) }
 		}
 
         fun MutableAutomationConfig.setDefaultAutomationConfig(
@@ -79,6 +79,7 @@ open class AutomationConfig(
             val showAllEntries by setting("Show All Entries", false, "Show all entries in the task tree").group(Group.Debug)
             val shrinkFactor by setting("Shrink Factor", 0.001, 0.0..1.0, 0.001).group(Group.Debug)
             val ignoreItemDropWarnings by setting("Ignore Drop Warnings", false, "Hides the item drop warnings from the break manager").group(Group.Debug)
+			val managerDebugLogs by setting("Manager Debug Logs", false, "Prints debug logs from managers into chat").group(Group.Debug)
 
             @Volatile
             var drawables = listOf<Drawable>()

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

@@ -40,27 +40,27 @@ open class BreakSettings(
     }
 
     // General
-    override val breakMode by c.setting("Break Mode", BreakMode.Vanilla).group(baseGroup, Group.General).index()
+    override val breakMode by c.setting("Break Mode", BreakMode.Packet).group(baseGroup, Group.General).index()
     override val sorter by c.setting("Break Sorter", ActionConfig.SortMode.Tool, "The order in which breaks are performed").group(baseGroup, Group.General).index()
     override val rebreak by c.setting("Rebreak", true, "Re-breaks blocks after they've been broken once").group(baseGroup, Group.General).index()
 
     // Double break
-    override val doubleBreak by c.setting("Double Break", false, "Allows breaking two blocks at once").group(baseGroup, Group.General).index()
+    override val doubleBreak by c.setting("Double Break", true, "Allows breaking two blocks at once").group(baseGroup, Group.General).index()
     override val unsafeCancels by c.setting("Unsafe Cancels", true, "Allows cancelling block breaking even if the server might continue breaking sever side, potentially causing unexpected state changes") { doubleBreak }.group(baseGroup, Group.General).index()
 
     // Fixes / Delays
-    override val breakThreshold by c.setting("Break Threshold", 1.00f, 0.1f..1.0f, 0.01f, "The break amount at which the block is considered broken").group(baseGroup, Group.General).index()
+    override val breakThreshold by c.setting("Break Threshold", 0.70f, 0.1f..1.0f, 0.01f, "The break amount at which the block is considered broken").group(baseGroup, Group.General).index()
     override val fudgeFactor by c.setting("Fudge Factor", 1, 0..5, 1, "The number of ticks to add to the break time, usually to account for server lag").group(baseGroup, Group.General).index()
-    override val serverSwapTicks by c.setting("Server Swap", 5, 0..5, 1, "The number of ticks to give the server time to recognize the player attributes on the swapped item", " tick(s)").group(baseGroup, Group.General).index()
+    override val serverSwapTicks by c.setting("Server Swap", 0, 0..5, 1, "The number of ticks to give the server time to recognize the player attributes on the swapped item", " tick(s)").group(baseGroup, Group.General).index()
 
     //    override val desyncFix by c.setting("Desync Fix", false, "Predicts if the players breaking will be slowed next tick as block break packets are processed using the players next position") { vis() && page == Page.General }
-    override val breakDelay by c.setting("Break Delay", 5, 0..5, 1, "The delay between breaking blocks", " tick(s)").group(baseGroup, Group.General).index()
+    override val breakDelay by c.setting("Break Delay", 0, 0..5, 1, "The delay between breaking blocks", " tick(s)").group(baseGroup, Group.General).index()
 
     // Timing
     override val tickStageMask by c.setting("Break Stage Mask", setOf(TickEvent.Input.Post), ALL_STAGES.toSet(), description = "The sub-tick timing at which break actions can be performed").group(baseGroup, Group.General).index()
 
     // Swap
-    override val swapMode by c.setting("Break Swap Mode", BreakConfig.SwapMode.StartAndEnd, "Decides when to swap to the best suited tool when breaking a block").group(baseGroup, Group.General).index()
+    override val swapMode by c.setting("Break Swap Mode", BreakConfig.SwapMode.End, "Decides when to swap to the best suited tool when breaking a block").group(baseGroup, Group.General).index()
 
     // Swing
     override val swing by c.setting("Swing Mode", SwingMode.Constant, "The times at which to swing the players hand").group(baseGroup, Group.General).index()

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/config/settings/numeric/DoubleSetting.kt

@@ -26,6 +26,7 @@ import com.lambda.config.Setting
 import com.lambda.config.settings.NumericSetting
 import com.lambda.gui.dsl.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
+import com.lambda.util.math.MathUtils.roundToStep
 import net.minecraft.command.CommandRegistryAccess
 import kotlin.math.roundToInt
 
@@ -46,7 +47,9 @@ class DoubleSetting(
     private var valueIndex: Int
         get() = ((value - range.start) / step).roundToInt()
         set(index) {
-            value = (range.start + index * step).coerceIn(range)
+            value = (range.start + index * step)
+	            .roundToStep(step)
+	            .coerceIn(range)
         }
 
 	context(setting: Setting<*, Double>)

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

@@ -25,6 +25,7 @@ import com.lambda.config.Setting
 import com.lambda.config.settings.NumericSetting
 import com.lambda.gui.dsl.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
+import com.lambda.util.math.MathUtils.roundToStep
 import net.minecraft.command.CommandRegistryAccess
 import kotlin.math.roundToInt
 
@@ -45,7 +46,9 @@ class FloatSetting(
     private var valueIndex: Int
         get() = ((value - range.start) / step).roundToInt()
         set(index) {
-            value = (range.start + index * step).coerceIn(range)
+            value = (range.start + index * step)
+	            .roundToStep(step)
+	            .coerceIn(range)
         }
 
 	context(setting: Setting<*, Float>)

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

@@ -22,6 +22,7 @@ import com.lambda.event.Event
 import com.lambda.util.KeyCode
 import org.lwjgl.glfw.GLFW.GLFW_PRESS
 import org.lwjgl.glfw.GLFW.GLFW_RELEASE
+import org.lwjgl.glfw.GLFW.GLFW_REPEAT
 
 sealed class KeyboardEvent {
     /**
@@ -48,6 +49,7 @@ sealed class KeyboardEvent {
 
         val isPressed = action >= GLFW_PRESS
         val isReleased = action == GLFW_RELEASE
+        val isRepeated = action == GLFW_REPEAT
 
         fun satisfies(bind: Bind) = bind.key == translated.code && bind.modifiers and modifiers == bind.modifiers
     }

src/main/kotlin/com/lambda/gui/components/QuickSearch.kt

@@ -40,7 +40,6 @@ import imgui.flag.ImGuiStyleVar
 import imgui.flag.ImGuiWindowFlags
 import imgui.type.ImString
 import net.minecraft.client.gui.screen.ChatScreen
-import org.lwjgl.glfw.GLFW
 import kotlin.math.max
 
 // ToDo: Add support for searching of menu bar entries
@@ -304,7 +303,7 @@ object QuickSearch {
     }
 
     private fun handleKeyPress(event: KeyboardEvent.Press) {
-        if ((!event.isPressed || event.action == GLFW.GLFW_REPEAT) ||
+        if ((!event.isPressed || event.isRepeated) ||
             !(event.keyCode == KeyCode.LeftShift.code || event.keyCode == KeyCode.RightShift.code)) return
 
         val currentTime = System.currentTimeMillis()

src/main/kotlin/com/lambda/gui/components/SettingsWidget.kt

@@ -39,6 +39,7 @@ object SettingsWidget {
             if (config is Module) {
                 with(config.keybindSetting) { buildLayout() }
                 with(config.disableOnReleaseSetting) { buildLayout() }
+	            with(config.drawSetting) { buildLayout() }
             }
             smallButton("Reset") {
                 config.settings.forEach { it.reset(silent = true) }
@@ -75,7 +76,7 @@ object SettingsWidget {
         }
         val toIgnoreSettings =
             when (config) {
-                is Module -> setOf(config.keybindSetting, config.disableOnReleaseSetting)
+                is Module -> setOf(config.keybindSetting, config.disableOnReleaseSetting, config.drawSetting)
                 is UserAutomationConfig -> setOf(config.linkedModules)
                 else -> emptySet()
             }

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BasicChecker.kt

@@ -18,6 +18,7 @@
 package com.lambda.interaction.construction.simulation.checks
 
 import com.lambda.context.AutomatedSafeContext
+import com.lambda.interaction.construction.simulation.BreakSimInfo
 import com.lambda.interaction.construction.simulation.Results
 import com.lambda.interaction.construction.simulation.SimDsl
 import com.lambda.interaction.construction.simulation.SimInfo
@@ -47,7 +48,7 @@ object BasicChecker : Results<PreSimResult> {
         }
 
         // block should be ignored
-        if (state.block in breakConfig.ignoredBlocks && targetState.isEmpty()) {
+        if (state.block in breakConfig.ignoredBlocks && this@hasBasicRequirements is BreakSimInfo) {
             result(GenericResult.Ignored(pos))
             return false
         }
@@ -70,7 +71,7 @@ object BasicChecker : Results<PreSimResult> {
             return false
         }
 
-        // block is unbreakable, so it cant be broken or replaced
+        // block is unbreakable, so it can't be broken or replaced
         if (state.getHardness(world, pos) < 0 && !gamemode.isCreative) {
             result(PreSimResult.Unbreakable(pos, state))
             return false