Custom baritone build test

Author: Avanatiker

build.gradle

@@ -108,10 +108,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
 
     // This Baritone will NOT be included in the jar
-    implementation 'com.github.cabaletta:baritone:1.2.14'
-
-    // This Baritone WILL be included in the jar
-    jarLibs 'cabaletta:baritone-api:1.2'
+    jarLibs files("libs/baritone-api-forge-1.2.15.jar")
 
     // Add everything in jarLibs to implementation (compile)
     implementation configurations.jarLibs

libs/baritone-api-forge-1.2.15.jar

@@ -167,6 +167,8 @@ object PlayerInventoryManager : Manager {
         currentId = 0
     }
 
+    fun isDone() = transactionQueue.isEmpty()
+
     /**
      * Adds a new task to the inventory manager
      *

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

@@ -1,14 +1,19 @@
 package com.lambda.client.module.modules.movement
 
 import com.lambda.client.LambdaMod
+import com.lambda.client.event.events.PacketEvent
 import com.lambda.client.gui.AbstractLambdaGui
 import com.lambda.client.module.Category
 import com.lambda.client.module.Module
+import com.lambda.client.util.MovementUtils.isMoving
 import com.lambda.client.util.threads.safeListener
 import net.minecraft.client.gui.GuiChat
 import net.minecraft.client.gui.GuiRepair
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.gui.inventory.GuiEditSign
+import net.minecraft.network.play.client.CPacketClickWindow
+import net.minecraft.network.play.client.CPacketEntityAction
+import net.minecraft.network.play.client.CPacketPlayer
 import net.minecraft.util.MovementInputFromOptions
 import net.minecraftforge.client.event.InputUpdateEvent
 import org.lwjgl.input.Keyboard
@@ -19,11 +24,40 @@ object InventoryMove : Module(
     category = Category.MOVEMENT
 ) {
     private val rotateSpeed by setting("Rotate Speed", 5, 0..20, 1)
+    private val itemMovement by setting("Item Movement", true)
     val sneak by setting("Sneak", false)
 
     private var hasSent = false
 
+    private var savedClickWindow = CPacketClickWindow()
+    private const val upSpoofDistance = 0.0656
+
     init {
+        safeListener<PacketEvent.Send> {
+            if (itemMovement
+                && player.onGround
+                && it.packet is CPacketClickWindow
+                && it.packet != savedClickWindow
+                && player.isMoving
+                && world.getCollisionBoxes(player, player.entityBoundingBox.offset(0.0, upSpoofDistance, 0.0)).isEmpty()
+            ) {
+                savedClickWindow = it.packet
+
+                it.cancel()
+
+                if (player.isSprinting) {
+                    player.connection.sendPacket(CPacketEntityAction(player, CPacketEntityAction.Action.STOP_SPRINTING))
+                }
+
+                player.connection.sendPacket(CPacketPlayer.Position(player.posX, player.posY + upSpoofDistance, player.posZ, false))
+                player.connection.sendPacket(it.packet)
+
+                if (player.isSprinting) {
+                    player.connection.sendPacket(CPacketEntityAction(player, CPacketEntityAction.Action.START_SPRINTING))
+                }
+            }
+        }
+
         safeListener<InputUpdateEvent>(9999) {
             if (it.movementInput !is MovementInputFromOptions || isInvalidGui(mc.currentScreen)) return@safeListener
 

src/main/kotlin/com/lambda/client/module/modules/movement/InventoryMove.kt

@@ -31,7 +31,6 @@ object NoSlowDown : Module(
 ) {
     private val ncpStrict by setting("NCP Strict", true)
     private val sneak by setting("Sneak", false)
-    private val itemMovement by setting("Item Movement", false)
     val soulSand by setting("Soul Sand", true)
     val cobweb by setting("Cobweb", true)
     private val slime by setting("Slime", true)
@@ -41,10 +40,6 @@ object NoSlowDown : Module(
     private val potion by setting("Potions", true, { !allItems })
     private val shield by setting("Shield", true, { !allItems })
 
-    private var savedClickWindow = CPacketClickWindow()
-
-    private const val upSpoofDistance = 0.0656
-
     /*
      * InputUpdateEvent is called just before the player is slowed down @see EntityPlayerSP.onLivingUpdate)
      * We'll abuse this fact, and multiply moveStrafe and moveForward by 5 to nullify the *0.2f hardcoded by Mojang.
@@ -59,31 +54,6 @@ object NoSlowDown : Module(
             }
         }
 
-        safeListener<PacketEvent.Send> {
-            if (itemMovement
-                && player.onGround
-                && it.packet is CPacketClickWindow
-                && it.packet != savedClickWindow
-                && player.isMoving
-                && world.getCollisionBoxes(player, player.entityBoundingBox.offset(0.0, upSpoofDistance, 0.0)).isEmpty()
-            ) {
-                savedClickWindow = it.packet
-
-                it.cancel()
-
-                if (player.isSprinting) {
-                    player.connection.sendPacket(CPacketEntityAction(player, CPacketEntityAction.Action.STOP_SPRINTING))
-                }
-
-                player.connection.sendPacket(CPacketPlayer.Position(player.posX, player.posY + upSpoofDistance, player.posZ, false))
-                player.connection.sendPacket(it.packet)
-
-                if (player.isSprinting) {
-                    player.connection.sendPacket(CPacketEntityAction(player, CPacketEntityAction.Action.START_SPRINTING))
-                }
-            }
-        }
-
         /**
          * @author ionar2
          * Used with explicit permission and MIT license permission