feat(Nextgen): Baritone Integration

build.gradle

@@ -69,6 +69,14 @@ repositories {
         name = "Lenni0451"
         url = "https://maven.lenni0451.net/everything"
     }
+    maven {
+        name = "meteor-maven-snapshots"
+        url = "https://maven.meteordev.org/snapshots"
+    }
+    maven {
+        name = 'babbaj-maven'
+        url = 'https://babbaj.github.io/maven/'
+    }
 }
 
 loom {
@@ -89,6 +97,8 @@ dependencies {
     modRuntimeOnly "com.terraformersmc:modmenu:${project.mod_menu_version}"
     modImplementation "maven.modrinth:sodium:${project.sodium_version}"
     modCompileOnly "de.florianmichael:ViaFabricPlus:${project.viafabricplus_version}"
+    modImplementation "meteordevelopment:baritone:${project.baritone_version}-SNAPSHOT"
+    implementation 'dev.babbaj:nether-pathfinder:1.5'
 
     // Minecraft Authlib
     includeDependency ("com.github.CCBlueX:mc-authlib:${project.mc_authlib_version}") {

gradle.properties

@@ -25,6 +25,8 @@ yarn_mappings=1.21.1+build.3
 loader_version=0.16.9
 min_loader_version=0.16.5
 
+# https://github.com/cabaletta/baritone
+baritone_version=1.21.1
 # Fabric API
 fabric_version=0.110.0+1.21.1
 # Loom

src/main/java/net/ccbluex/liquidbounce/injection/mixins/baritone/MixinBaritone.java

@@ -0,0 +1,34 @@
+package net.ccbluex.liquidbounce.injection.mixins.baritone;
+
+import baritone.Baritone;
+import baritone.api.IBaritone;
+import baritone.api.behavior.ILookBehavior;
+import baritone.api.event.listener.IEventBus;
+import net.ccbluex.liquidbounce.utils.client.baritone.behaviors.LiquidBounceLookBehavior;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Baritone.class)
+public abstract class MixinBaritone implements IBaritone {
+
+    @Shadow
+    public abstract IEventBus getGameEventHandler();
+
+    @Unique
+    private LiquidBounceLookBehavior lookBehavior;
+
+    @Inject(method = "getLookBehavior", at = @At("HEAD"), cancellable = true, remap = false)
+    public void hookLookBehavior(CallbackInfoReturnable<ILookBehavior> cir) {
+        if (lookBehavior == null) {
+            lookBehavior = new LiquidBounceLookBehavior();
+            getGameEventHandler().registerEventListener(lookBehavior);
+        }
+
+        cir.setReturnValue(lookBehavior);
+    }
+
+}

src/main/java/net/ccbluex/liquidbounce/injection/mixins/baritone/MixinCustomGoalProcess.java

@@ -0,0 +1,23 @@
+package net.ccbluex.liquidbounce.injection.mixins.baritone;
+
+import baritone.api.pathing.goals.Goal;
+import baritone.process.CustomGoalProcess;
+import net.ccbluex.liquidbounce.event.EventManager;
+import net.ccbluex.liquidbounce.event.events.BaritoneCustomGoalProcessCreatedEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(CustomGoalProcess.class)
+public class MixinCustomGoalProcess {
+
+    @Inject(method = "setGoal", at = @At("HEAD"), cancellable = true, remap = false)
+    public void hookSetGoal(Goal goal, CallbackInfo ci) {
+        var event = new BaritoneCustomGoalProcessCreatedEvent(goal);
+        EventManager.INSTANCE.callEvent(event);
+
+        if (event.isCancelled()) ci.cancel();
+    }
+
+}

src/main/java/net/ccbluex/liquidbounce/injection/mixins/baritone/MixinPathingBehavior.java

@@ -0,0 +1,19 @@
+package net.ccbluex.liquidbounce.injection.mixins.baritone;
+
+import baritone.behavior.PathingBehavior;
+import net.ccbluex.liquidbounce.event.EventManager;
+import net.ccbluex.liquidbounce.event.events.BaritonePathCancelEverythingEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(PathingBehavior.class)
+public class MixinPathingBehavior {
+
+    @Inject(method = "cancelEverything", at = @At("TAIL"), remap = false)
+    public void hookCancelEverything(CallbackInfoReturnable<Boolean> cir) {
+        EventManager.INSTANCE.callEvent(new BaritonePathCancelEverythingEvent());
+    }
+
+}

src/main/java/net/ccbluex/liquidbounce/injection/mixins/baritone/MixinPlayerMovementInput.java

@@ -0,0 +1,27 @@
+package net.ccbluex.liquidbounce.injection.mixins.baritone;
+
+import baritone.utils.PlayerMovementInput;
+import net.ccbluex.liquidbounce.injection.mixins.minecraft.client.MixinInput;
+import net.ccbluex.liquidbounce.utils.movement.DirectionalInput;
+import net.minecraft.client.MinecraftClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerMovementInput.class)
+public class MixinPlayerMovementInput extends MixinInput {
+
+    @Inject(method = "tick", at = @At("HEAD"))
+    public void hookTick(boolean par1, float par2, CallbackInfo ci) {
+        var options = MinecraftClient.getInstance().options;
+
+        this.proceedKeyboardTick(new DirectionalInput(
+                options.forwardKey.isPressed(),
+                options.backKey.isPressed(),
+                options.leftKey.isPressed(),
+                options.rightKey.isPressed()
+        ), options.jumpKey.isPressed(), options.sneakKey.isPressed(), false, () -> {});
+    }
+
+}

src/main/java/net/ccbluex/liquidbounce/injection/mixins/baritone/MixinSetCommand.java

@@ -0,0 +1,26 @@
+package net.ccbluex.liquidbounce.injection.mixins.baritone;
+
+import baritone.api.Settings;
+import baritone.api.command.argument.IArgConsumer;
+import baritone.command.defaults.SetCommand;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.ccbluex.liquidbounce.features.module.modules.client.ModuleBaritoneKt;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(SetCommand.class)
+public class MixinSetCommand {
+
+    @Inject(method = "execute", at = @At(value = "INVOKE", target = "Lbaritone/command/defaults/SetCommand;logDirect(Ljava/lang/String;)V", ordinal = 9), remap = false)
+    private void hookSetSetting(String par1, IArgConsumer par2, CallbackInfo ci, @Local(ordinal = 0) Settings.Setting<?> setting) {
+        var onChangeListener = ModuleBaritoneKt.getControlledBaritoneSettings()
+                .getOrDefault(setting, null);
+
+        if (onChangeListener != null) {
+            onChangeListener.invoke(setting.value);
+        }
+    }
+
+}

src/main/java/net/ccbluex/liquidbounce/injection/mixins/minecraft/client/MixinInput.java

@@ -19,11 +19,17 @@
 
 package net.ccbluex.liquidbounce.injection.mixins.minecraft.client;
 
+import net.ccbluex.liquidbounce.event.EventManager;
+import net.ccbluex.liquidbounce.event.events.MovementInputEvent;
+import net.ccbluex.liquidbounce.features.module.modules.combat.ModuleSuperKnockback;
 import net.ccbluex.liquidbounce.features.module.modules.combat.criticals.ModuleCriticals;
 import net.ccbluex.liquidbounce.features.module.modules.movement.ModuleSprint;
+import net.ccbluex.liquidbounce.utils.movement.DirectionalInput;
 import net.minecraft.client.input.Input;
+import net.minecraft.client.input.KeyboardInput;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -59,4 +65,36 @@ private void hookOmnidirectionalSprintA(final CallbackInfoReturnable<Boolean> ca
         callbackInfoReturnable.setReturnValue(!ModuleSprint.INSTANCE.shouldPreventSprint() && (ModuleSprint.INSTANCE.shouldSprintOmnidirectionally() ? hasMovement : callbackInfoReturnable.getReturnValue()));
     }
 
+    @Unique
+    public void proceedKeyboardTick(DirectionalInput baseDirectionalInput, boolean jumping, boolean sneaking, boolean update, Runnable additive) {
+        var event = new MovementInputEvent(baseDirectionalInput, jumping, sneaking);
+
+        EventManager.INSTANCE.callEvent(event);
+
+        if (update) {
+            var directionalInput = event.getDirectionalInput();
+
+            this.pressingForward = directionalInput.getForwards();
+            this.pressingBack = directionalInput.getBackwards();
+            this.pressingLeft = directionalInput.getLeft();
+            this.pressingRight = directionalInput.getRight();
+            this.movementForward = KeyboardInput.getMovementMultiplier(directionalInput.getForwards(), directionalInput.getBackwards());
+            this.movementSideways = KeyboardInput.getMovementMultiplier(directionalInput.getLeft(), directionalInput.getRight());
+
+            additive.run();
+
+            if (ModuleSuperKnockback.INSTANCE.shouldStopMoving()) {
+                this.movementForward = 0f;
+
+                ModuleSprint sprint = ModuleSprint.INSTANCE;
+
+                if (sprint.shouldSprintOmnidirectionally()) {
+                    this.movementSideways = 0f;
+                }
+            }
+
+            this.jumping = event.getJumping();
+            this.sneaking = event.getSneaking();
+        }
+    }
 }

