Skip to content

Commit a1437b5

Browse files
committed
improve inventory tweak and kill aura settings
1 parent 56bfa75 commit a1437b5

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,19 @@
1717

1818
package com.lambda.module.modules.combat
1919

20-
import com.lambda.config.groups.BuildSettings
20+
import com.lambda.config.AutomationConfig.Companion.setDefaultAutomationConfig
21+
import com.lambda.config.applyEdits
2122
import com.lambda.config.groups.RotationSettings
2223
import com.lambda.config.groups.Targeting
2324
import com.lambda.context.SafeContext
2425
import com.lambda.event.events.PlayerPacketEvent
2526
import com.lambda.event.events.TickEvent
2627
import com.lambda.event.listener.SafeListener.Companion.listen
28+
import com.lambda.interaction.managers.rotating.RotationManager
29+
import com.lambda.interaction.managers.rotating.visibilty.lookAtEntity
2730
import com.lambda.interaction.material.StackSelection.Companion.selectStack
2831
import com.lambda.interaction.material.container.ContainerManager.transfer
2932
import com.lambda.interaction.material.container.containers.MainHandContainer
30-
import com.lambda.interaction.managers.rotating.RotationManager
31-
import com.lambda.interaction.managers.rotating.visibilty.lookAtEntity
3233
import com.lambda.module.Module
3334
import com.lambda.module.tag.ModuleTag
3435
import com.lambda.task.RootTask.run
@@ -49,7 +50,6 @@ object KillAura : Module(
4950
tag = ModuleTag.COMBAT,
5051
) {
5152
// Interact
52-
override val buildConfig = BuildSettings(this, Group.Build)
5353
private val swap by setting("Swap", true, "Swap to the item with the highest damage").group(Group.Build)
5454
private val attackMode by setting("Attack Mode", AttackMode.Cooldown).group(Group.Build)
5555
private val cooldownOffset by setting("Cooldown Offset", 0, -5..5, 1) { attackMode == AttackMode.Cooldown }.group(Group.Build)
@@ -89,6 +89,15 @@ object KillAura : Module(
8989
}
9090

9191
init {
92+
setDefaultAutomationConfig {
93+
applyEdits {
94+
hideAllGroupsExcept(buildConfig)
95+
buildConfig.apply {
96+
hide(::pathing, ::stayInRange, ::collectDrops, ::spleefEntities, ::maxPendingActions, ::actionTimeout, ::maxBuildDependencies)
97+
}
98+
}
99+
}
100+
92101
listen<PlayerPacketEvent.Pre>(Int.MIN_VALUE) { event ->
93102
prevY = lastY
94103
lastY = event.position.y

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
package com.lambda.module.modules.player
1919

20-
import com.lambda.config.groups.InventorySettings
20+
import com.lambda.config.AutomationConfig.Companion.setDefaultAutomationConfig
21+
import com.lambda.config.applyEdits
2122
import com.lambda.event.events.InventoryEvent
2223
import com.lambda.event.events.PlayerEvent
2324
import com.lambda.event.listener.SafeListener.Companion.listen
@@ -28,7 +29,6 @@ import com.lambda.task.Task
2829
import com.lambda.task.tasks.BuildTask.Companion.breakAndCollectBlock
2930
import com.lambda.task.tasks.OpenContainer
3031
import com.lambda.task.tasks.PlaceContainer
31-
import com.lambda.util.NamedEnum
3232
import com.lambda.util.item.ItemUtils.shulkerBoxes
3333
import net.minecraft.item.Items
3434
import net.minecraft.screen.ScreenHandler
@@ -39,20 +39,20 @@ object InventoryTweaks : Module(
3939
name = "InventoryTweaks",
4040
tag = ModuleTag.PLAYER,
4141
) {
42-
private enum class Group(override val displayName: String): NamedEnum {
43-
General("General"),
44-
Inventory("Inventory")
45-
}
46-
47-
private val instantShulker by setting("Instant Shulker", true, description = "Right-click shulker boxes in your inventory to instantly place them and open them.").group(Group.General)
48-
private val instantEChest by setting("Instant Ender-Chest", true, description = "Right-click ender chests in your inventory to instantly place them and open them.").group(Group.General)
49-
override val inventoryConfig = InventorySettings(this, Group.Inventory)
42+
private val instantShulker by setting("Instant Shulker", true, description = "Right-click shulker boxes in your inventory to instantly place them and open them.")
43+
private val instantEChest by setting("Instant Ender-Chest", true, description = "Right-click ender chests in your inventory to instantly place them and open them.")
5044
private var placedPos: BlockPos? = null
5145
private var placeAndOpen: Task<*>? = null
5246
private var lastBreak: Task<*>? = null
5347
private var lastOpenScreen: ScreenHandler? = null
5448

5549
init {
50+
setDefaultAutomationConfig {
51+
applyEdits {
52+
hideAllGroupsExcept(breakConfig, interactConfig, inventoryConfig, hotbarConfig)
53+
}
54+
}
55+
5656
listen<PlayerEvent.SlotClick> {
5757
if (it.action != SlotActionType.PICKUP || it.button != 1) return@listen
5858
val stack = it.screenHandler.getSlot(it.slot).stack

src/main/kotlin/com/lambda/task/tasks/PlaceContainer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import com.lambda.context.Automated
2121
import com.lambda.context.SafeContext
2222
import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
2323
import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
24+
import com.lambda.interaction.construction.simulation.BuildSimulator.simulate
2425
import com.lambda.interaction.construction.simulation.result.results.GenericResult
2526
import com.lambda.interaction.construction.simulation.result.results.InteractResult
26-
import com.lambda.interaction.construction.simulation.BuildSimulator.simulate
2727
import com.lambda.interaction.construction.verify.TargetState
2828
import com.lambda.interaction.managers.ManagerUtils
2929
import com.lambda.task.Task

0 commit comments

Comments
 (0)