Merge remote-tracking branch 'origin/feature/renderer' into feature/renderer

Author: bladekt

common/src/main/kotlin/com/lambda/config/AbstractSetting.kt

@@ -104,4 +104,6 @@ abstract class AbstractSetting<T : Any>(
     }
 
     class ValueListener<T>(val requiresValueChange: Boolean, val execute: (from: T, to: T) -> Unit)
+
+    override fun toString() = "Setting $name: $value of type ${type.typeName}"
 }

common/src/main/kotlin/com/lambda/config/Configurable.kt

@@ -17,6 +17,7 @@ import com.lambda.config.settings.complex.BlockSetting
 import com.lambda.config.settings.complex.ColorSetting
 import com.lambda.config.settings.complex.KeyBindSetting
 import com.lambda.config.settings.numeric.*
+import com.lambda.util.Communication.logError
 import com.lambda.util.KeyCode
 import com.lambda.util.Nameable
 import net.minecraft.block.Block
@@ -45,7 +46,11 @@ abstract class Configurable(
     override fun toJson() =
         JsonObject().apply {
             settings.forEach { setting ->
-                add(setting.name, setting.toJson())
+                try {
+                    add(setting.name, setting.toJson())
+                } catch (e: Exception) {
+                    logError("Failed to serialize $setting in ${this::class.simpleName}", e)
+                }
             }
         }
 

common/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt

@@ -23,7 +23,6 @@ import com.lambda.util.BlockUtils.vecOf
 import com.lambda.util.item.ItemStackUtils.equal
 import com.lambda.util.math.VecUtils.distSq
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
-import net.minecraft.block.Block
 import net.minecraft.block.OperatorBlock
 import net.minecraft.block.pattern.CachedBlockPosition
 import net.minecraft.item.BlockItem
@@ -37,9 +36,7 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.Vec3d
-import net.minecraft.util.shape.VoxelShape
 import kotlin.math.pow
-import kotlin.time.measureTime
 
 object BuildSimulator {
     fun Blueprint.simulate(eye: Vec3d) =

common/src/main/kotlin/com/lambda/module/modules/client/TaskFlow.kt

@@ -3,10 +3,13 @@ package com.lambda.module.modules.client
 import com.lambda.config.groups.InteractionSettings
 import com.lambda.config.groups.BuildSettings
 import com.lambda.config.groups.RotationSettings
+import com.lambda.graphics.renderer.esp.ChunkedESP.Companion.newChunkedESP
+import com.lambda.graphics.renderer.esp.EspRenderer
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import com.lambda.threading.mainThread
 import com.lambda.util.BlockUtils.allSigns
-import net.minecraft.block.Block
+import com.lambda.util.item.ItemUtils
 
 object TaskFlow : Module(
     name = "TaskFlow",
@@ -30,6 +33,10 @@ object TaskFlow : Module(
     val taskCooldown by setting("Task Cooldown", 0, 0..10000, 10, unit = " ms") {
         page == Page.TASKS
     }
-//    val disposables by setting("Disposables", ItemUtils.defaultDisposables)
-    val ignoredBlocks = mutableSetOf<Block>().apply { addAll(allSigns) }
+    val disposables by setting("Disposables", ItemUtils.defaultDisposables)
+    val ignoredBlocks by setting("Ignored Blocks", allSigns)
+
+    val esp by mainThread {
+        EspRenderer()
+    }
 }

common/src/main/kotlin/com/lambda/task/Task.kt

@@ -11,10 +11,8 @@ import com.lambda.module.modules.client.TaskFlow
 import com.lambda.threading.runConcurrent
 import com.lambda.threading.runGameScheduled
 import com.lambda.threading.runSafe
-import com.lambda.util.BaritoneUtils
 import com.lambda.util.Communication.logError
 import com.lambda.util.Communication.warn
-import com.lambda.util.DynamicReflectionSerializer.dynamicString
 import com.lambda.util.Nameable
 import com.lambda.util.text.buildText
 import com.lambda.util.text.color

common/src/main/kotlin/com/lambda/task/tasks/BreakBlock.kt

@@ -19,6 +19,7 @@ import com.lambda.task.tasks.GoalTask.Companion.moveToGoalUntil
 import com.lambda.util.BaritoneUtils
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.BlockUtils.item
+import com.lambda.util.item.ItemUtils.block
 import com.lambda.util.item.ItemUtils.defaultDisposables
 import com.lambda.util.player.SlotUtils.clickSlot
 import com.lambda.util.player.SlotUtils.hotbarAndStorage
@@ -83,7 +84,7 @@ class BreakBlock @Ta5kBuilder constructor(
 
                 if (player.hotbarAndStorage.none { it.isEmpty }) {
                     player.currentScreenHandler.inventorySlots.firstOrNull {
-                        it.stack.item in defaultDisposables
+                        it.stack.item.block in TaskFlow.disposables
                     }?.let {
                         clickSlot(it.index, 1, SlotActionType.THROW)
                     }

common/src/main/kotlin/com/lambda/task/tasks/BuildStructure.kt

@@ -3,8 +3,12 @@ package com.lambda.task.tasks
 import baritone.api.pathing.goals.GoalNear
 import com.lambda.Lambda.LOG
 import com.lambda.context.SafeContext
+import com.lambda.event.events.RenderEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.graphics.renderer.esp.DirectionMask
+import com.lambda.graphics.renderer.esp.DirectionMask.exclude
+import com.lambda.graphics.renderer.esp.DirectionMask.mask
 import com.lambda.interaction.construction.Blueprint
 import com.lambda.interaction.construction.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.DynamicBlueprint
@@ -16,6 +20,9 @@ import com.lambda.module.modules.client.TaskFlow
 import com.lambda.task.Task
 import com.lambda.util.BaritoneUtils
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Box
+import net.minecraft.util.math.Direction
+import java.awt.Color
 
 class BuildStructure @Ta5kBuilder constructor(
     private val blueprint: Blueprint,
@@ -43,6 +50,26 @@ class BuildStructure @Ta5kBuilder constructor(
             }
 
             val results = blueprint.simulate(player.getCameraPosVec(mc.tickDelta))
+            val resBlock = results.associateBy { it.blockPos }
+
+            TaskFlow.esp.clear()
+
+            var sides = DirectionMask.ALL
+
+            resBlock.forEach { (pos, res) ->
+                Direction.entries
+                    .filter { pos.offset(it) in resBlock.keys }
+                    .forEach { sides = sides.exclude(it.mask) }
+
+                TaskFlow.esp.build(
+                    Box(pos),
+                    Color(0, 255, 0, 50),
+                    Color(0, 255, 0, 50),
+                    sides,
+                    DirectionMask.OutlineMode.AND
+                )
+            }
+            TaskFlow.esp.upload()
 
             val instantResults = results.filterIsInstance<BreakResult.Success>()
                 .filter { it.context.instantBreak }
@@ -77,6 +104,10 @@ class BuildStructure @Ta5kBuilder constructor(
                 }
             }
         }
+
+        listener<RenderEvent.World> {
+            TaskFlow.esp.render()
+        }
     }
 
     private fun SafeContext.checkDone() {

common/src/main/kotlin/com/lambda/task/tasks/InventoryTask.kt

@@ -4,7 +4,9 @@ import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.interaction.material.StackSelection
+import com.lambda.module.modules.client.TaskFlow
 import com.lambda.task.Task
+import com.lambda.util.item.ItemUtils.block
 import com.lambda.util.item.ItemUtils.defaultDisposables
 import com.lambda.util.player.SlotUtils.clickSlot
 import com.lambda.util.primitives.extension.containerSlots
@@ -41,7 +43,7 @@ class InventoryTask<H : ScreenHandler>(
                 // ToDo: SWAP triangle
                 val handler = player.currentScreenHandler
                 handler.inventorySlots.firstOrNull {
-                    it.stack.item in defaultDisposables || it.stack.isEmpty
+                    it.stack.item.block in TaskFlow.disposables || it.stack.isEmpty
                 }?.let { emptySlot ->
                     clickSlot(emptySlot.id, 0, SlotActionType.SWAP)
                     clickSlot(from.id, 0, SlotActionType.SWAP)

common/src/main/kotlin/com/lambda/util/Communication.kt

@@ -36,6 +36,7 @@ object Communication {
     fun Any.warn(message: Text, source: Text = Text.empty()) = log(message, LogLevel.WARN, textSource = source)
     fun Any.logError(message: String, source: String = "") = log(LogLevel.ERROR.text(message), LogLevel.ERROR, source)
     fun Any.logError(message: Text, source: Text = Text.empty()) = log(message, LogLevel.ERROR, textSource = source)
+    fun Any.logError(message: String, throwable: Throwable) = logError(message, throwable.message ?: "")
 
     fun Any.toast(message: String, logLevel: LogLevel = LogLevel.INFO) {
         toast(logLevel.text(message), logLevel)

common/src/main/kotlin/com/lambda/util/item/ItemUtils.kt

@@ -1,6 +1,7 @@
 package com.lambda.util.item
 
 import net.minecraft.block.Block
+import net.minecraft.block.Blocks
 import net.minecraft.item.Item
 import net.minecraft.item.Items
 
@@ -84,19 +85,19 @@ object ItemUtils {
     )
 
     val defaultDisposables = setOf(
-        Items.DIRT,
-        Items.COBBLESTONE,
-        Items.GRANITE,
-        Items.DIORITE,
-        Items.ANDESITE,
-        Items.SANDSTONE,
-        Items.RED_SANDSTONE,
-        Items.NETHERRACK,
-        Items.END_STONE,
-        Items.STONE,
-        Items.BASALT,
-        Items.BLACKSTONE,
-        Items.COBBLED_DEEPSLATE
+        Blocks.DIRT,
+        Blocks.COBBLESTONE,
+        Blocks.GRANITE,
+        Blocks.DIORITE,
+        Blocks.ANDESITE,
+        Blocks.SANDSTONE,
+        Blocks.RED_SANDSTONE,
+        Blocks.NETHERRACK,
+        Blocks.END_STONE,
+        Blocks.STONE,
+        Blocks.BASALT,
+        Blocks.BLACKSTONE,
+        Blocks.COBBLED_DEEPSLATE
     )
 
     val Item.block: Block get() = Block.getBlockFromItem(this)