Skip to content

Commit b9ce554

Browse files
committed
draw setting in modules
1 parent 60b57a4 commit b9ce554

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

src/main/kotlin/com/lambda/gui/components/SettingsWidget.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ object SettingsWidget {
3939
if (config is Module) {
4040
with(config.keybindSetting) { buildLayout() }
4141
with(config.disableOnReleaseSetting) { buildLayout() }
42+
with(config.drawSetting) { buildLayout() }
4243
}
4344
smallButton("Reset") {
4445
config.settings.forEach { it.reset(silent = true) }
@@ -75,7 +76,7 @@ object SettingsWidget {
7576
}
7677
val toIgnoreSettings =
7778
when (config) {
78-
is Module -> setOf(config.keybindSetting, config.disableOnReleaseSetting)
79+
is Module -> setOf(config.keybindSetting, config.disableOnReleaseSetting, config.drawSetting)
7980
is UserAutomationConfig -> setOf(config.linkedModules)
8081
else -> emptySet()
8182
}

src/main/kotlin/com/lambda/module/Module.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ abstract class Module(
124124
private val isEnabledSetting = setting("Enabled", enabledByDefault) { false }
125125
val keybindSetting = setting("Keybind", defaultKeybind) { false }
126126
val disableOnReleaseSetting = setting("Disable On Release", false) { false }
127-
128-
open val isVisible: Boolean = true
127+
val drawSetting = setting("Draw", true, "Draws the module in the module list hud element")
129128

130129
var isEnabled by isEnabledSetting
131130
val isDisabled get() = !isEnabled
132131

133132
val keybind by keybindSetting
134133
val disableOnRelease by disableOnReleaseSetting
134+
val draw by drawSetting
135135

136136
override val isMuted: Boolean
137137
get() = !isEnabled && !alwaysListening

src/main/kotlin/com/lambda/module/hud/ModuleList.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,19 @@ import com.lambda.gui.dsl.ImGuiBuilder
2121
import com.lambda.module.HudModule
2222
import com.lambda.module.ModuleRegistry
2323
import com.lambda.module.tag.ModuleTag
24-
import com.lambda.util.KeyCode
2524
import imgui.flag.ImGuiCol
2625
import java.awt.Color
2726

2827
object ModuleList : HudModule(
2928
name = "ModuleList",
3029
tag = ModuleTag.HUD,
3130
) {
32-
override val isVisible: Boolean
33-
get() = false
31+
init {
32+
drawSetting.value = false
33+
}
3434

3535
override fun ImGuiBuilder.buildLayout() {
36-
val enabled = ModuleRegistry.modules
37-
.filter { it.isEnabled }
38-
.filter { it.isVisible }
36+
val enabled = ModuleRegistry.modules.filter { it.isEnabled && it.draw }
3937

4038
enabled.forEach {
4139
text(it.name); sameLine()

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package com.lambda.module.modules.player
1919

2020
import com.lambda.config.AutomationConfig.Companion.setDefaultAutomationConfig
21-
import com.lambda.config.applyEdits
2221
import com.lambda.interaction.BaritoneManager
2322
import com.lambda.interaction.construction.blueprint.Blueprint.Companion.emptyStructure
2423
import com.lambda.interaction.construction.blueprint.PropagatingBlueprint.Companion.propagatingBlueprint
@@ -89,11 +88,7 @@ object HighwayTools : Module(
8988
}
9089

9190
init {
92-
setDefaultAutomationConfig {
93-
applyEdits {
94-
hideGroup(interactConfig)
95-
}
96-
}
91+
setDefaultAutomationConfig()
9792

9893
onEnable {
9994
octant = player.octant

0 commit comments

Comments
 (0)