src/main/java/net/ccbluex/liquidbounce/injection/mixins/minecraft/client/MixinKeyboardInput.java

@@ -19,11 +19,8 @@
 package net.ccbluex.liquidbounce.injection.mixins.minecraft.client;
 
 import net.ccbluex.liquidbounce.event.EventManager;
-import net.ccbluex.liquidbounce.event.events.MovementInputEvent;
 import net.ccbluex.liquidbounce.event.events.RotatedMovementInputEvent;
-import net.ccbluex.liquidbounce.features.module.modules.combat.ModuleSuperKnockback;
 import net.ccbluex.liquidbounce.features.module.modules.movement.ModuleInventoryMove;
-import net.ccbluex.liquidbounce.features.module.modules.movement.ModuleSprint;
 import net.ccbluex.liquidbounce.utils.aiming.AimPlan;
 import net.ccbluex.liquidbounce.utils.aiming.Rotation;
 import net.ccbluex.liquidbounce.utils.aiming.RotationManager;
@@ -38,6 +35,7 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -68,35 +66,10 @@ private void hookInventoryMoveSprint(boolean slowDown, float f, CallbackInfo ci)
 
     @Inject(method = "tick", at = @At(value = "FIELD", target = "Lnet/minecraft/client/input/KeyboardInput;sneaking:Z", shift = At.Shift.AFTER), allow = 1)
     private void injectMovementInputEvent(boolean slowDown, float f, CallbackInfo ci) {
-        var event = new MovementInputEvent(new DirectionalInput(this.pressingForward, this.pressingBack, this.pressingLeft, this.pressingRight), this.jumping, this.sneaking);
-
-        EventManager.INSTANCE.callEvent(event);
-
-        var directionalInput = event.getDirectionalInput();
-
-        this.pressingForward = directionalInput.getForwards();
-        this.pressingBack = directionalInput.getBackwards();
-        this.pressingLeft = directionalInput.getLeft();
-        this.pressingRight = directionalInput.getRight();
-        this.movementForward = KeyboardInput.getMovementMultiplier(directionalInput.getForwards(), directionalInput.getBackwards());
-        this.movementSideways = KeyboardInput.getMovementMultiplier(directionalInput.getLeft(), directionalInput.getRight());
-
-        this.fixStrafeMovement();
-
-        if (ModuleSuperKnockback.INSTANCE.shouldStopMoving()) {
-            this.movementForward = 0f;
-
-            ModuleSprint sprint = ModuleSprint.INSTANCE;
-
-            if (sprint.shouldSprintOmnidirectionally()) {
-                this.movementSideways = 0f;
-            }
-        }
-
-        this.jumping = event.getJumping();
-        this.sneaking = event.getSneaking();
+        this.proceedKeyboardTick(new DirectionalInput(this.pressingForward, this.pressingBack, this.pressingLeft, this.pressingRight), this.jumping, this.sneaking, true, this::fixStrafeMovement);
     }
 
