swap mode option in hotbar config. Temporary and permanent

Author: beanbag44

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

@@ -60,7 +60,7 @@ open class BreakSettings(
     override val tickStageMask by c.setting("Break Stage Mask", setOf(TickEvent.Input.Post), ALL_STAGES.toSet(), 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()
+    override val swapMode by c.setting("Break Swap Mode", BreakConfig.SwapMode.End, "Decides when to swap to the best suited tool when breaking a block").group(baseGroup, Group.General).index()
 
     // Swing
     override val swing by c.setting("Swing Mode", SwingMode.Constant, "The times at which to swing the players hand").group(baseGroup, Group.General).index()

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

@@ -28,7 +28,8 @@ class HotbarSettings(
     c: Configurable,
     baseGroup: NamedEnum
 ) : SettingGroup(c), HotbarConfig {
-    override val keepTicks by c.setting("Keep Ticks", 1, 0..20, 1, "The number of ticks to keep the current hotbar selection active", " ticks").group(baseGroup).index()
+    override val swapMode by c.setting("Swap Mode", HotbarConfig.SwapMode.Temporary).group(baseGroup).index()
+    override val keepTicks by c.setting("Keep Ticks", 1, 0..20, 1, "The number of ticks to keep the current hotbar selection active", " ticks") { swapMode == HotbarConfig.SwapMode.Temporary }.group(baseGroup).index()
     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()

src/main/kotlin/com/lambda/interaction/managers/hotbar/HotbarConfig.kt

@@ -26,6 +26,7 @@ import com.lambda.event.events.TickEvent
  * @param priority The priority of this configuration.
  */
 interface HotbarConfig : ISettingGroup {
+    val swapMode: SwapMode
     /**
      * The number of ticks to keep the current hotbar selection active.
      */
@@ -54,4 +55,9 @@ interface HotbarConfig : ISettingGroup {
      * The sub-tick timings at which hotbar actions can be performed
      */
     val tickStageMask: Collection<TickEvent>
+
+    enum class SwapMode {
+        Temporary,
+        Permanent
+    }
 }

src/main/kotlin/com/lambda/interaction/managers/hotbar/HotbarManager.kt

@@ -25,9 +25,10 @@ import com.lambda.event.events.TickEvent
 import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.managers.Logger
+import com.lambda.interaction.managers.Manager
 import com.lambda.interaction.managers.ManagerUtils.newStage
 import com.lambda.interaction.managers.ManagerUtils.newTick
-import com.lambda.interaction.managers.Manager
+import com.lambda.interaction.managers.hotbar.HotbarConfig.SwapMode
 import com.lambda.interaction.managers.hotbar.HotbarManager.activeRequest
 import com.lambda.interaction.managers.hotbar.HotbarManager.activeSlot
 import com.lambda.interaction.managers.hotbar.HotbarManager.checkResetSwap
@@ -148,6 +149,8 @@ object HotbarManager : Manager<HotbarRequest>(
             } else activeRequest.swapPauseAge = swappedTicks
             if (activeRequest.slot == activeSlot) return true
             activeSlot = activeRequest.slot
+            if (activeRequest.hotbarConfig.swapMode == SwapMode.Permanent)
+                player.inventory.selectedSlot = activeRequest.slot
             interaction.syncSelectedSlot()
         }
         return true
@@ -162,14 +165,21 @@ object HotbarManager : Manager<HotbarRequest>(
      */
     private fun SafeContext.checkResetSwap() {
         activeRequest?.let { active ->
-            val canStopSwap = swapsThisTick < maxSwapsThisTick
-            if (active.keepTicks <= 0 && tickStage in active.hotbarConfig.tickStageMask && canStopSwap) {
-                logger.debug("Clearing request and syncing slot", activeRequest)
-                val prevSlot = activeSlot
-                activeRequest = null
-                activeSlot = -1
-                interaction.syncSelectedSlot()
-                if (serverSlot != prevSlot) swapsThisTick++
+            if (active.keepTicks <= 0) {
+                if (active.hotbarConfig.swapMode == SwapMode.Permanent) {
+                    activeRequest = null
+                    activeSlot = -1
+                    return
+                }
+                val canStopSwap = swapsThisTick < maxSwapsThisTick
+                if (tickStage in active.hotbarConfig.tickStageMask && canStopSwap) {
+                    logger.debug("Clearing request and syncing slot", activeRequest)
+                    val prevSlot = activeSlot
+                    activeRequest = null
+                    activeSlot = -1
+                    interaction.syncSelectedSlot()
+                    if (serverSlot != prevSlot) swapsThisTick++
+                }
             }
         }
     }