reBreakMode in packetmine rather than break config

Author: beanbag44

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

@@ -29,7 +29,7 @@ class BreakSettings(
     vis: () -> Boolean = { true }
 ) : BreakConfig(priority) {
     override val breakMode by c.setting("Break Mode", BreakMode.Packet) { vis() }
-    override val reBreak = ReBreakSettings(c, vis)
+    override val reBreak by c.setting("ReBreak", true, "Re-breaks blocks after they've been broken once", vis)
     override val unsafeCancels by c.setting("Unsafe Cancels", true, "Allows cancelling block breaking even if the server might continue breaking sever side, potentially causing unexpected state changes") { vis() }
     override val breakThreshold by c.setting("Break Threshold", 0.7f, 0.1f..1.0f, 0.02f, "The break amount at which the block is considered broken") { vis() }
     override val doubleBreak by c.setting("Double Break", true, "Allows breaking two blocks at once") { vis() }

common/src/main/kotlin/com/lambda/config/groups/ReBreakSettings.kt

@@ -18,7 +18,6 @@
 package com.lambda.interaction.request.breaking
 
 import com.lambda.config.groups.BuildConfig
-import com.lambda.config.groups.ReBreakSettings
 import com.lambda.event.Event
 import com.lambda.interaction.request.Priority
 import com.lambda.interaction.request.RequestConfig
@@ -28,7 +27,7 @@ abstract class BreakConfig(
     priority: Priority = 0
 ) : RequestConfig<BreakRequest>(priority) {
     abstract val breakMode: BreakMode
-    abstract val reBreak: ReBreakSettings
+    abstract val reBreak: Boolean
     abstract val unsafeCancels: Boolean
     abstract val breakThreshold: Float
     abstract val doubleBreak: Boolean

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakConfig.kt

@@ -63,7 +63,7 @@ object ReBreakManager {
         runSafe {
             val info = reBreak ?: return@runSafe ReBreakResult.Ignored
 
-            if (info.context.expectedPos != ctx.expectedPos || !info.breakConfig.reBreak.mode.isEnabled()) {
+            if (info.context.expectedPos != ctx.expectedPos || !info.breakConfig.reBreak) {
                 return@runSafe ReBreakResult.Ignored
             }
             if (info.updatedThisTick) return@runSafe ReBreakResult.ReBroke

common/src/main/kotlin/com/lambda/interaction/request/breaking/ReBreakManager.kt

@@ -21,7 +21,6 @@ import com.lambda.config.groups.BuildSettings
 import com.lambda.config.groups.HotbarSettings
 import com.lambda.config.groups.InteractionSettings
 import com.lambda.config.groups.InventorySettings
-import com.lambda.config.groups.ReBreakSettings
 import com.lambda.config.groups.RotationSettings
 import com.lambda.context.SafeContext
 import com.lambda.event.events.PlayerEvent
@@ -53,6 +52,7 @@ object PacketMine : Module(
     private val interact = InteractionSettings(this, InteractionMask.Block) { page == Page.Interaction }
     private val inventory = InventorySettings(this) { page == Page.Inventory }
     private val hotbar = HotbarSettings(this) { page == Page.Hotbar }
+    private val reBreakMode by setting("ReBreak Mode", ReBreakMode.Manual, "The method used to re-break blocks after they've been broken once") { breakConfig.reBreak }
 
     private val pendingInteractionsList = ConcurrentLinkedQueue<BuildContext>()
 
@@ -71,8 +71,7 @@ object PacketMine : Module(
 
         //ToDo: run on every tick stage
         listen<TickEvent.Pre> {
-            val reBreakMode = breakConfig.reBreak.mode
-            if (reBreakMode != ReBreakSettings.Mode.Auto && reBreakMode != ReBreakSettings.Mode.AutoConstant) return@listen
+            if (breakConfig.reBreak && reBreakMode != ReBreakMode.Auto && reBreakMode != ReBreakMode.AutoConstant) return@listen
             val reBreak = reBreakPos ?: return@listen
             requestBreakManager(reBreak)
         }
@@ -152,4 +151,10 @@ object PacketMine : Module(
     enum class Page {
         Build, Rotation, Interaction, Inventory, Hotbar
     }
+
+    enum class ReBreakMode {
+        Manual,
+        Auto,
+        AutoConstant;
+    }
 }