BaritoneManager: Exhaustive Baritone Settings Mirror

Author: Avanatiker

src/main/java/com/lambda/mixin/baritone/MixinBaritonePlayerContext.java

@@ -20,8 +20,8 @@
 import baritone.Baritone;
 import baritone.api.utils.Rotation;
 import baritone.utils.player.BaritonePlayerContext;
+import com.lambda.interaction.BaritoneManager;
 import com.lambda.interaction.request.rotating.RotationManager;
-import com.lambda.util.BaritoneUtils;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -38,7 +38,7 @@ public class MixinBaritonePlayerContext {
     // Let baritone know the actual rotation
     @Inject(method = "playerRotations", at = @At("HEAD"), cancellable = true, remap = false)
     void syncRotationWithBaritone(CallbackInfoReturnable<Rotation> cir) {
-        if (baritone != BaritoneUtils.getPrimary()) return;
+        if (baritone != BaritoneManager.getPrimary()) return;
 
         RotationManager rm = RotationManager.INSTANCE;
         cir.setReturnValue(new Rotation(

src/main/java/com/lambda/mixin/baritone/MixinLookBehavior.java

@@ -21,8 +21,8 @@
 import baritone.api.event.events.RotationMoveEvent;
 import baritone.api.utils.Rotation;
 import baritone.behavior.LookBehavior;
+import com.lambda.interaction.BaritoneManager;
 import com.lambda.interaction.request.rotating.RotationManager;
-import com.lambda.util.BaritoneUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -34,7 +34,7 @@ public class MixinLookBehavior {
     @Inject(method = "updateTarget", at = @At("HEAD"), remap = false, cancellable = true)
     void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
         LookBehavior instance = ((LookBehavior) (Object) this);
-        if (instance.baritone != BaritoneUtils.getPrimary()) return;
+        if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         RotationManager.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
         ci.cancel();
@@ -43,15 +43,15 @@ void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
     @Inject(method = "onPlayerUpdate", at = @At("HEAD"), remap = false, cancellable = true)
     void onUpdate(PlayerUpdateEvent event, CallbackInfo ci) {
         LookBehavior instance = ((LookBehavior) (Object) this);
-        if (instance.baritone != BaritoneUtils.getPrimary()) return;
+        if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         ci.cancel();
     }
 
     @Inject(method = "onPlayerRotationMove", at = @At("HEAD"), remap = false, cancellable = true)
     void onMovementUpdate(RotationMoveEvent event, CallbackInfo ci) {
         LookBehavior instance = ((LookBehavior) (Object) this);
-        if (instance.baritone != BaritoneUtils.getPrimary()) return;
+        if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         ci.cancel();
     }

src/main/kotlin/com/lambda/gui/MenuBar.kt

@@ -31,6 +31,7 @@ import com.lambda.gui.components.HudGuiLayout
 import com.lambda.gui.components.QuickSearch
 import com.lambda.gui.components.SettingsWidget.buildConfigSettingsContext
 import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.interaction.BaritoneManager
 import com.lambda.module.ModuleRegistry
 import com.lambda.module.tag.ModuleTag
 import com.lambda.network.LambdaAPI
@@ -137,6 +138,9 @@ object MenuBar {
             menu("Lambda API Settings") {
                 buildConfigSettingsContext(LambdaAPI)
             }
+            menu("Baritone Settings") {
+                buildConfigSettingsContext(BaritoneManager)
+            }
         }
         separator()
         menu("Open Folder") {

src/main/kotlin/com/lambda/interaction/BaritoneManager.kt

@@ -28,10 +28,10 @@ import com.lambda.event.events.TickEvent
 import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
+import com.lambda.interaction.BaritoneManager
 import com.lambda.interaction.request.RequestHandler
 import com.lambda.interaction.request.rotating.Rotation.Companion.slerp
 import com.lambda.interaction.request.rotating.visibilty.lookAt
-import com.lambda.module.modules.client.Baritone
 import com.lambda.threading.runGameScheduled
 import com.lambda.threading.runSafe
 import com.lambda.util.extension.partialTicks
@@ -158,7 +158,7 @@ object RotationManager : RequestHandler<RotationRequest>(
 
     @JvmStatic
     fun handleBaritoneRotation(yaw: Float, pitch: Float) {
-        lookAt(Rotation(yaw, pitch)).requestBy(Baritone.rotation)
+        lookAt(Rotation(yaw, pitch)).requestBy(BaritoneManager.rotation)
     }
 
     @JvmStatic

src/main/kotlin/com/lambda/interaction/request/rotating/RotationManager.kt

@@ -15,22 +15,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.module.modules.client
+package com.lambda.module.hud
 
-import com.lambda.config.groups.RotationSettings
-import com.lambda.module.Module
+import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.NamedEnum
 
-object Baritone : Module(
+object Baritone : HudModule(
     name = "Baritone",
-    description = "Baritone configuration",
-    tag = ModuleTag.CLIENT,
+    description = "Look inside of Baritones head",
+    tag = ModuleTag.HUD,
 ) {
-    private enum class Group(override val displayName: String) : NamedEnum {
-        GENERAL("General"),
-        ROTATION("Rotation")
-    }
+    override fun ImGuiBuilder.buildLayout() {
 
-    val rotation = RotationSettings(this, Group.ROTATION)
+    }
 }

…lambda/module/modules/client/Baritone.kt …kotlin/com/lambda/module/hud/Baritone.ktsrc/main/kotlin/com/lambda/module/modules/client/Baritone.kt renamed to src/main/kotlin/com/lambda/module/hud/Baritone.kt src/main/kotlin/com/lambda/module/modules/client/Baritone.kt renamed to src/main/kotlin/com/lambda/module/hud/Baritone.kt

@@ -21,6 +21,7 @@ import com.lambda.config.groups.BuildSettings
 import com.lambda.config.groups.InteractionSettings
 import com.lambda.config.groups.InventorySettings
 import com.lambda.config.groups.RotationSettings
+import com.lambda.interaction.BaritoneManager
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.emptyStructure
 import com.lambda.interaction.construction.blueprint.PropagatingBlueprint.Companion.propagatingBlueprint
 import com.lambda.interaction.construction.verify.TargetState
@@ -29,7 +30,6 @@ import com.lambda.module.tag.ModuleTag
 import com.lambda.task.RootTask.run
 import com.lambda.task.Task
 import com.lambda.task.tasks.BuildTask.Companion.build
-import com.lambda.util.BaritoneUtils
 import com.lambda.util.Communication.info
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
@@ -113,7 +113,7 @@ object HighwayTools : Module(
             runningTask?.cancel()
             runningTask = null
             distanceMoved = 0
-            BaritoneUtils.cancel()
+            BaritoneManager.cancel()
         }
     }
 

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

@@ -17,6 +17,7 @@
 
 package com.lambda.module.modules.player
 
+import com.lambda.interaction.BaritoneManager
 import com.lambda.interaction.construction.blueprint.TickingBlueprint.Companion.tickingBlueprint
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.module.Module
@@ -25,7 +26,6 @@ import com.lambda.module.tag.ModuleTag
 import com.lambda.task.RootTask.run
 import com.lambda.task.Task
 import com.lambda.task.tasks.BuildTask.Companion.build
-import com.lambda.util.BaritoneUtils
 import com.lambda.util.BlockUtils.blockPos
 import com.lambda.util.BlockUtils.blockState
 import net.minecraft.util.math.BlockPos
@@ -56,7 +56,7 @@ object Nuker : Module(
                     .filter { !instantOnly || blockState(it).getHardness(world, it) <= TaskFlowModule.build.breaking.breakThreshold }
                     .filter { pos ->
                         if (!baritoneSelection) true
-                        else BaritoneUtils.primary.selectionManager.selections.any {
+                        else BaritoneManager.primary.selectionManager.selections.any {
                             val min = it.min()
                             val max = it.max()
                             pos.x >= min.x && pos.x <= max.x

src/main/kotlin/com/lambda/module/modules/player/Nuker.kt

@@ -18,6 +18,7 @@
 package com.lambda.module.modules.player
 
 import com.lambda.event.events.onStaticRender
+import com.lambda.interaction.BaritoneManager
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
 import com.lambda.interaction.construction.verify.TargetState
@@ -26,7 +27,6 @@ import com.lambda.module.tag.ModuleTag
 import com.lambda.task.RootTask.run
 import com.lambda.task.Task
 import com.lambda.task.tasks.BuildTask.Companion.build
-import com.lambda.util.BaritoneUtils
 import net.minecraft.util.math.BlockBox
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
@@ -62,7 +62,7 @@ object WorldEater : Module(
             runningTask?.cancel()
             runningTask = null
             work.clear()
-            BaritoneUtils.cancel()
+            BaritoneManager.cancel()
         }
 
         onStaticRender { it.outline(Box.enclosing(pos1, pos2), Color.BLUE) }

src/main/kotlin/com/lambda/module/modules/player/WorldEater.kt

@@ -24,6 +24,7 @@ import com.lambda.config.groups.InteractionConfig
 import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.interaction.BaritoneManager
 import com.lambda.interaction.construction.blueprint.Blueprint
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.blueprint.PropagatingBlueprint
@@ -50,7 +51,6 @@ import com.lambda.interaction.request.placing.PlaceRequest
 import com.lambda.interaction.request.rotating.RotationConfig
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.task.Task
-import com.lambda.util.BaritoneUtils
 import com.lambda.util.Formatting.string
 import com.lambda.util.extension.Structure
 import com.lambda.util.extension.inventorySlots
@@ -128,11 +128,11 @@ class BuildTask @Ta5kBuilder constructor(
                     if (!build.pathing) return@listen
                     val sim = blueprint.simulation(interactionConfig, rotation, inventory, build)
                     val goal = BuildGoal(sim, player.blockPos)
-                    BaritoneUtils.setGoalAndPath(goal)
+                    BaritoneManager.setGoalAndPath(goal)
                 }
 
                 is Navigable -> {
-                    if (build.pathing) BaritoneUtils.setGoalAndPath(bestResult.goal)
+                    if (build.pathing) BaritoneManager.setGoalAndPath(bestResult.goal)
                 }
 
                 is BuildResult.Contextual -> {
@@ -200,7 +200,7 @@ class BuildTask @Ta5kBuilder constructor(
 
                 if (!world.entities.contains(itemDrop)) {
                     dropsToCollect.remove(itemDrop)
-                    BaritoneUtils.cancel()
+                    BaritoneManager.cancel()
                     return@let true
                 }
 
@@ -218,7 +218,7 @@ class BuildTask @Ta5kBuilder constructor(
                     return@let true
                 }
 
-                BaritoneUtils.setGoalAndPath(GoalBlock(itemDrop.blockPos))
+                BaritoneManager.setGoalAndPath(GoalBlock(itemDrop.blockPos))
                 return@let true
             } ?: false