Fixed merge fuckup

Author: emyfops

src/main/kotlin/com/lambda/config/groups/FormatterSettings.kt

@@ -18,6 +18,7 @@
 package com.lambda.config.groups
 
 import com.lambda.config.Configurable
+import com.lambda.config.SettingGroup
 import com.lambda.util.NamedEnum
 import com.lambda.util.math.Vec2d
 import net.minecraft.util.math.Vec2f
@@ -33,7 +34,7 @@ class FormatterSettings(
     owner: Configurable,
     vararg baseGroup: NamedEnum,
     vis: () -> Boolean = { true }
-) : FormatterConfig, SettingGroup(owner) {
+) : FormatterConfig, SettingGroup() {
     val localeEnum by owner.setting("Locale", FormatterConfig.Locales.US, "The regional formatting used for numbers", vis).group(*baseGroup)
     override val locale get() = localeEnum.locale
 

src/main/kotlin/com/lambda/config/groups/HotbarSettings.kt

@@ -31,5 +31,5 @@ class HotbarSettings(
     override val swapDelay by c.setting("Swap Delay", 0, 0..3, 1, "The number of ticks delay before allowing another hotbar selection swap", " ticks").group(baseGroup).index()
     override val swapsPerTick by c.setting("Swaps Per Tick", 3, 1..10, 1, "The number of hotbar selection swaps that can take place each tick") { swapDelay <= 0 }.group(baseGroup).index()
     override val swapPause by c.setting("Swap Pause", 0, 0..20, 1, "The delay in ticks to pause actions after switching to the slot", " ticks").group(baseGroup).index()
-    override val tickStageMask by c.setting("Hotbar Stage Mask", setOf(TickEvent.Input.Post), description = "The sub-tick timing at which hotbar actions are performed").group(baseGroup).index()
+    override val tickStageMask by c.setting("Hotbar Stage Mask", setOf<TickEvent>(TickEvent.Input.Post), description = "The sub-tick timing at which hotbar actions are performed").group(baseGroup).index()
 }

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

@@ -17,6 +17,7 @@
 
 package com.lambda.module.hud
 
+import com.lambda.config.AutomationConfig.Companion.DEFAULT.edit
 import com.lambda.config.groups.FormatterConfig
 import com.lambda.config.groups.FormatterSettings
 import com.lambda.gui.dsl.ImGuiBuilder

src/main/kotlin/com/lambda/module/modules/movement/BetterFirework.kt

@@ -17,6 +17,8 @@
 
 package com.lambda.module.modules.movement
 
+import com.lambda.config.AutomationConfig.Companion.DEFAULT.edit
+import com.lambda.config.AutomationConfig.Companion.DEFAULT.hideAll
 import com.lambda.config.groups.HotbarSettings
 import com.lambda.config.groups.InventorySettings
 import com.lambda.config.settings.collections.SetSetting.Companion.immutableSet
@@ -59,11 +61,13 @@ object BetterFirework : Module(
     private var clientSwing by setting("Swing", true, "Swing hand client side").group(Group.General)
     private var invUse by setting("Inventory", true, "Use fireworks from inventory") { activateButton.key != KeyCode.Unbound.code }.group(Group.General)
 
-    override val hotbarConfig = HotbarSettings(this, Group.Hotbar, vis = { false }).apply {
-        ::sequenceStageMask.edit { immutableSet(setOf(TickEvent.Pre)); defaultValue(mutableSetOf(TickEvent.Pre)) }
+    override val hotbarConfig = HotbarSettings(this, Group.Hotbar).apply {
+        hideAll(this)
+        ::tickStageMask.edit { immutableSet(setOf(TickEvent.Pre)); defaultValue(mutableSetOf(TickEvent.Pre)) }
     }
 
-    override val inventoryConfig = InventorySettings(this, Group.Inventory, vis = { false }).apply {
+    override val inventoryConfig = InventorySettings(this, Group.Inventory).apply {
+        hideAll(this)
         ::tickStageMask.edit { immutableSet(setOf(TickEvent.Pre)); defaultValue(mutableSetOf(TickEvent.Pre)) }
     }
 
@@ -219,7 +223,7 @@ object BetterFirework : Module(
         stack.bestItemMatch(player.hotbar)
             ?.let {
                 val request = HotbarRequest(player.hotbar.indexOf(it), this@BetterFirework, keepTicks = 0)
-                    .submit(queueIfClosed = false)
+                    .submit(queueIfMismatchedStage = false)
                 if (request.done) {
                     interaction.interactItem(player, Hand.MAIN_HAND)
                     sendSwing()
@@ -238,7 +242,7 @@ object BetterFirework : Module(
                     swap(swapSlotId, hotbarSlotToSwapWith)
                     action {
                         val request = HotbarRequest(hotbarSlotToSwapWith, this@BetterFirework, keepTicks = 0, nowOrNothing = true)
-                            .submit(queueIfClosed = false)
+                            .submit(queueIfMismatchedStage = false)
                         if (request.done) {
                             interaction.interactItem(player, Hand.MAIN_HAND)
                             sendSwing()