Merge branch '1.21.5' into feature/hot-swappable-configs

# Conflicts:
#	src/main/kotlin/com/lambda/context/AutomationConfig.kt

Author: beanbag44

build.gradle.kts

@@ -36,6 +36,7 @@ val mockkVersion: String by project
 val spairVersion: String by project
 val lwjglVersion: String by project
 val sodiumVersion: String by project
+val litematicaVersion: String by project
 
 val libs = file("libs")
 val targets = listOf("fabric.mod.json")
@@ -108,7 +109,7 @@ loom {
             property("org.lwjgl.util.DebugFunctions", "true")
             property("mixin.debug.export", "true")
 
-            vmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash", "-XX:+UseOSErrorReporting")
+            vmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash")
             programArgs("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "****")
         }
     }
@@ -150,7 +151,6 @@ dependencies {
     modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
     modImplementation("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion+$minecraftVersion")
     modImplementation("net.fabricmc:fabric-language-kotlin:$kotlinFabricVersion.$kotlinVersion")
-    modImplementation("maven.modrinth:sodium:$sodiumVersion")
 
     // Add dependencies on the required Kotlin modules.
     includeLib("io.github.classgraph:classgraph:${classGraphVersion}")
@@ -173,8 +173,10 @@ dependencies {
     includeLib("io.ktor:ktor-client-content-negotiation:$ktorVersion")
     includeLib("io.ktor:ktor-serialization-gson:$ktorVersion")
 
-    // Add mods to the mod jar
-    includeMod("com.github.rfresh2:baritone-fabric:$minecraftVersion")
+    // Add mods
+    modImplementation("com.github.rfresh2:baritone-fabric:$minecraftVersion")
+    modCompileOnly("maven.modrinth:sodium:$sodiumVersion")
+    modCompileOnly("maven.modrinth:litematica:$litematicaVersion")
 
     // Test implementations
     testImplementation(kotlin("test"))

gradle.properties

@@ -48,6 +48,7 @@ yarnMappings=build.1
 fabricApiVersion=0.124.0
 kotlinFabricVersion=1.13.4+kotlin
 sodiumVersion=mc1.21.5-0.6.13-fabric
+litematicaVersion=0.22.2
 
 # Kotlin https://kotlinlang.org/
 kotlin.code.style=official

src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java

@@ -21,7 +21,11 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
 import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.render.ViewModel;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -167,4 +171,12 @@ private int getHandSwingDuration(int constant) {
 
         return ViewModel.INSTANCE.getSwingDuration();
     }
+
+    @WrapMethod(method = "pushAwayFrom")
+    private void wrapPushAwayFrom(Entity entity, Operation<Void> original) {
+        if (lambda$instance == Lambda.getMc().player &&
+                Velocity.INSTANCE.isEnabled() &&
+                Velocity.getPushed()) return;
+        original.call(entity);
+    }
 }

src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt

@@ -71,7 +71,6 @@ class EnumSetting<T : Enum<T>>(
         lambdaTooltip(description)
     }
 
-
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
         required(word(name)) { parameter ->
             suggests { _, builder ->

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

@@ -127,11 +127,11 @@ object ClickGuiLayout : Loadable, Configurable(GuiConfig) {
     // Rounding
     val windowRounding by setting("Window Rounding", 4.6f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
     val childRounding by setting("Child Rounding", 0.0f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
-    val frameRounding by setting("Frame Rounding", 4.2f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
-    val popupRounding by setting("Popup Rounding", 0.0f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
+    val frameRounding by setting("Frame Rounding", 4.6f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
+    val popupRounding by setting("Popup Rounding", 4.6f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
     val scrollbarRounding by setting("Scrollbar Rounding", 9.0f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
-    val grabRounding by setting("Grab Rounding", 4.2f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
-    val tabRounding by setting("Tab Rounding", 4.2f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
+    val grabRounding by setting("Grab Rounding", 4.6f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
+    val tabRounding by setting("Tab Rounding", 4.6f, 0.0f..12.0f, 0.1f).group(Group.Rounding)
     val curveTessellationTol by setting("Curve Tessellation Tol", 1.25f, 0.1f..10.0f, 0.05f).group(Group.Rounding)
 
     // Font
@@ -144,61 +144,61 @@ object ClickGuiLayout : Loadable, Configurable(GuiConfig) {
     val colorWidth by setting("Shade Width", 200.0, 10.0..1000.0, 10.0).group(Group.Colors)
     val colorHeight by setting("Shade Height", 200.0, 10.0..1000.0, 10.0).group(Group.Colors)
     val colorSpeed by setting("Color Speed", 1.0, 0.1..5.0, 0.1).group(Group.Colors)
-    val text by setting("Text", Color(255, 255, 255)).group(Group.Colors)
-    val textDisabled by setting("Text Disabled", Color(128, 128, 128)).group(Group.Colors)
-    val windowBg by setting("Window Background", Color(15, 15, 15, 240)).group(Group.Colors)
-    val childBg by setting("Child Background", Color(0, 0, 0, 0)).group(Group.Colors)
-    val popupBg by setting("Popup Background", Color(20, 20, 20, 240)).group(Group.Colors)
-    val border by setting("Border", Color(110, 110, 128, 128)).group(Group.Colors)
-    val borderShadow by setting("Border Shadow", Color(0, 0, 0, 0)).group(Group.Colors)
-    val frameBg by setting("Frame Background", Color(66, 66, 66, 138)).group(Group.Colors)
-    val frameBgHovered by setting("Frame Background Hovered", Color(66, 150, 255, 102)).group(Group.Colors)
-    val frameBgActive by setting("Frame Background Active", Color(66, 150, 255, 171)).group(Group.Colors)
-    val titleBg by setting("Title Background", Color(20, 20, 20, 255)).group(Group.Colors)
-    val titleBgActive by setting("Title Background Active", Color(41, 79, 120, 255)).group(Group.Colors)
-    val titleBgCollapsed by setting("Title Background Collapsed", Color(0, 0, 0, 130)).group(Group.Colors)
-    val menuBarBg by setting("MenuBar Background", Color(36, 36, 36, 255)).group(Group.Colors)
-    val scrollbarBg by setting("Scrollbar Background", Color(5, 5, 5, 135)).group(Group.Colors)
-    val scrollbarGrab by setting("Scrollbar Grab", Color(79, 79, 79, 255)).group(Group.Colors)
-    val scrollbarGrabHovered by setting("Scrollbar Grab Hovered", Color(105, 105, 105, 255)).group(Group.Colors)
-    val scrollbarGrabActive by setting("Scrollbar Grab Active", Color(130, 130, 130, 255)).group(Group.Colors)
-    val checkMark by setting("Check Mark", Color(66, 150, 255, 255)).group(Group.Colors)
-    val sliderGrab by setting("Slider Grab", Color(61, 134, 204, 255)).group(Group.Colors)
-    val sliderGrabActive by setting("Slider Grab Active", Color(66, 150, 255, 255)).group(Group.Colors)
-    val button by setting("Button", Color(66, 150, 255, 102)).group(Group.Colors)
-    val buttonHovered by setting("Button Hovered", Color(66, 150, 255, 255)).group(Group.Colors)
-    val buttonActive by setting("Button Active", Color(16, 110, 199, 255)).group(Group.Colors)
-    val header by setting("Header", Color(66, 150, 255, 79)).group(Group.Colors)
-    val headerHovered by setting("Header Hovered", Color(66, 150, 255, 204)).group(Group.Colors)
-    val headerActive by setting("Header Active", Color(66, 150, 255, 255)).group(Group.Colors)
-    val separator by setting("Separator", Color(110, 110, 128, 128)).group(Group.Colors)
-    val separatorHovered by setting("Separator Hovered", Color(26, 96, 171, 199)).group(Group.Colors)
-    val separatorActive by setting("Separator Active", Color(26, 96, 171, 255)).group(Group.Colors)
-    val resizeGrip by setting("Resize Grip", Color(66, 150, 255, 51)).group(Group.Colors)
-    val resizeGripHovered by setting("Resize Grip Hovered", Color(66, 150, 255, 171)).group(Group.Colors)
-    val resizeGripActive by setting("Resize Grip Active", Color(66, 150, 255, 242)).group(Group.Colors)
-    val tab by setting("Tab", Color(46, 81, 122, 219)).group(Group.Colors)
-    val tabHovered by setting("Tab Hovered", Color(66, 150, 255, 204)).group(Group.Colors)
-    val tabActive by setting("Tab Active", Color(51, 105, 166, 255)).group(Group.Colors)
-    val tabUnfocused by setting("Tab Unfocused", Color(18, 32, 48, 248)).group(Group.Colors)
-    val tabUnfocusedActive by setting("Tab Unfocused Active", Color(36, 71, 110, 255)).group(Group.Colors)
-    val dockingPreview by setting("Docking Preview", Color(66, 150, 255, 179)).group(Group.Colors)
-    val dockingEmptyBg by setting("Docking Empty Background", Color(51, 51, 51, 255)).group(Group.Colors)
-    val plotLines by setting("Plot Lines", Color(156, 156, 156, 255)).group(Group.Colors)
-    val plotLinesHovered by setting("Plot Lines Hovered", Color(255, 110, 89, 255)).group(Group.Colors)
-    val plotHistogram by setting("Plot Histogram", Color(230, 179, 0, 255)).group(Group.Colors)
-    val plotHistogramHovered by setting("Plot Histogram Hovered", Color(255, 153, 0, 255)).group(Group.Colors)
-    val tableHeaderBg by setting("Table Header Background", Color(48, 48, 51, 255)).group(Group.Colors)
-    val tableBorderStrong by setting("Table Border Strong", Color(84, 84, 92, 255)).group(Group.Colors)
-    val tableBorderLight by setting("Table Border Light", Color(68, 68, 74, 255)).group(Group.Colors)
-    val tableRowBg by setting("Table Row Background", Color(0, 0, 0, 0)).group(Group.Colors)
-    val tableRowBgAlt by setting("Table Row Background Alt", Color(255, 255, 255, 15)).group(Group.Colors)
-    val textSelectedBg by setting("Text Selected Background", Color(66, 150, 255, 89)).group(Group.Colors)
-    val dragDropTarget by setting("Drag Drop Target", Color(255, 255, 0, 230)).group(Group.Colors)
-    val navHighlight by setting("Nav Highlight", Color(66, 150, 255, 255)).group(Group.Colors)
-    val navWindowingHighlight by setting("Nav Windowing Highlight", Color(255, 255, 255, 179)).group(Group.Colors)
-    val navWindowingDimBg by setting("Nav Windowing Dim Background", Color(204, 204, 204, 51)).group(Group.Colors)
-    val modalWindowDimBg by setting("Modal Window Dim Background", Color(20, 20, 20, 89)).group(Group.Colors)
+    val text by setting("Text", Color(255, 255, 255, 255)).group(Group.Colors)
+    val textDisabled by setting("Text Disabled", Color(128, 128, 128, 255)).group(Group.Colors)
+    val windowBg by setting("Window Background", Color(35, 0, 14, 240)).group(Group.Colors)
+    val childBg by setting("Child Background", Color(35, 0, 14, 240)).group(Group.Colors)
+    val popupBg by setting("Popup Background", Color(35, 0, 14, 240)).group(Group.Colors)
+    val border by setting("Border", Color(130, 12, 60, 240)).group(Group.Colors)
+    val borderShadow by setting("Border Shadow", Color(51, 0, 21, 240)).group(Group.Colors)
+    val frameBg by setting("Frame Background", Color(171, 32, 93, 102)).group(Group.Colors)
+    val frameBgHovered by setting("Frame Background Hovered", Color(214, 45, 119, 102)).group(Group.Colors)
+    val frameBgActive by setting("Frame Background Active", Color(255, 50, 140, 102)).group(Group.Colors)
+    val titleBg by setting("Title Background", Color(125, 0, 50, 240)).group(Group.Colors)
+    val titleBgActive by setting("Title Background Active", Color(162, 0, 68, 240)).group(Group.Colors)
+    val titleBgCollapsed by setting("Title Background Collapsed", Color(35, 0, 14, 240)).group(Group.Colors)
+    val menuBarBg by setting("MenuBar Background", Color(35, 0, 14, 240)).group(Group.Colors)
+    val scrollbarBg by setting("Scrollbar Background", Color(35, 0, 14, 240)).group(Group.Colors)
+    val scrollbarGrab by setting("Scrollbar Grab", Color(159, 30, 83, 240)).group(Group.Colors)
+    val scrollbarGrabHovered by setting("Scrollbar Grab Hovered", Color(198, 40, 105, 240)).group(Group.Colors)
+    val scrollbarGrabActive by setting("Scrollbar Grab Active", Color(235, 49, 126, 240)).group(Group.Colors)
+    val checkMark by setting("Check Mark", Color(255, 64, 148, 220)).group(Group.Colors)
+    val sliderGrab by setting("Slider Grab", Color(207, 46, 117, 200)).group(Group.Colors)
+    val sliderGrabActive by setting("Slider Grab Active", Color(241, 67, 143, 200)).group(Group.Colors)
+    val button by setting("Button", Color(171, 32, 93, 102)).group(Group.Colors)
+    val buttonHovered by setting("Button Hovered", Color(214, 45, 119, 102)).group(Group.Colors)
+    val buttonActive by setting("Button Active", Color(255, 50, 140, 102)).group(Group.Colors)
+    val header by setting("Header", Color(192, 30, 94, 115)).group(Group.Colors)
+    val headerHovered by setting("Header Hovered", Color(255, 59, 136, 115)).group(Group.Colors)
+    val headerActive by setting("Header Active", Color(202, 36, 101, 115)).group(Group.Colors)
+    val separator by setting("Separator", Color(107, 0, 47, 128)).group(Group.Colors)
+    val separatorHovered by setting("Separator Hovered", Color(146, 0, 64, 128)).group(Group.Colors)
+    val separatorActive by setting("Separator Active", Color(186, 0, 82, 128)).group(Group.Colors)
+    val resizeGrip by setting("Resize Grip", Color(214, 45, 119, 102)).group(Group.Colors)
+    val resizeGripHovered by setting("Resize Grip Hovered", Color(214, 45, 119, 102)).group(Group.Colors)
+    val resizeGripActive by setting("Resize Grip Active", Color(214, 45, 119, 102)).group(Group.Colors)
+    val tab by setting("Tab", Color(121, 21, 65, 140)).group(Group.Colors)
+    val tabHovered by setting("Tab Hovered", Color(169, 34, 94, 140)).group(Group.Colors)
+    val tabActive by setting("Tab Active", Color(209, 34, 112, 140)).group(Group.Colors)
+    val tabUnfocused by setting("Tab Unfocused", Color(121, 21, 65, 120)).group(Group.Colors)
+    val tabUnfocusedActive by setting("Tab Unfocused Active", Color(196, 36, 107, 120)).group(Group.Colors)
+    val dockingPreview by setting("Docking Preview", Color(208, 47, 117, 102)).group(Group.Colors)
+    val dockingEmptyBg by setting("Docking Empty Background", Color(35, 0, 14, 240)).group(Group.Colors)
+    val plotLines by setting("Plot Lines", Color(178, 36, 95, 240)).group(Group.Colors)
+    val plotLinesHovered by setting("Plot Lines Hovered", Color(209, 40, 110, 240)).group(Group.Colors)
+    val plotHistogram by setting("Plot Histogram", Color(192, 32, 91, 255)).group(Group.Colors)
+    val plotHistogramHovered by setting("Plot Histogram Hovered", Color(226, 38, 108, 255)).group(Group.Colors)
+    val tableHeaderBg by setting("Table Header Background", Color(75, 0, 31, 240)).group(Group.Colors)
+    val tableBorderStrong by setting("Table Border Strong", Color(88, 0, 36, 240)).group(Group.Colors)
+    val tableBorderLight by setting("Table Border Light", Color(67, 0, 28, 240)).group(Group.Colors)
+    val tableRowBg by setting("Table Row Background", Color(35, 0, 14, 240)).group(Group.Colors)
+    val tableRowBgAlt by setting("Table Row Background Alt", Color(242, 140, 182, 240)).group(Group.Colors)
+    val textSelectedBg by setting("Text Selected Background", Color(218, 54, 121, 240)).group(Group.Colors)
+    val dragDropTarget by setting("Drag Drop Target", Color(218, 54, 121, 240)).group(Group.Colors)
+    val navHighlight by setting("Nav Highlight", Color(218, 54, 121, 240)).group(Group.Colors)
+    val navWindowingHighlight by setting("Nav Windowing Highlight", Color(242, 140, 182, 240)).group(Group.Colors)
+    val navWindowingDimBg by setting("Nav Windowing Dim Background", Color(242, 140, 182, 240)).group(Group.Colors)
+    val modalWindowDimBg by setting("Modal Window Dim Background", Color(35, 0, 14, 90)).group(Group.Colors)
 
     init {
         listen<GuiEvent.NewFrame> {

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

@@ -22,7 +22,6 @@ import com.lambda.event.EventFlow.post
 import com.lambda.event.EventFlow.postChecked
 import com.lambda.event.events.PlayerPacketEvent
 import com.lambda.interaction.request.rotating.Rotation
-import com.lambda.interaction.request.rotating.Rotation.Companion.rotation
 import com.lambda.interaction.request.rotating.RotationManager
 import com.lambda.threading.runSafe
 import com.lambda.util.collections.LimitedOrderedSet
@@ -95,9 +94,7 @@ object PlayerPacketManager {
             updatePosition && updateRotation -> Full(position, yaw.toFloat(), pitch.toFloat(), onGround, isCollidingHorizontally)
             updatePosition -> PositionAndOnGround(position, onGround, isCollidingHorizontally)
             updateRotation -> LookAndOnGround(yaw.toFloat(), pitch.toFloat(), onGround, isCollidingHorizontally)
-            lastOnGround != onGround || lastHorizontalCollision != isCollidingHorizontally -> {
-                OnGroundOnly(onGround, isCollidingHorizontally)
-            }
+            lastOnGround != onGround || lastHorizontalCollision != isCollidingHorizontally -> OnGroundOnly(onGround, isCollidingHorizontally)
             else -> null
         }?.let {
             PlayerPacketEvent.Send(it).postChecked {

src/main/kotlin/com/lambda/interaction/PlayerPacketManager.kt

@@ -18,8 +18,6 @@
 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
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.request.LogContext
@@ -32,6 +30,7 @@ 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.Box
 import java.awt.Color
 import kotlin.math.sqrt
 
@@ -65,7 +64,13 @@ data class BreakContext(
     override val sorter get() = breakConfig.sorter
 
     override fun ShapeBuilder.buildRenderer() {
-        box(blockPos, cachedState, baseColor, sideColor, DirectionMask.ALL.exclude(hitResult.side))
+        val box = with(hitResult.pos) {
+            Box(
+                x - 0.05, y - 0.05, z - 0.05,
+                x + 0.05, y + 0.05, z + 0.05,
+            ).offset(hitResult.side.doubleVector.multiply(0.05))
+        }
+        box(box, baseColor, sideColor)
     }
 
     override fun getLogContextBuilder(): LogContextBuilder.() -> Unit = {

src/main/kotlin/com/lambda/interaction/construction/context/BreakContext.kt

@@ -18,7 +18,6 @@
 package com.lambda.interaction.construction.context
 
 import com.lambda.context.Automated
-import com.lambda.graphics.renderer.esp.DirectionMask.mask
 import com.lambda.graphics.renderer.esp.ShapeBuilder
 import com.lambda.interaction.request.LogContext
 import com.lambda.interaction.request.LogContext.Companion.LogContextBuilder
@@ -30,6 +29,7 @@ import com.lambda.interaction.request.rotating.RotationRequest
 import net.minecraft.block.BlockState
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Box
 import java.awt.Color
 
 class InteractContext(
@@ -48,7 +48,13 @@ class InteractContext(
     override val sorter get() = interactConfig.sorter
 
     override fun ShapeBuilder.buildRenderer() {
-        box(blockPos, expectedState, baseColor, sideColor, hitResult.side.mask)
+        val box = with(hitResult.pos) {
+            Box(
+                x - 0.05, y - 0.05, z - 0.05,
+                x + 0.05, y + 0.05, z + 0.05,
+            ).offset(hitResult.side.doubleVector.multiply(0.05))
+        }
+        box(box, baseColor, sideColor)
     }
 
     fun requestDependencies(request: InteractRequest): Boolean {