+    @Unique
     private void fixStrafeMovement() {
         ClientPlayerEntity player = MinecraftClient.getInstance().player;
         RotationManager rotationManager = RotationManager.INSTANCE;

src/main/java/net/ccbluex/liquidbounce/injection/mixins/minecraft/render/MixinGameRenderer.java

@@ -39,6 +39,7 @@
 import net.ccbluex.liquidbounce.utils.aiming.RaytracingExtensionsKt;
 import net.ccbluex.liquidbounce.utils.aiming.Rotation;
 import net.ccbluex.liquidbounce.utils.aiming.RotationManager;
+import net.ccbluex.liquidbounce.utils.client.baritone.PathManager;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.PostEffectProcessor;
 import net.minecraft.client.gui.DrawContext;
@@ -183,7 +184,8 @@ private void injectHurtCam(MatrixStack matrixStack, float f, CallbackInfo callba
 
     @Inject(method = "bobView", at = @At("HEAD"), cancellable = true)
     private void injectBobView(MatrixStack matrixStack, float f, CallbackInfo callbackInfo) {
-        if (ModuleNoBob.INSTANCE.getRunning() || ModuleTracers.INSTANCE.getRunning()) {
+        if ((ModuleNoBob.INSTANCE.getRunning() || ModuleTracers.INSTANCE.getRunning())
+            || (ModuleFreeCam.INSTANCE.getRunning() && PathManager.Companion.isPathing())) {
             callbackInfo.cancel();
             return;
         }

src/main/kotlin/net/ccbluex/liquidbounce/config/types/ToggleableConfigurable.kt

@@ -36,8 +36,14 @@ abstract class ToggleableConfigurable(
     enabled: Boolean
 ) : EventListener, Configurable(name, valueType = ValueType.TOGGLEABLE), MinecraftShortcuts {
 
+    var onChangedListener: (Boolean) -> Unit = {}
+
     // TODO: Make enabled change also call newState
-    internal var enabled by boolean("Enabled", enabled)
+    internal var enabled by boolean("Enabled", enabled).onChanged {
+        onChangedListener.invoke(it)
+    }
+
+
 
     fun newState(state: Boolean) {
         if (!enabled) {

src/main/kotlin/net/ccbluex/liquidbounce/event/EventManager.kt

@@ -136,7 +136,9 @@ val ALL_EVENT_CLASSES: Array<KClass<out Event>> = arrayOf(
     PlayerEquipmentChangeEvent::class,
     ClickGuiValueChangeEvent::class,
     BlockAttackEvent::class,
-    QueuePacketEvent::class
+    QueuePacketEvent::class,
+    BaritoneCustomGoalProcessCreatedEvent::class,
+    BaritonePathCancelEverythingEvent::class,
 )
 
 /**

src/main/kotlin/net/ccbluex/liquidbounce/event/events/GameEvents.kt

@@ -20,6 +20,7 @@
 
 package net.ccbluex.liquidbounce.event.events
 
+import baritone.api.pathing.goals.Goal
 import net.ccbluex.liquidbounce.event.CancellableEvent
 import net.ccbluex.liquidbounce.event.Event
 import net.ccbluex.liquidbounce.integration.interop.protocol.event.WebSocketEvent
@@ -75,6 +76,12 @@ class CancelBlockBreakingEvent : CancellableEvent()
  * All events which are related to the minecraft client
  */
 
+@Nameable("baritonePathCancelEverythingEvent")
+class BaritonePathCancelEverythingEvent : Event()
+
+@Nameable("baritoneCustomGoalProcessCreated")
+class BaritoneCustomGoalProcessCreatedEvent(val goal: Goal) : CancellableEvent()
+
 @Nameable("session")
 @WebSocketEvent
 class SessionEvent(val session: Session) : Event()

src/main/kotlin/net/ccbluex/liquidbounce/features/module/ClientModule.kt

@@ -132,7 +132,7 @@ open class ClientModule(
      * If the module is running and in game. Can be overridden to add additional checks.
      */
     override val running: Boolean
-        get() = super.running && inGame && enabled
+        get() = (super.running && inGame && enabled) || disableActivation
 
     val bind by bind("Bind", InputBind(InputUtil.Type.KEYSYM, bind, bindAction))
         .doNotIncludeWhen { !AutoConfig.includeConfiguration.includeBinds }

src/main/kotlin/net/ccbluex/liquidbounce/features/module/ModuleManager.kt

@@ -25,10 +25,7 @@ import net.ccbluex.liquidbounce.event.events.KeyboardKeyEvent
 import net.ccbluex.liquidbounce.event.events.MouseButtonEvent
 import net.ccbluex.liquidbounce.event.events.WorldChangeEvent
 import net.ccbluex.liquidbounce.event.handler
-import net.ccbluex.liquidbounce.features.module.modules.client.ModuleAutoConfig
-import net.ccbluex.liquidbounce.features.module.modules.client.ModuleLiquidChat
-import net.ccbluex.liquidbounce.features.module.modules.client.ModuleRichPresence
-import net.ccbluex.liquidbounce.features.module.modules.client.ModuleTargets
+import net.ccbluex.liquidbounce.features.module.modules.client.*
 import net.ccbluex.liquidbounce.features.module.modules.combat.*
 import net.ccbluex.liquidbounce.features.module.modules.combat.aimbot.ModuleAutoBow
 import net.ccbluex.liquidbounce.features.module.modules.combat.aimbot.ModuleDroneControl
@@ -84,6 +81,7 @@ import net.ccbluex.liquidbounce.features.module.modules.world.packetmine.ModuleP
 import net.ccbluex.liquidbounce.features.module.modules.world.scaffold.ModuleScaffold
 import net.ccbluex.liquidbounce.features.module.modules.world.traps.ModuleAutoTrap
 import net.ccbluex.liquidbounce.script.ScriptApiRequired
+import net.ccbluex.liquidbounce.utils.client.baritone.BaritoneUtil
 import net.ccbluex.liquidbounce.utils.client.mc
 import net.ccbluex.liquidbounce.utils.input.InputBind
 import net.ccbluex.liquidbounce.utils.kotlin.mapArray
@@ -369,6 +367,10 @@ object ModuleManager : EventListener, Iterable<ClientModule> by modules {
             builtin += ModuleDebugRecorder
         }
 
+        if (BaritoneUtil.isAvailable) {
+            builtin += ModuleBaritone
+        }
+
         builtin.forEach { module ->
             addModule(module)
             module.walkKeyPath()