Break optimizations

Author: Avanatiker

common/src/main/kotlin/com/lambda/interaction/material/ContainerManager.kt

@@ -90,7 +90,6 @@ object ContainerManager : Loadable {
         return container.find { it.available(selection) >= selection.count }
     }
 
-
     fun findContainerWithStacks(
         count: Int = StackSelection.DEFAULT_AMOUNT,
         selection: (ItemStack) -> Boolean,

common/src/main/kotlin/com/lambda/interaction/material/container/EnderChestContainer.kt

@@ -6,9 +6,7 @@ import com.lambda.task.Task
 import com.lambda.task.tasks.InventoryTask.Companion.deposit
 import com.lambda.task.tasks.InventoryTask.Companion.withdraw
 import com.lambda.task.tasks.OpenContainer.Companion.openContainer
-import net.minecraft.block.Blocks
 import net.minecraft.item.ItemStack
-import net.minecraft.item.Items
 import net.minecraft.screen.GenericContainerScreenHandler
 import net.minecraft.util.math.BlockPos
 

common/src/main/kotlin/com/lambda/interaction/material/container/MainHandContainer.kt

@@ -3,13 +3,10 @@ package com.lambda.interaction.material.container
 import com.lambda.Lambda.mc
 import com.lambda.interaction.material.MaterialContainer
 import com.lambda.interaction.material.StackSelection
-import com.lambda.module.modules.client.TaskFlow
-import com.lambda.task.Task
 import com.lambda.task.Task.Companion.buildTask
 import com.lambda.task.Task.Companion.emptyTask
 import com.lambda.util.player.SlotUtils.combined
 import com.lambda.util.player.SlotUtils.hotbar
-import kotlinx.coroutines.delay
 import net.minecraft.item.ItemStack
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.util.math.BlockPos

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

@@ -8,11 +8,9 @@ import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.interaction.InteractionConfig
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.rotation.IRotationConfig
-import com.lambda.interaction.visibilty.VisibilityChecker.getVisibleSurfaces
 import com.lambda.interaction.visibilty.VisibilityChecker.lookAtBlock
 import com.lambda.module.modules.client.TaskFlow
 import com.lambda.task.Task
-import com.lambda.util.BlockUtils.instantBreakable
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
 import net.minecraft.block.BlockState
@@ -26,12 +24,13 @@ class BreakBlock @Ta5kBuilder constructor(
     private val interactionConfig: InteractionConfig = TaskFlow.interactionSettings,
     private val sides: Set<Direction> = emptySet(),
     private val collectDrop: Boolean = false,
-    private val noRotationForInstant: Boolean = true,
+    private val dontRotate: Boolean = true,
+    private val swingHand: Boolean = true,
+    private val particles: Boolean = true,
 ) : Task<ItemEntity?>() {
     val blockPos: BlockPos get() = ctx.result.blockPos
     private var beginState: BlockState? = null
     val SafeContext.state: BlockState get() = blockPos.blockState(world)
-    val SafeContext.instant: Boolean get() = instantBreakable(state, blockPos) && noRotationForInstant
 
     override fun SafeContext.onStart() {
         if (state.isAir && !collectDrop) {
@@ -43,12 +42,12 @@ class BreakBlock @Ta5kBuilder constructor(
 
     init {
         listener<RotationEvent.Pre> { event ->
-            if (instant) return@listener
+            if (dontRotate) return@listener
             event.context = lookAtBlock(blockPos, rotationConfig, interactionConfig, sides)
         }
 
         listener<RotationEvent.Post> {
-            if (instant) return@listener
+            if (dontRotate) return@listener
             if (!it.context.isValid) return@listener
             val hitResult = it.context.hitResult?.blockResult ?: return@listener
 
@@ -61,18 +60,9 @@ class BreakBlock @Ta5kBuilder constructor(
                 return@listener
             }
 
-            if (!instant) return@listener
+            if (!dontRotate) return@listener
 
-            val shape = state.getOutlineShape(world, blockPos)
-            if (shape.isEmpty) {
-                failure("${blockPos.toShortString()} in state $state has no outline shape")
-                return@listener
-            }
-
-            shape.boundingBox
-                .getVisibleSurfaces(player.eyePos).firstOrNull()?.let { side ->
-                    breakBlock(side)
-                }
+            breakBlock(ctx.result.side)
         }
 
         listener<TickEvent.Post> {
@@ -89,10 +79,8 @@ class BreakBlock @Ta5kBuilder constructor(
 
     private fun SafeContext.breakBlock(side: Direction) {
         if (interaction.updateBlockBreakingProgress(blockPos, side)) {
-            mc.particleManager.addBlockBreakingParticles(blockPos, side)
-            if (!instant) {
-                player.swingHand(ctx.hand)
-            }
+            if (particles) mc.particleManager.addBlockBreakingParticles(blockPos, side)
+            if (swingHand) player.swingHand(ctx.hand)
         }
     }