Fix creative related issues and more clear transfer command

Author: Avanatiker

common/src/main/kotlin/com/lambda/command/commands/TransferCommand.kt

@@ -30,7 +30,9 @@ object TransferCommand : LambdaCommand(
                             isItem(stack(ctx).value().item)
                         }
                         containerMatchSelection(selection).forEach {
-                            builder.suggest("\"${it.name} with ${it.available(selection)}\"")
+                            val available = it.available(selection)
+                            val availableMsg = if (available == Int.MAX_VALUE) "∞" else available.toString()
+                            builder.suggest("\"${it.name} with $availableMsg\"")
                         }
                         builder.buildFuture()
                     }
@@ -41,7 +43,8 @@ object TransferCommand : LambdaCommand(
                             }
                             ContainerManager.container().forEach {
                                 val space = it.spaceLeft(selection)
-                                if (space > 0) builder.suggest("\"${it.name} with $space space left\"")
+                                val spaceMsg = if (space == Int.MAX_VALUE) "∞" else space.toString()
+                                if (space > 0) builder.suggest("\"${it.name} with $spaceMsg space left\"")
                             }
                             builder.buildFuture()
                         }
@@ -59,9 +62,11 @@ object TransferCommand : LambdaCommand(
 
                             when (val result = fromContainer.transfer(selection, toContainer)) {
                                 is TransferResult.Success -> {
-                                    info("Transferring $selection from ${fromContainer.name} to ${toContainer.name}")
+                                    info("$result started.")
                                     lastTransfer = result
-                                    result.solve.start(null)
+                                    result.solve.onSuccess { _, _ ->
+                                        info("$lastTransfer completed.")
+                                    }.start(null)
                                     return@executeWithResult success()
                                 }
                                 is TransferResult.MissingItems -> {
@@ -84,6 +89,7 @@ object TransferCommand : LambdaCommand(
                 lastTransfer?.solve?.cancel() ?: run {
                     return@executeWithResult failure("No transfer to cancel")
                 }
+                info("$lastTransfer cancelled")
                 lastTransfer = null
                 success()
             }
@@ -94,6 +100,7 @@ object TransferCommand : LambdaCommand(
                 lastTransfer?.undo ?: run {
                     return@executeWithResult failure("No transfer to undo")
                 }
+                info("Undoing $lastTransfer")
                 success()
             }
         }

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

@@ -13,8 +13,8 @@ class RotationSettings(
     override val keepTicks by c.setting("Keep Rotation", 3, 1..10, 1, "Ticks to keep rotation", " ticks", vis)
     override val resetTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", " ticks", vis)
     override var instant by c.setting("Instant Rotation", true, "Instantly rotate", vis)
-    override var mean by c.setting("Mean", 20.0, 1.0..80.0, 0.1, "Average rotation speed") { vis() && !instant }
-    override var derivation by c.setting("Standard Deviation", 5.0, 0.0..20.0, 0.1, "Spread of rotation speeds") { vis() && !instant }
+    override var mean by c.setting("Mean", 20.0, 1.0..80.0, 0.1, "Average rotation speed", unit = "°") { vis() && !instant }
+    override var derivation by c.setting("Standard Deviation", 5.0, 0.0..20.0, 0.1, "Spread of rotation speeds", unit = "°") { vis() && !instant }
 
     override val turnSpeed get() = abs(nextGaussian(mean, derivation))
 

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

@@ -397,7 +397,7 @@ object BuildSimulator {
             )
 
             /* player has a better tool for the job available */
-            findBestAvailableTool(state)?.let { bestTool ->
+            if (!player.isCreative) findBestAvailableTool(state)?.let { bestTool ->
                 Hand.entries.firstOrNull {
                     val stack = player.getStackInHand(it)
                     stack.item == bestTool

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

@@ -76,11 +76,11 @@ abstract class MaterialContainer(
     }
 
     enum class Rank {
-        CREATIVE,
         MAIN_HAND,
         OFF_HAND,
         HOTBAR,
         INVENTORY,
+        CREATIVE,
         SHULKER_BOX,
         ENDER_CHEST,
         CHEST,

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

@@ -1,6 +1,7 @@
 package com.lambda.interaction.material.container
 
 import com.lambda.Lambda.mc
+import com.lambda.interaction.construction.result.ComparableResult
 import com.lambda.interaction.material.MaterialContainer
 import com.lambda.interaction.material.StackSelection
 import com.lambda.task.Task.Companion.buildTask
@@ -14,6 +15,8 @@ data object CreativeContainer : MaterialContainer(Rank.CREATIVE) {
     override fun available(selection: StackSelection): Int =
         if (mc.player?.isCreative == true && selection.optimalStack != null) Int.MAX_VALUE else 0
 
+    override fun spaceLeft(selection: StackSelection) = Int.MAX_VALUE
+
     override fun deposit(selection: StackSelection) = buildTask("CreativeDeposit") {
         if (!player.isCreative) {
             // ToDo: Maybe switch gamemode?

common/src/main/kotlin/com/lambda/interaction/material/transfer/TransferResult.kt

@@ -17,7 +17,7 @@ abstract class TransferResult {
         override val solve = ContainerTransfer(selection, from, to)
         val undo = ContainerTransfer(selection, to, from)
 
-        override fun toString() = "Transfer of [$selection] from [$from] to [$to]"
+        override fun toString() = "Transfer of [$selection] from [${from.name}] to [${to.name}]"
     }
 
     data object NoSpace : TransferResult() {

common/src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt

@@ -7,6 +7,7 @@ import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.task.Task
 import com.lambda.task.tasks.BuildStructure.Companion.buildStructure
+import com.lambda.util.BaritoneUtils
 import com.lambda.util.BaritoneUtils.primary
 import com.lambda.util.Communication.info
 import com.lambda.util.KeyCode
@@ -51,6 +52,7 @@ object HighwayTools : Module(
             runningTask?.cancel()
             runningTask = null
             distanceMoved = 0
+            BaritoneUtils.cancel()
         }
     }
 

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

@@ -98,6 +98,7 @@ class BreakBlock @Ta5kBuilder constructor(
 
     private fun SafeContext.breakBlock(side: Direction) {
         if (interaction.updateBlockBreakingProgress(blockPos, side)) {
+            if (player.isCreative) interaction.blockBreakingCooldown = 0
             if (swingHand) player.swingHand(ctx.hand)
         }
     }

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

@@ -102,8 +102,7 @@ object BlockUtils {
     fun BlockPos.blockEntity(world: ClientWorld) = world.getBlockEntity(this)
     fun SafeContext.instantBreakable(blockState: BlockState, blockPos: BlockPos): Boolean {
         val ticksNeeded = 1 / blockState.calcBlockBreakingDelta(player, world, blockPos)
-//        info("State: $blockState Ticks to break: $ticksNeeded")
-        return ticksNeeded <= 1 && ticksNeeded != 0f
+        return (ticksNeeded <= 1 && ticksNeeded != 0f) || player.isCreative
     }
     val Vec3i.blockPos: BlockPos get() = BlockPos(this)
     val Block.item: Item get() = asItem()

common/src/main/resources/lambda.accesswidener

@@ -48,4 +48,5 @@ accessible class net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPa
 # Other
 accessible field net/minecraft/world/explosion/Explosion behavior Lnet/minecraft/world/explosion/ExplosionBehavior;
 accessible field net/minecraft/structure/StructureTemplate blockInfoLists Ljava/util/List;
-accessible method net/minecraft/item/BlockItem getPlacementState (Lnet/minecraft/item/ItemPlacementContext;)Lnet/minecraft/block/BlockState;
+accessible method net/minecraft/item/BlockItem getPlacementState (Lnet/minecraft/item/ItemPlacementContext;)Lnet/minecraft/block/BlockState;
+accessible field net/minecraft/client/network/ClientPlayerInteractionManager blockBreakingCooldown I