Fixed ambiguous container matching

Author: Avanatiker

common/src/main/kotlin/com/lambda/config/groups/BuildConfig.kt

@@ -8,5 +8,4 @@ interface BuildConfig {
     val breakInstantAtOnce: Boolean
     val rotateForBreak: Boolean
     val swingHand: Boolean
-    val particlesOnBreak: Boolean
 }

common/src/main/kotlin/com/lambda/config/groups/BuildSettings.kt

@@ -13,5 +13,4 @@ class BuildSettings(
     override val breakInstantAtOnce by c.setting("Break Instant At Once", true, "Break all instant blocks at once", vis)
     override val rotateForBreak by c.setting("Rotate For Break", false, "Rotate towards block while breaking", vis)
     override val swingHand by c.setting("Swing Hand", true, "Swing hand on interactions", vis)
-    override val particlesOnBreak by c.setting("Particles On Break", true, "Show particles when breaking blocks", vis)
 }

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

@@ -63,17 +63,17 @@ abstract class MaterialContainer(
             }
         } ?: deposit(selection)
 
-    open fun StackSelection.matchingStacks() =
-        filterStacks(stacks)
+    open fun stacksMatching(selection: StackSelection) =
+        selection.filterStacks(stacks)
 
-    open fun matchingStacks(selection: (ItemStack) -> Boolean) =
-        selection.select().matchingStacks()
+    open fun stacksMatching(selection: (ItemStack) -> Boolean) =
+        stacksMatching(selection.select())
 
     open fun available(selection: StackSelection) =
-        selection.matchingStacks().count
+        stacksMatching(selection).count
 
     open fun spaceLeft(selection: StackSelection) =
-        selection.matchingStacks().spaceLeft + stacks.empty * selection.stackSize
+        stacksMatching(selection).spaceLeft + stacks.empty * selection.stackSize
 
     fun transfer(selection: StackSelection, destination: MaterialContainer): TransferResult {
         val amount = available(selection)

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

@@ -20,7 +20,7 @@ object MainHandContainer : MaterialContainer(Rank.MAIN_HAND) {
     override fun withdraw(selection: StackSelection) = emptyTask("WithdrawFromMainHand")
 
     override fun deposit(selection: StackSelection) = buildTask("DepositToMainHand") {
-        selection.matchingStacks().firstOrNull()?.let { stack ->
+        InventoryContainer.stacksMatching(selection).firstOrNull()?.let { stack ->
             if (ItemStack.areEqual(stack, player.mainHandStack)) {
                 return@buildTask
             }

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

@@ -26,7 +26,6 @@ class BreakBlock @Ta5kBuilder constructor(
     private val collectDrop: Boolean = TaskFlow.build.collectDrops,
     private val rotate: Boolean = TaskFlow.build.rotateForBreak,
     private val swingHand: Boolean = TaskFlow.build.swingHand,
-    private val particles: Boolean = TaskFlow.build.particlesOnBreak,
 ) : Task<ItemEntity?>() {
     val blockPos: BlockPos get() = ctx.result.blockPos
     private var beginState: BlockState? = null
@@ -76,7 +75,6 @@ class BreakBlock @Ta5kBuilder constructor(
 
     private fun SafeContext.breakBlock(side: Direction) {
         if (interaction.updateBlockBreakingProgress(blockPos, side)) {
-            if (particles) mc.particleManager.addBlockBreakingParticles(blockPos, side)
             if (swingHand) player.swingHand(ctx.hand)
         }
     }