open all managers on all tick stages by default with a blacklist. Also fix tick stage settings

beanbag44 · beanbag44 · commit 342b9da8a9cf · 2025-11-30T23:51:16.000Z
diff --git a/src/main/kotlin/com/lambda/config/Configurable.kt b/src/main/kotlin/com/lambda/config/Configurable.kt
@@ -25,7 +25,7 @@ import com.lambda.config.settings.CharSetting
 import com.lambda.config.settings.FunctionSetting
 import com.lambda.config.settings.StringSetting
 import com.lambda.config.settings.collections.BlockCollectionSetting
-import com.lambda.config.settings.collections.CollectionSettings
+import com.lambda.config.settings.collections.CollectionSetting
 import com.lambda.config.settings.collections.ItemCollectionSetting
 import com.lambda.config.settings.collections.MapSetting
 import com.lambda.config.settings.comparable.BooleanSetting
@@ -160,7 +160,7 @@ abstract class Configurable(
         defaultValue: Collection<T> = immutableList,
         description: String = "",
         noinline visibility: () -> Boolean = { true },
-    ) = CollectionSettings(
+    ) = CollectionSetting(
         name,
         immutableList,
         defaultValue.toMutableList(),
diff --git a/src/main/kotlin/com/lambda/config/groups/BreakSettings.kt b/src/main/kotlin/com/lambda/config/groups/BreakSettings.kt
@@ -20,6 +20,7 @@ package com.lambda.config.groups
 import com.lambda.config.Configurable
 import com.lambda.config.SettingGroup
 import com.lambda.event.events.TickEvent
+import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.interaction.request.breaking.BreakConfig
 import com.lambda.interaction.request.breaking.BreakConfig.AnimationMode
 import com.lambda.interaction.request.breaking.BreakConfig.BreakConfirmationMode
@@ -56,7 +57,7 @@ open class BreakSettings(
     override val breakDelay by c.setting("Break Delay", 0, 0..6, 1, "The delay between breaking blocks", " tick(s)").group(baseGroup, Group.General).index()
 
     // Timing
-    override val tickStageMask by c.setting("Break Stage Mask", setOf<TickEvent>(TickEvent.Input.Post), description = "The sub-tick timing at which break actions can be performed").group(baseGroup, Group.General).index()
+    override val tickStageMask by c.setting("Break Stage Mask", ALL_STAGES.toSet(), setOf(TickEvent.Input.Post), description = "The sub-tick timing at which break actions can be performed").group(baseGroup, Group.General).index()
 
     // Swap
     override val swapMode by c.setting("Swap Mode", BreakConfig.SwapMode.End, "Decides when to swap to the best suited tool when breaking a block").group(baseGroup, Group.General).index()
diff --git a/src/main/kotlin/com/lambda/config/groups/HotbarSettings.kt b/src/main/kotlin/com/lambda/config/groups/HotbarSettings.kt
@@ -20,6 +20,7 @@ package com.lambda.config.groups
 import com.lambda.config.Configurable
 import com.lambda.config.SettingGroup
 import com.lambda.event.events.TickEvent
+import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.interaction.request.hotbar.HotbarConfig
 import com.lambda.util.NamedEnum
 
@@ -31,5 +32,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>(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", ALL_STAGES.toSet(), setOf(TickEvent.Input.Post), description = "The sub-tick timing at which hotbar actions are performed").group(baseGroup).index()
 }
diff --git a/src/main/kotlin/com/lambda/config/groups/InteractSettings.kt b/src/main/kotlin/com/lambda/config/groups/InteractSettings.kt
@@ -20,6 +20,7 @@ package com.lambda.config.groups
 import com.lambda.config.Configurable
 import com.lambda.config.SettingGroup
 import com.lambda.event.events.TickEvent
+import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.interaction.request.interacting.InteractConfig
 import com.lambda.util.NamedEnum
 
@@ -30,7 +31,7 @@ class InteractSettings(
     override val rotate by c.setting("Rotate For Interact", true, "Rotates the player to look at the block when interacting").group(baseGroup).index()
     override val sorter by c.setting("Interact Sorter", ActionConfig.SortMode.Tool, "The order in which interactions are performed").group(baseGroup).index()
     override val swingHand by c.setting("Swing On Interact", true, "Swings the players hand after interacting").group(baseGroup).index()
-    override val tickStageMask by c.setting("Interact Stage Mask", setOf<TickEvent>(TickEvent.Input.Post), description = "The sub-tick timing at which interact actions are performed").group(baseGroup).index()
+    override val tickStageMask by c.setting("Interact Stage Mask", ALL_STAGES.toSet(), setOf(TickEvent.Input.Post), description = "The sub-tick timing at which interact actions are performed").group(baseGroup).index()
     override val interactSwingType by c.setting("Interact Swing Type", BuildConfig.SwingType.Vanilla, "The style of swing") { swingHand }.group(baseGroup).index()
     override val interactConfirmationMode by c.setting("Interact Confirmation Mode", InteractConfig.InteractConfirmationMode.InteractThenAwait, "The style of confirmation for interactions").group(baseGroup).index()
 }
diff --git a/src/main/kotlin/com/lambda/config/groups/InventorySettings.kt b/src/main/kotlin/com/lambda/config/groups/InventorySettings.kt
@@ -19,7 +19,7 @@ package com.lambda.config.groups
 
 import com.lambda.config.Configurable
 import com.lambda.config.SettingGroup
-import com.lambda.event.events.TickEvent
+import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.interaction.request.inventory.InventoryConfig
 import com.lambda.util.NamedEnum
 import com.lambda.util.item.ItemUtils
@@ -35,7 +35,7 @@ class InventorySettings(
     }
 
     override val actionsPerSecond by c.setting("Actions Per Second", 100, 0..100, 1, "How many inventory actions can be performed per tick").group(baseGroup, Group.General).index()
-    override val tickStageMask by c.setting("Inventory Stage Mask", setOf(TickEvent.Pre, TickEvent.Input.Pre, TickEvent.Input.Post, TickEvent.Player.Post), description = "The sub-tick timing at which inventory actions are performed").group(baseGroup, Group.General).index()
+    override val tickStageMask by c.setting("Inventory Stage Mask", ALL_STAGES.toSet(), description = "The sub-tick timing at which inventory actions are performed").group(baseGroup, Group.General).index()
     override val disposables by c.setting("Disposables", ItemUtils.defaultDisposables, description = "Items that will be ignored when checking for a free slot").group(baseGroup, Group.Container).index()
     override val swapWithDisposables by c.setting("Swap With Disposables", true, "Swap items with disposable ones").group(baseGroup, Group.Container).index()
     override val providerPriority by c.setting("Provider Priority", InventoryConfig.Priority.WithMinItems, "What container to prefer when retrieving the item from").group(baseGroup, Group.Container).index()
diff --git a/src/main/kotlin/com/lambda/config/groups/PlaceSettings.kt b/src/main/kotlin/com/lambda/config/groups/PlaceSettings.kt
@@ -20,6 +20,7 @@ package com.lambda.config.groups
 import com.lambda.config.Configurable
 import com.lambda.config.SettingGroup
 import com.lambda.event.events.TickEvent
+import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.interaction.request.placing.PlaceConfig
 import com.lambda.interaction.request.placing.PlaceConfig.AirPlaceMode
 import com.lambda.interaction.request.placing.PlaceConfig.PlaceConfirmationMode
@@ -33,7 +34,7 @@ class PlaceSettings(
     override val airPlace by c.setting("Air Place", AirPlaceMode.None, "Allows for placing blocks without adjacent faces").group(baseGroup).index()
     override val axisRotateSetting by c.setting("Axis Rotate", true, "Overrides the Rotate For Place setting and rotates the player on each axis to air place rotational blocks") { airPlace.isEnabled }.group(baseGroup).index()
     override val sorter by c.setting("Place Sorter", ActionConfig.SortMode.Tool, "The order in which placements are performed").group(baseGroup).index()
-    override val tickStageMask by c.setting("Place Stage mask", setOf<TickEvent>(TickEvent.Input.Post), description = "The sub-tick timing at which place actions are performed").group(baseGroup).index()
+    override val tickStageMask by c.setting("Place Stage mask", ALL_STAGES.toSet(), setOf(TickEvent.Input.Post),  description = "The sub-tick timing at which place actions are performed").group(baseGroup).index()
     override val placeConfirmationMode by c.setting("Place Confirmation", PlaceConfirmationMode.PlaceThenAwait, "Wait for block placement confirmation").group(baseGroup).index()
     override val maxPendingPlacements by c.setting("Max Pending Placements", 5, 0..30, 1, "The maximum amount of pending placements").group(baseGroup).index()
     override val placementsPerTick by c.setting("Places Per Tick", 1, 1..30, 1, "Maximum instant block places per tick").group(baseGroup).index()
diff --git a/src/main/kotlin/com/lambda/config/groups/RotationSettings.kt b/src/main/kotlin/com/lambda/config/groups/RotationSettings.kt
@@ -19,6 +19,7 @@ package com.lambda.config.groups
 
 import com.lambda.config.Configurable
 import com.lambda.config.SettingGroup
+import com.lambda.event.events.TickEvent
 import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.interaction.request.rotating.RotationConfig
 import com.lambda.interaction.request.rotating.RotationMode
@@ -42,7 +43,7 @@ class RotationSettings(
     /** How many ticks to wait before resetting the rotation */
     override val decayTicks by c.setting("Reset Rotation", 1, 1..10, 1, "Ticks before rotation is reset", " ticks") { rotate }.group(baseGroup).index()
 
-    override val tickStageMask = ALL_STAGES.toSet()
+    override val tickStageMask = ALL_STAGES.subList(0, ALL_STAGES.indexOf(TickEvent.Player.Post)).toSet()
 
     /** Whether the rotation is instant */
     var instant by c.setting("Instant Rotation", true, "Instantly rotate") { rotate }.group(baseGroup).index()
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/BlockCollectionSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/BlockCollectionSetting.kt
@@ -29,7 +29,7 @@ class BlockCollectionSetting(
 	defaultValue: MutableCollection<Block>,
 	description: String,
 	visibility: () -> Boolean,
-) : CollectionSettings<Block>(
+) : CollectionSetting<Block>(
 	name,
 	immutableCollection,
 	defaultValue,
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/CollectionSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/CollectionSetting.kt
@@ -30,7 +30,7 @@ import java.lang.reflect.Type
 /**
  * @see [com.lambda.config.Configurable]
  */
-open class CollectionSettings<T : Any>(
+open class CollectionSetting<T : Any>(
     override var name: String,
     private var immutableCollection: Collection<T>,
     defaultValue: MutableCollection<T>,
@@ -82,7 +82,7 @@ open class CollectionSettings<T : Any>(
         @SettingEditorDsl
         @Suppress("unchecked_cast")
         fun <T : Any> SettingGroupEditor.TypedEditBuilder<Collection<T>>.immutableCollection(collection: Collection<T>) {
-            (settings as Collection<CollectionSettings<T>>).forEach { it.immutableCollection = collection }
+            (settings as Collection<CollectionSetting<T>>).forEach { it.immutableCollection = collection }
         }
     }
 }
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/EventCollectionSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/EventCollectionSetting.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.config.settings.collections
+
+import net.minecraft.item.Item
+
+class EventCollectionSetting<T : Any>(
+	override var name: String,
+	private val immutableSet: Set<T>,
+	defaultValue: MutableSet<T>,
+	description: String,
+	visibility: () -> Boolean
+) : CollectionSetting<T>(
+	name,
+	immutableSet,
+	defaultValue,
+	Item::class.java,
+	description,
+	visibility,
+) {
+
+}
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/ItemCollectionSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/ItemCollectionSetting.kt
@@ -29,7 +29,7 @@ class ItemCollectionSetting(
 	defaultValue: MutableCollection<Item>,
 	description: String,
 	visibility: () -> Boolean,
-) : CollectionSettings<Item>(
+) : CollectionSetting<Item>(
 	name,
 	immutableCollection,
 	defaultValue,
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt
diff --git a/src/main/kotlin/com/lambda/interaction/request/RequestHandler.kt b/src/main/kotlin/com/lambda/interaction/request/RequestHandler.kt
@@ -35,10 +35,12 @@ import kotlin.reflect.KClass
  */
 abstract class RequestHandler<R : Request>(
     val stagePriority: Int,
-    private vararg val openStages: Event,
+    vararg val blacklistedStages: TickEvent,
     private val onOpen: (SafeContext.() -> Unit)? = null,
     private val onClose: (SafeContext.() -> Unit)? = null
 ) : Loadable {
+	val openStages: List<TickEvent> = ALL_STAGES.filter { it !in blacklistedStages }
+
     /**
      * Represents if the handler is accepting requests at any given time
      */
diff --git a/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt b/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt
@@ -112,10 +112,6 @@ import kotlin.math.min
  */
 object BreakManager : RequestHandler<BreakRequest>(
     0,
-    TickEvent.Pre,
-    TickEvent.Input.Pre,
-    TickEvent.Input.Post,
-    TickEvent.Player.Post,
     onOpen = {
         if (activeInfos.isNotEmpty() || breaks.isNotEmpty())
             BreakManager.logger.newStage(BreakManager.tickStage)
diff --git a/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt b/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt
@@ -47,10 +47,6 @@ import net.minecraft.item.ItemStack
  */
 object HotbarManager : RequestHandler<HotbarRequest>(
     1,
-    TickEvent.Pre,
-    TickEvent.Input.Pre,
-    TickEvent.Input.Post,
-    TickEvent.Player.Post,
     onOpen = {
         if (activeRequest != null) {
             setActiveSlot()
diff --git a/src/main/kotlin/com/lambda/interaction/request/interacting/InteractionManager.kt b/src/main/kotlin/com/lambda/interaction/request/interacting/InteractionManager.kt
@@ -54,10 +54,6 @@ import net.minecraft.util.Hand
  */
 object InteractionManager : RequestHandler<InteractRequest>(
     0,
-    TickEvent.Pre,
-    TickEvent.Input.Pre,
-    TickEvent.Input.Post,
-    TickEvent.Player.Post,
     onOpen = {
         if (potentialInteractions.isNotEmpty())
             InteractionManager.logger.newStage(InteractionManager.tickStage)
diff --git a/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryManager.kt b/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryManager.kt
@@ -52,10 +52,6 @@ import net.minecraft.screen.slot.Slot
  */
 object InventoryManager : RequestHandler<InventoryRequest>(
     1,
-    TickEvent.Pre,
-    TickEvent.Input.Pre,
-    TickEvent.Input.Post,
-    TickEvent.Player.Post,
     onOpen = { processActiveRequest() }
 ), Logger {
     private var activeRequest: InventoryRequest? = null
diff --git a/src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt b/src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt
@@ -71,10 +71,6 @@ import kotlin.math.min
 
 object PlaceManager : RequestHandler<PlaceRequest>(
     0,
-    TickEvent.Pre,
-    TickEvent.Input.Pre,
-    TickEvent.Input.Post,
-    TickEvent.Player.Post,
     onOpen = {
         if (potentialPlacements.isNotEmpty())
             PlaceManager.logger.newStage(PlaceManager.tickStage)
diff --git a/src/main/kotlin/com/lambda/interaction/request/rotating/RotationConfig.kt b/src/main/kotlin/com/lambda/interaction/request/rotating/RotationConfig.kt
@@ -20,7 +20,6 @@ package com.lambda.interaction.request.rotating
 import com.lambda.config.AbstractSetting
 import com.lambda.config.ISettingGroup
 import com.lambda.event.events.TickEvent
-import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 
 interface RotationConfig : ISettingGroup {
     /**
@@ -56,6 +55,6 @@ interface RotationConfig : ISettingGroup {
         override val keepTicks = 1
         override val decayTicks = 1
         override val turnSpeed = 360.0
-        override val tickStageMask = ALL_STAGES.toSet()
+        override val tickStageMask = RotationManager.openStages.toSet()
     }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/request/rotating/RotationManager.kt b/src/main/kotlin/com/lambda/interaction/request/rotating/RotationManager.kt
@@ -26,6 +26,7 @@ import com.lambda.event.events.PacketEvent
 import com.lambda.event.events.PlayerEvent
 import com.lambda.event.events.RenderEvent
 import com.lambda.event.events.TickEvent
+import com.lambda.event.events.TickEvent.Companion.ALL_STAGES
 import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
@@ -61,10 +62,7 @@ import kotlin.math.sin
  */
 object RotationManager : RequestHandler<RotationRequest>(
     1,
-    TickEvent.Pre,
-    TickEvent.Input.Pre,
-    TickEvent.Input.Post,
-    TickEvent.Player.Post,
+	*(ALL_STAGES.subList(ALL_STAGES.indexOf(TickEvent.Player.Post), ALL_STAGES.size - 1).toTypedArray()),
 ), Logger {
     var activeRotation = Rotation.ZERO
     var serverRotation = Rotation.ZERO
diff --git a/src/main/kotlin/com/lambda/module/modules/movement/BetterFirework.kt b/src/main/kotlin/com/lambda/module/modules/movement/BetterFirework.kt
@@ -33,7 +33,6 @@ import com.lambda.module.tag.ModuleTag
 import com.lambda.threading.runSafe
 import com.lambda.util.KeyCode
 import com.lambda.util.Mouse
-import com.lambda.util.NamedEnum
 import com.lambda.util.player.SlotUtils.hotbar
 import com.lambda.util.player.SlotUtils.hotbarAndStorage
 import net.minecraft.client.network.ClientPlayerEntity
@@ -49,20 +48,14 @@ object BetterFirework : Module(
     description = "Automatic takeoff with fireworks",
     tag = ModuleTag.MOVEMENT,
 ) {
-    private var activateButton by setting("Activate Key", Bind(0, 0, Mouse.Middle.ordinal), "Button to activate Firework").group(Group.General)
-    private var midFlightActivationKey by setting("Mid-Flight Activation Key", Bind(0, 0, KeyCode.Unbound.code), "Firework use key for mid flight activation").group(Group.General)
-    private var middleClickCancel by setting("Middle Click Cancel", false, description = "Cancel pick block action on middle mouse click") { activateButton.key != KeyCode.Unbound.code }.group(Group.General)
+    private var activateButton by setting("Activate Key", Bind(0, 0, Mouse.Middle.ordinal), "Button to activate Firework")
+    private var midFlightActivationKey by setting("Mid-Flight Activation Key", Bind(0, 0, KeyCode.Unbound.code), "Firework use key for mid flight activation")
+    private var middleClickCancel by setting("Middle Click Cancel", false, description = "Cancel pick block action on middle mouse click") { activateButton.key != KeyCode.Unbound.code }
     private var fireworkInteract by setting("Right Click Fly", true, "Automatically start flying when right clicking fireworks")
     private var fireworkInteractCancel by setting("Right Click Cancel", false, "Cancel block interactions while holding fireworks") { fireworkInteract }
 
-    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)
-
-    private enum class Group(override val displayName: String) : NamedEnum {
-        General("General"),
-        Hotbar("Hotbar"),
-        Inventory("Inventory")
-    }
+    private var clientSwing by setting("Swing", true, "Swing hand client side")
+    private var invUse by setting("Inventory", true, "Use fireworks from inventory") { activateButton.key != KeyCode.Unbound.code }
 
     private var takeoffState = TakeoffState.None
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import java.lang.reflect.Type`
`30`	`30`	`/**`
`31`	`31`	`* @see [com.lambda.config.Configurable]`
`32`	`32`	`*/`
`33`		`-open class CollectionSettings<T : Any>(`
	`33`	`+open class CollectionSetting<T : Any>(`
`34`	`34`	`override var name: String,`
`35`	`35`	`private var immutableCollection: Collection<T>,`
`36`	`36`	`defaultValue: MutableCollection<T>,`
`@@ -82,7 +82,7 @@ open class CollectionSettings<T : Any>(`
`82`	`82`	`@SettingEditorDsl`
`83`	`83`	`@Suppress("unchecked_cast")`
`84`	`84`	`fun <T : Any> SettingGroupEditor.TypedEditBuilder<Collection<T>>.immutableCollection(collection: Collection<T>) {`
`85`		`- (settings as Collection<CollectionSettings<T>>).forEach { it.immutableCollection = collection }`
	`85`	`+ (settings as Collection<CollectionSetting<T>>).forEach { it.immutableCollection = collection }`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`