Refactor rotation management and add Ender Chest access config.

Avanatiker · Avanatiker · commit 7a10323ac162 · 2025-01-02T05:09:50.000+01:00
Replaced `requestRotation` with a more flexible `rotate` DSL across modules for cleaner code and enhanced rotation handling. Introduced a new `accessEnderChest` configuration in `InventoryConfig` and applied it to filter container usage. Improved `PacketMine` behavior for better break handling.
diff --git a/common/src/main/java/com/lambda/mixin/MinecraftClientMixin.java b/common/src/main/java/com/lambda/mixin/MinecraftClientMixin.java
@@ -86,7 +86,7 @@ private void onScreenOpen(@Nullable Screen screen, CallbackInfo ci) {
     private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
         if (currentScreen == null) return;
         if (currentScreen instanceof ScreenHandlerProvider<?> handledScreen) {
-            EventFlow.post(new ScreenHandlerEvent.Close(handledScreen.getScreenHandler()));
+            EventFlow.post(new InventoryEvent.Close(handledScreen.getScreenHandler()));
         }
     }
 
diff --git a/common/src/main/kotlin/com/lambda/config/groups/InventoryConfig.kt b/common/src/main/kotlin/com/lambda/config/groups/InventoryConfig.kt
@@ -23,6 +23,7 @@ import net.minecraft.block.Block
 
 interface InventoryConfig {
     val disposables: Set<Block>
+    val accessEnderChest: Boolean
 
     val actionTimout: Int
     val swapWithDisposables: Boolean
diff --git a/common/src/main/kotlin/com/lambda/config/groups/InventorySettings.kt b/common/src/main/kotlin/com/lambda/config/groups/InventorySettings.kt
@@ -25,6 +25,7 @@ class InventorySettings(
     vis: () -> Boolean = { true },
 ) : InventoryConfig {
     override val disposables by c.setting("Disposables", ItemUtils.defaultDisposables, "Items that will be ignored when checking for a free slot", vis)
+    override val accessEnderChest by c.setting("Access Ender Chest", false, "Allow access to the player's ender chest", vis)
     override val actionTimout by c.setting("Action Timeout", 10, 0..100, 1, "How long to wait for after each inventory action", " ticks", vis)
     override val swapWithDisposables by c.setting("Swap With Disposables", true, "Swap items with disposable ones", vis)
     override val providerPriority by c.setting("Provider Priority", InventoryConfig.Priority.WITH_MIN_ITEMS, "What container to prefer when retrieving the item from", vis)
diff --git a/common/src/main/kotlin/com/lambda/interaction/RotationManager.kt b/common/src/main/kotlin/com/lambda/interaction/RotationManager.kt
@@ -22,7 +22,9 @@ import com.lambda.config.groups.RotationSettings
 import com.lambda.context.SafeContext
 import com.lambda.core.Loadable
 import com.lambda.event.EventFlow.post
-import com.lambda.event.events.*
+import com.lambda.event.events.ConnectionEvent
+import com.lambda.event.events.PacketEvent
+import com.lambda.event.events.RotationEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
 import com.lambda.interaction.rotation.Rotation
@@ -34,14 +36,17 @@ import com.lambda.interaction.rotation.RotationMode
 import com.lambda.module.modules.client.Baritone
 import com.lambda.threading.runGameScheduled
 import com.lambda.threading.runSafe
-import com.lambda.util.math.lerp
-import com.lambda.util.math.MathUtils.toRadian
-import com.lambda.util.math.Vec2d
 import com.lambda.util.extension.partialTicks
 import com.lambda.util.extension.rotation
+import com.lambda.util.math.MathUtils.toRadian
+import com.lambda.util.math.Vec2d
+import com.lambda.util.math.lerp
 import net.minecraft.client.input.Input
 import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket
-import kotlin.math.*
+import kotlin.math.cos
+import kotlin.math.round
+import kotlin.math.sign
+import kotlin.math.sin
 
 object RotationManager : Loadable {
     var currentRotation = Rotation.ZERO
@@ -54,16 +59,17 @@ object RotationManager : Loadable {
 
     override fun load() = "Loaded Rotation Manager"
 
-    fun Any.requestRotation(
+    @RotationDsl
+    fun Any.rotate(
         priority: Int = 0,
         alwaysListen: Boolean = false,
-        onUpdate: SafeContext.(lastContext: RotationContext?) -> RotationContext?,
-        onReceive: SafeContext.(context: RotationContext) -> Unit = {}
+        block: RequestRotationBuilder.() -> Unit,
     ) {
+        val builder = RequestRotationBuilder().apply(block)
         var lastCtx: RotationContext? = null
 
         listen<RotationEvent.Update>(priority, alwaysListen) { event ->
-            val rotationContext = onUpdate(event.context)
+            val rotationContext = builder.onUpdate?.invoke(this, event.context)
 
             rotationContext?.let {
                 event.context = it
@@ -74,11 +80,29 @@ object RotationManager : Loadable {
 
         listen<RotationEvent.Post> { event ->
             if (event.context == lastCtx) {
-                onReceive(event.context)
+                builder.onReceive?.invoke(this, event.context)
             }
         }
     }
 
+    @DslMarker
+    annotation class RotationDsl
+
+    class RequestRotationBuilder {
+        var onUpdate: (SafeContext.(lastContext: RotationContext?) -> RotationContext?)? = null
+        var onReceive: (SafeContext.(context: RotationContext) -> Unit)? = null
+
+        @RotationDsl
+        fun onUpdate(block: SafeContext.(lastContext: RotationContext?) -> RotationContext?) {
+            onUpdate = block
+        }
+
+        @RotationDsl
+        fun onReceive(block: SafeContext.(context: RotationContext) -> Unit) {
+            onReceive = block
+        }
+    }
+
     @JvmStatic
     fun update() = runSafe {
         RotationEvent.Update(BaritoneProcessor.poolContext()).post {
diff --git a/common/src/main/kotlin/com/lambda/interaction/material/container/ContainerManager.kt b/common/src/main/kotlin/com/lambda/interaction/material/container/ContainerManager.kt
@@ -43,7 +43,8 @@ import net.minecraft.screen.ScreenHandlerType
 // ToDo: Make this a Configurable to save container caches. Should use a cached region based storage system.
 object ContainerManager : Loadable {
     private val container: List<MaterialContainer>
-        get() = compileContainers + runtimeContainers
+        // ToDo: Filter containers based on a filter setting TaskFlowModule.inventory.accessEnderChest etc
+        get() = compileContainers.filter { it !is EnderChestContainer } + runtimeContainers
 
     private val compileContainers =
         getInstances<MaterialContainer> { forPackages("com.lambda.interaction.material.container") }
diff --git a/common/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt b/common/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt
@@ -26,12 +26,11 @@ import com.lambda.event.events.PlayerPacketEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.RotationManager
-import com.lambda.interaction.RotationManager.requestRotation
+import com.lambda.interaction.RotationManager.rotate
 import com.lambda.interaction.rotation.Rotation
 import com.lambda.interaction.rotation.Rotation.Companion.dist
 import com.lambda.interaction.rotation.Rotation.Companion.rotationTo
 import com.lambda.interaction.rotation.RotationContext
-import com.lambda.interaction.visibilty.VisibilityChecker.getVisibleSurfaces
 import com.lambda.interaction.visibilty.VisibilityChecker.scanSurfaces
 import com.lambda.interaction.visibilty.VisibilityChecker.visibleSides
 import com.lambda.module.Module
@@ -55,7 +54,6 @@ import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket
 import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket
 import net.minecraft.util.Hand
-import net.minecraft.util.math.Direction
 import net.minecraft.util.math.Vec3d
 import kotlin.math.pow
 
@@ -116,15 +114,15 @@ object KillAura : Module(
     }
 
     init {
-        requestRotation(
-            onUpdate = {
-                if (!rotate) return@requestRotation null
+        rotate {
+            onUpdate {
+                if (!rotate) return@onUpdate null
 
                 target?.let { target ->
                     buildRotation(target)
                 }
             }
-        )
+        }
 
         listen<PlayerPacketEvent.Pre>(Int.MIN_VALUE) { event ->
             prevY = lastY
diff --git a/common/src/main/kotlin/com/lambda/module/modules/movement/Speed.kt b/common/src/main/kotlin/com/lambda/module/modules/movement/Speed.kt
@@ -22,7 +22,7 @@ import com.lambda.context.SafeContext
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.events.MovementEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.RotationManager.requestRotation
+import com.lambda.interaction.RotationManager.rotate
 import com.lambda.interaction.rotation.Rotation
 import com.lambda.interaction.rotation.RotationContext
 import com.lambda.interaction.rotation.RotationMode
@@ -134,15 +134,15 @@ object Speed : Module(
             }
         }
 
-        requestRotation(100, alwaysListen = false,
-            onUpdate = { lastContext ->
-                if (mode != Mode.GRIM_STRAFE) return@requestRotation null
-                if (!shouldWork()) return@requestRotation null
+        rotate(100, alwaysListen = false) {
+            onUpdate { lastContext ->
+                if (mode != Mode.GRIM_STRAFE) return@onUpdate null
+                if (!shouldWork()) return@onUpdate null
 
                 var yaw = player.yaw
                 val input = newMovementInput()
 
-                if (!input.isInputting) return@requestRotation null
+                if (!input.isInputting) return@onUpdate null
 
                 run {
                     if (!diagonal) return@run
@@ -161,8 +161,8 @@ object Speed : Module(
                 val rotation = Rotation(moveYaw, lastContext?.rotation?.pitch ?: player.pitch.toDouble())
 
                 RotationContext(rotation, rotationConfig)
-            }, {}
-        )
+            }
+        }
 
         onEnable {
             reset()
diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/PacketMine.kt b/common/src/main/kotlin/com/lambda/module/modules/player/PacketMine.kt
@@ -1382,10 +1382,12 @@ object PacketMine : Module(
     }
 
     private fun SafeContext.packetStartBreak(pos: BlockPos) {
-        startBreak(pos)
-        if (packets != PacketMode.Vanilla || doubleBreak) {
+        if (packets == PacketMode.Grim) {
             abortBreak(pos)
+            stopBreak(pos)
         }
+        startBreak(pos)
+        if (packets == PacketMode.NCP) abortBreak(pos)
         if (packets == PacketMode.Grim || doubleBreak) {
             stopBreak(pos)
         }
diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/Scaffold.kt b/common/src/main/kotlin/com/lambda/module/modules/player/Scaffold.kt
@@ -26,7 +26,7 @@ import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.buildSideMesh
 import com.lambda.graphics.renderer.esp.builders.build
 import com.lambda.interaction.RotationManager.currentRotation
-import com.lambda.interaction.RotationManager.requestRotation
+import com.lambda.interaction.RotationManager.rotate
 import com.lambda.interaction.blockplace.PlaceFinder.Companion.buildPlaceInfo
 import com.lambda.interaction.blockplace.PlaceInfo
 import com.lambda.interaction.blockplace.PlaceInteraction.placeBlock
@@ -121,15 +121,15 @@ object Scaffold : Module(
     }
 
     init {
-        requestRotation(
-            onUpdate = {
+        rotate {
+            onUpdate {
                 lastRotation = null
-                val info = updatePlaceInfo() ?: return@requestRotation null
-                val rotation = rotate(info) ?: return@requestRotation null
+                val info = updatePlaceInfo() ?: return@onUpdate null
+                val rotation = rotate(info) ?: return@onUpdate null
 
                 RotationContext(rotation, rotationConfig)
             }
-        )
+        }
 
         listen<MovementEvent.Sneak> {
             if (sneakTicks > 0) it.sneak = true
diff --git a/common/src/main/kotlin/com/lambda/task/tasks/BreakBlock.kt b/common/src/main/kotlin/com/lambda/task/tasks/BreakBlock.kt
@@ -21,11 +21,10 @@ import baritone.api.pathing.goals.GoalBlock
 import com.lambda.config.groups.RotationConfig
 import com.lambda.config.groups.InteractionConfig
 import com.lambda.context.SafeContext
-import com.lambda.event.events.RotationEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.events.WorldEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.RotationManager.requestRotation
+import com.lambda.interaction.RotationManager.rotate
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.visibilty.VisibilityChecker.lookAtBlock
 import com.lambda.module.modules.client.TaskFlowModule
@@ -81,17 +80,17 @@ class BreakBlock @Ta5kBuilder constructor(
     }
 
     init {
-        requestRotation(
-            onUpdate = {
-                if (state != State.BREAKING) return@requestRotation null
-                if (!rotate || ctx.instantBreak) return@requestRotation null
+        rotate {
+            onUpdate {
+                if (state != State.BREAKING) return@onUpdate null
+                if (!rotate || ctx.instantBreak) return@onUpdate null
 
                 lookAtBlock(blockPos, rotation, interact, sides)
-            },
-            onReceive = { context ->
+            }
+            onReceive { context ->
                 isValid = context.isValid
             }
-        )
+        }
 
         listen<TickEvent.Pre> {
             drop?.let { itemDrop ->
diff --git a/common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt b/common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt
@@ -25,6 +25,7 @@ import com.lambda.event.events.PacketEvent
 import com.lambda.event.events.RotationEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.interaction.RotationManager.rotate
 import com.lambda.interaction.construction.blueprint.Blueprint
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.blueprint.DynamicBlueprint
@@ -38,12 +39,10 @@ import com.lambda.interaction.construction.simulation.Simulation.Companion.simul
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.task.Task
-import com.lambda.task.tasks.PlaceBlock.State
 import com.lambda.util.BaritoneUtils
 import com.lambda.util.BlockUtils
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.Communication.info
-import com.lambda.util.Communication.warn
 import com.lambda.util.extension.Structure
 import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket
 import net.minecraft.util.math.BlockPos
@@ -119,7 +118,11 @@ class BuildTask @Ta5kBuilder constructor(
             }
             val result = resultsWithoutPending.minOrNull() ?: return@listen
             when (result) {
-                is BuildResult.Done -> {
+                is BuildResult.Done,
+                is BuildResult.Ignored,
+                is BuildResult.Unbreakable,
+                is BuildResult.Restricted,
+                is BuildResult.NoPermission -> {
                     if (finishOnDone) success()
                 }
                 is BuildResult.NotVisible, is PlaceResult.NoIntegrity -> {
@@ -150,10 +153,12 @@ class BuildTask @Ta5kBuilder constructor(
             }
         }
 
-        listen<RotationEvent.Update> { event ->
-            if (currentPlacement == null) return@listen
-            if (!build.rotateForPlace) return@listen
-            event.context = currentPlacement?.rotation
+        rotate {
+            onUpdate {
+                if (currentPlacement == null) return@onUpdate null
+                if (!build.rotateForPlace) return@onUpdate null
+                currentPlacement?.rotation
+            }
         }
 
         listen<MovementEvent.InputUpdate> {

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ private void onScreenOpen(@Nullable Screen screen, CallbackInfo ci) {`
`86`	`86`	`private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {`
`87`	`87`	`if (currentScreen == null) return;`
`88`	`88`	`if (currentScreen instanceof ScreenHandlerProvider<?> handledScreen) {`
`89`		`- EventFlow.post(new ScreenHandlerEvent.Close(handledScreen.getScreenHandler()));`
	`89`	`+ EventFlow.post(new InventoryEvent.Close(handledScreen.getScreenHandler()));`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -1382,10 +1382,12 @@ object PacketMine : Module(`
`1382`	`1382`	`}`
`1383`	`1383`
`1384`	`1384`	`private fun SafeContext.packetStartBreak(pos: BlockPos) {`
`1385`		`- startBreak(pos)`
`1386`		`- if (packets != PacketMode.Vanilla \|\| doubleBreak) {`
	`1385`	`+ if (packets == PacketMode.Grim) {`
`1387`	`1386`	`abortBreak(pos)`
	`1387`	`+ stopBreak(pos)`
`1388`	`1388`	`}`
	`1389`	`+ startBreak(pos)`
	`1390`	`+ if (packets == PacketMode.NCP) abortBreak(pos)`
`1389`	`1391`	`if (packets == PacketMode.Grim \|\| doubleBreak) {`
`1390`	`1392`	`stopBreak(pos)`
`1391`	`1393`	`}`