Add compatibility with Operation.kt

Author: Avanatiker

src/main/kotlin/com/lambda/client/manager/managers/PlayerInventoryManager.kt

@@ -25,6 +25,9 @@ import net.minecraft.network.play.server.SPacketConfirmTransaction
 import java.util.*
 import java.util.concurrent.ConcurrentSkipListSet
 
+/**
+ * @see NoGhostItems
+ */
 object PlayerInventoryManager : Manager {
     val timer = TickTimer()
     private val transactionQueue = ConcurrentSkipListSet<InventoryTask>(Comparator.reverseOrder())
@@ -76,8 +79,6 @@ object PlayerInventoryManager : Manager {
                 return@safeListener
             }
 
-            if (NoGhostItems.baritoneSync) NoGhostItems.pauseBaritone()
-
             transactionQueue.firstOrNull()?.let { currentTask ->
                 currentTask.currentInfo()?.let { currentInfo ->
                     if (currentInfo.transactionId < 0 || timer.tick(NoGhostItems.timeout, false)) {
@@ -103,7 +104,7 @@ object PlayerInventoryManager : Manager {
         if (transactionId > -1) {
             currentInfo.transactionId = transactionId
             currentInfo.tries++
-            LambdaMod.LOG.info("Transaction successfully initiated. $currentInfo")
+            LambdaMod.LOG.info("Transaction successfully initiated. ${transactionQueue.size} left. $currentInfo")
         } else {
             LambdaMod.LOG.error("Container outdated. Skipping task. $currentInfo")
             next()
@@ -123,10 +124,7 @@ object PlayerInventoryManager : Manager {
                 transactionID = activeContainer.getNextTransactionID(inventory)
 
                 val itemStack = if (currentInfo.type == ClickType.PICKUP && currentInfo.slot != -999) {
-                    getContainerOrNull(currentInfo.windowId)
-                        ?.inventorySlots
-                        ?.getOrNull(currentInfo.slot)
-                        ?.stack ?: ItemStack.EMPTY
+                    activeContainer.inventorySlots?.getOrNull(currentInfo.slot)?.stack ?: ItemStack.EMPTY
                 } else {
                     ItemStack.EMPTY
                 }
@@ -144,22 +142,19 @@ object PlayerInventoryManager : Manager {
                     onMainThreadSafe { playerController.updateController() }
                 }
             }
+        } ?: run {
+            LambdaMod.LOG.error("Container outdated. Skipping task. $currentInfo")
+            next()
         }
 
         return transactionID
     }
 
     private fun SafeClientEvent.getContainerOrNull(windowId: Int): Container? =
-        when (windowId) {
-            player.inventoryContainer.windowId -> {
-                player.inventoryContainer
-            }
-            player.openContainer.windowId -> {
-                player.openContainer
-            }
-            else -> {
-                null
-            }
+        if (windowId == player.openContainer.windowId) {
+            player.openContainer
+        } else {
+            null
         }
 
     fun next() {
@@ -179,8 +174,16 @@ object PlayerInventoryManager : Manager {
      *
      * @return [TaskState] representing the state of this task
      */
-    fun AbstractModule.addInventoryTask(vararg clickInfo: ClickInfo) =
-        InventoryTask(currentId++, modulePriority, clickInfo).let {
+    fun AbstractModule.addInventoryTask(vararg clickInfo: ClickInfo): TaskState {
+        if (NoGhostItems.baritoneSync) NoGhostItems.pauseBaritone()
+        return InventoryTask(currentId++, modulePriority, clickInfo).let {
+            transactionQueue.add(it)
+            it.taskState
+        }
+    }
+
+    fun addInventoryTask(vararg clickInfo: ClickInfo) =
+        InventoryTask(currentId++, 0, clickInfo).let {
             transactionQueue.add(it)
             it.taskState
         }

src/main/kotlin/com/lambda/client/module/modules/combat/AutoOffhand.kt

@@ -71,10 +71,6 @@ object AutoOffhand : Module(
     // General
     private val priority by setting("Priority", Priority.HOTBAR)
     private val switchMessage by setting("Switch Message", true)
-    private val delay by setting("Delay", 2, 1..20, 1,
-        description = "Ticks to wait between each move")
-    private val confirmTimeout by setting("Confirm Timeout", 5, 1..20, 1,
-        description = "Maximum ticks to wait for confirm packets from server")
 
     private enum class Type(val filter: (ItemStack) -> Boolean) {
         TOTEM({ it.item.id == 449 }),
@@ -88,9 +84,6 @@ object AutoOffhand : Module(
         HOTBAR, INVENTORY
     }
 
-    private val transactionLog = HashMap<Short, Boolean>()
-    private val confirmTimer = TickTimer(TimeUnit.TICKS)
-    private val movingTimer = TickTimer(TimeUnit.TICKS)
     private var maxDamage = 0f
 
     init {
@@ -104,32 +97,11 @@ object AutoOffhand : Module(
             }
         }
 
-        safeListener<PacketEvent.Receive> {
-            if (it.packet !is SPacketConfirmTransaction || it.packet.windowId != 0 || !transactionLog.containsKey(it.packet.actionNumber)) return@safeListener
-
-            transactionLog[it.packet.actionNumber] = true
-            if (!transactionLog.containsValue(false)) {
-                confirmTimer.reset(confirmTimeout * -50L) // If all the click packets were accepted then we reset the timer for next moving
-            }
-        }
-
         safeListener<TickEvent.ClientTickEvent>(1100) {
             if (player.isDead || player.health <= 0.0f) return@safeListener
 
-            if (!confirmTimer.tick(confirmTimeout.toLong(), false)) return@safeListener
-            if (!movingTimer.tick(delay.toLong(), false)) return@safeListener // Delays `delay` ticks
-
             updateDamage()
 
-            if (!player.inventory.itemStack.isEmpty) { // If player is holding an in inventory
-                if (mc.currentScreen is GuiContainer) { // If inventory is open (playing moving item)
-                    movingTimer.reset() // reset movingTimer as the user is currently interacting with the inventory.
-                } else { // If inventory is not open (ex. inventory desync)
-                    removeHoldingItem()
-                }
-                return@safeListener
-            }
-
             switchToType(getType(), true)
         }
     }
@@ -169,15 +141,7 @@ object AutoOffhand : Module(
         getItemSlot(typeOriginal, attempts)?.let { (slot, typeAlt) ->
             if (slot == player.offhandSlot) return
 
-            transactionLog.clear()
-            moveToSlot(slot, player.offhandSlot).forEach {
-                transactionLog[it] = false
-            }
-
-            playerController.updateController()
-
-            confirmTimer.reset()
-            movingTimer.reset()
+            moveToSlot(slot, player.offhandSlot)
 
             if (switchMessage) MessageSendHelper.sendChatMessage("$chatName Offhand now has a ${typeAlt.toString().lowercase()}")
         }

src/main/kotlin/com/lambda/client/module/modules/player/NoGhostItems.kt

@@ -17,10 +17,10 @@ object NoGhostItems : Module(
     description = "Syncs inventory transactions for strict environments",
     category = Category.PLAYER
 ) {
-    private val syncMode by setting("Scope", SyncMode.ALL)
+    val syncMode by setting("Scope", SyncMode.ALL)
     val baritoneSync by setting("Baritone pause", true, description = "Pauses Baritone until transaction is complete.")
-    val timeout by setting("Timeout in ms", 250, 1..2500, 25)
-    val maxRetries by setting("Max retries", 3, 0..20, 1)
+    val timeout by setting("Timeout in ms", 800, 1..2500, 25)
+    val maxRetries by setting("Max retries", 8, 0..20, 1)
     private val clearQueue = setting("Clear Transaction Queue", false)
 
     enum class SyncMode {