Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

38 changes: 0 additions & 38 deletions src/main/java/com/lambda/mixin/baritone/ComeCommandMixin.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ package com.lambda.interaction.handler.handlers
import baritone.api.BaritoneAPI
import baritone.api.IBaritone
import baritone.api.Settings
import baritone.api.command.ICommand
import baritone.api.command.argument.IArgConsumer
import baritone.api.pathing.goals.Goal
import baritone.api.pathing.goals.GoalBlock
import baritone.api.utils.input.Input
import com.lambda.Lambda.mc
import com.lambda.config.Config
import com.lambda.config.ConfigBlock
import com.lambda.config.Group
Expand All @@ -30,9 +35,11 @@ import com.lambda.config.blocks.RotationSettings
import com.lambda.config.categories.LambdaCategory
import com.lambda.config.entries.onValueChange
import com.lambda.context.Automated
import com.lambda.module.modules.render.Freecam
import com.lambda.util.BlockUtils.blockPos
import net.minecraft.util.BlockMirror
import net.minecraft.util.BlockRotation
import java.util.stream.Stream

@Suppress("unused")
object BaritoneHandler : Config(
Expand All @@ -59,12 +66,26 @@ object BaritoneHandler : Config(
@JvmStatic
val primary: IBaritone? = baritone?.primaryBaritone

init {
val commands = primary?.commandManager
commands?.getCommand("come")?.let { come ->
commands.registry.unregister(come)
commands.registry.register(FreecamComeCommand(come))
}
}

/**
* Whether Baritone is currently pathing
*/
val isPathing: Boolean
get() = baritoneAvailable && primary?.pathingBehavior?.isPathing == true

/**
* Whether Baritone is breaking a block
*/
val isBreaking: Boolean
get() = baritoneAvailable && primary?.inputOverrideHandler?.isInputForcedDown(Input.CLICK_LEFT) == true

/**
* Whether Baritone is active (pathing, calculating goal, etc.)
*/
Expand Down Expand Up @@ -105,6 +126,29 @@ object BaritoneHandler : Config(
primary?.elytraProcess?.resetState()
}

/**
* Baritone's own #come, heading to the Freecam camera instead while Freecam is on
*/
private class FreecamComeCommand(private val come: ICommand) : ICommand {
override fun execute(label: String, args: IArgConsumer) {
if (Freecam.isEnabled) {
args.requireMax(0)
setGoalAndPath(GoalBlock(mc.gameRenderer.camera.blockPos))
logDirect("Coming")
} else {
come.execute(label, args)
}
}

override fun tabComplete(label: String, args: IArgConsumer): Stream<String> = come.tabComplete(label, args)

override fun getShortDesc(): String = come.shortDesc

override fun getLongDesc(): List<String> = come.longDesc

override fun getNames(): List<String> = come.names
}

class BaritoneConfigSettings(
override val c: Config,
private val bSettings: Settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import com.lambda.event.events.PlayerEvent
import com.lambda.event.events.TickEvent
import com.lambda.event.listener.SafeListener.Companion.listen
import com.lambda.interaction.construction.simulation.context.BuildContext
import com.lambda.interaction.handler.handlers.BaritoneHandler
import com.lambda.interaction.manager.managers.breaking.breakRequest
import com.lambda.module.Module
import com.lambda.module.ModuleTag
Expand Down Expand Up @@ -82,7 +83,10 @@ object FastBreak : Module(
hotbarConfig::tickStageMask.editSetting { defaultValue(mutableSetOf(TickEvent.Input.Post)); hide() }
}

listen<PlayerEvent.Attack.Block> { it.cancel() }
listen<PlayerEvent.Attack.Block> { event ->
event.cancel()
if (BaritoneHandler.isBreaking) interaction.updateBlockBreakingProgress(event.pos, event.side)
}
listen<PlayerEvent.Breaking.Update> { event ->
event.cancel()
withSafeAutomated {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import com.lambda.interaction.construction.simulation.context.BuildContext
import com.lambda.interaction.construction.simulation.result.results.BreakResult
import com.lambda.interaction.construction.simulation.sim
import com.lambda.interaction.construction.verify.TargetState
import com.lambda.interaction.handler.handlers.BaritoneHandler
import com.lambda.interaction.manager.managers.breaking.breakRequest
import com.lambda.module.Module
import com.lambda.module.ModuleTag
Expand Down Expand Up @@ -136,7 +137,10 @@ object PacketMine : Module(
attackedThisTick = false
}

listen<PlayerEvent.Attack.Block> { it.cancel() }
listen<PlayerEvent.Attack.Block> { event ->
event.cancel()
if (BaritoneHandler.isBreaking) interaction.updateBlockBreakingProgress(event.pos, event.side)
}
listen<PlayerEvent.Breaking.Update> { event ->
event.cancel()
if (player.mainHandStack.item in ignoreWhenHolding) return@listen
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/lambda.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
"client": [
"CrashReportMixin",
"MinecraftClientMixin",
"baritone.BaritonePlayerControllerMixin",
"baritone.ComeCommandMixin",
"client.sound.SoundSystemMixin",
"entity.ClientPlayerEntityMixin",
"entity.ClientPlayInteractionManagerMixin",
Expand Down