more small refactors

Author: beanbag44

common/src/main/kotlin/com/lambda/module/modules/player/PacketMine.kt

@@ -107,83 +107,6 @@ object PacketMine : Module(
     private val queueOutlineWidth by setting("Outline Width", 1f, 0f..3f, 0.1f, "The thickness of the outline used on queue blocks", visibility = { page == Page.QueueRender && renderQueueMode.isEnabled() && renderSetting != RenderSetting.Fill } )
 
 
-    private enum class Page {
-        General, ReBreak, Queue, BlockRender, QueueRender
-    }
-
-    @Suppress("UNUSED")
-    private enum class BreakMode {
-        Total, Additive;
-    }
-
-    private enum class PacketMode {
-        Vanilla, Grim, NCP
-    }
-
-    @Suppress("UNUSED")
-    private enum class SwapMethod {
-        None, StandardSilent, NCPSilent, Vanilla;
-
-        fun isEnabled() =
-            this != None
-
-        fun isSilent() =
-            this == StandardSilent || this == NCPSilent
-    }
-
-    private enum class SwapMode {
-        StartAndEnd, Start, End, Constant;
-    }
-
-    private enum class ReBreakMode {
-        None, Standard, Automatic, FastAutomatic;
-
-        fun isEnabled() =
-            this != None
-    }
-
-    private enum class ModeOptions {
-        None, StartAndEnd, Start, End, Constant;
-
-        fun isEnabled() =
-            this != None
-    }
-
-    private enum class ProgressStage {
-        StartPre, StartPost, PreTick, During, EndPre, EndPost, PacketReceiveBreak, TimedOut
-    }
-
-    private enum class RenderMode {
-        None, Out, In, InOut, OutIn, Static;
-
-        fun isEnabled() =
-            this != None
-    }
-
-    @Suppress("UNUSED")
-    private enum class RenderQueueMode {
-        None, Cube, Shape;
-
-        fun isEnabled() =
-            this != None
-    }
-
-    private enum class RenderSetting {
-        Both, Fill, Outline
-    }
-
-    private enum class ColourMode {
-        Static, Dynamic
-    }
-
-    private enum class BreakState {
-        Breaking, ReBreaking, AwaitingResponse
-    }
-
-    private enum class BreakType {
-        Primary, Double;
-    }
-
     val renderer = DynamicESP
     private var currentMiningBlock = Array<BreakingContext?>(2) { null }
     private var lastNonEmptyState: BlockState? = null
@@ -225,18 +148,7 @@ object PacketMine : Module(
                 swingingNextAttack = true
             }
 
-            if (queueBlocks) {
-                if (shouldBePlacedInBlockQueue(it.pos)) {
-                    if (reverseQueueOrder) {
-                        blockQueue.addFirst(it.pos)
-                    } else {
-                        blockQueue.add(it.pos)
-                    }
-                    return@listener
-                }
-
-                if (blockQueue.contains(it.pos)) return@listener
-            }
+            if (checkAddBlockQueuePos(it.pos)) return@listener
 
             currentMiningBlock.forEach { ctx ->
                 ctx?.apply {
@@ -259,8 +171,7 @@ object PacketMine : Module(
             }
 
             currentMiningBlock[0]?.apply {
-
-                currentMiningBlock[1]?.run { return@apply }
+                if (currentMiningBlock[1] != null) return@apply
 
                 if (doubleBreak && breakState != BreakState.ReBreaking) {
                     switchCurrentMiningBlockToDouble()
@@ -1028,6 +939,23 @@ object PacketMine : Module(
         }
     }
 
+    private fun checkAddBlockQueuePos(pos: BlockPos): Boolean {
+        if (queueBlocks) {
+            if (shouldBePlacedInBlockQueue(pos)) {
+                if (reverseQueueOrder) {
+                    blockQueue.addFirst(pos)
+                } else {
+                    blockQueue.add(pos)
+                }
+                return true
+            }
+
+            if (blockQueue.contains(pos)) return true
+        }
+
+        return false
+    }
+
     private fun shouldBePlacedInBlockQueue(pos: BlockPos): Boolean =
         (((currentMiningBlock[0] != null && !doubleBreak) || currentMiningBlock[1] != null) || !blockQueue.isEmpty())
                 && (currentMiningBlock[0]?.breakState != BreakState.ReBreaking || !blockQueue.isEmpty())
@@ -1367,4 +1295,81 @@ object PacketMine : Module(
 
         return f
     }
+
+    private enum class Page {
+        General, ReBreak, Queue, BlockRender, QueueRender
+    }
+
+    @Suppress("UNUSED")
+    private enum class BreakMode {
+        Total, Additive;
+    }
+
+    private enum class PacketMode {
+        Vanilla, Grim, NCP
+    }
+
+    @Suppress("UNUSED")
+    private enum class SwapMethod {
+        None, StandardSilent, NCPSilent, Vanilla;
+
+        fun isEnabled() =
+            this != None
+
+        fun isSilent() =
+            this == StandardSilent || this == NCPSilent
+    }
+
+    private enum class SwapMode {
+        StartAndEnd, Start, End, Constant;
+    }
+
+    private enum class ReBreakMode {
+        None, Standard, Automatic, FastAutomatic;
+
+        fun isEnabled() =
+            this != None
+    }
+
+    private enum class ModeOptions {
+        None, StartAndEnd, Start, End, Constant;
+
+        fun isEnabled() =
+            this != None
+    }
+
+    private enum class ProgressStage {
+        StartPre, StartPost, PreTick, During, EndPre, EndPost, PacketReceiveBreak, TimedOut
+    }
+
+    private enum class RenderMode {
+        None, Out, In, InOut, OutIn, Static;
+
+        fun isEnabled() =
+            this != None
+    }
+
+    @Suppress("UNUSED")
+    private enum class RenderQueueMode {
+        None, Cube, Shape;
+
+        fun isEnabled() =
+            this != None
+    }
+
+    private enum class RenderSetting {
+        Both, Fill, Outline
+    }
+
+    private enum class ColourMode {
+        Static, Dynamic
+    }
+
+    private enum class BreakState {
+        Breaking, ReBreaking, AwaitingResponse
+    }
+
+    private enum class BreakType {
+        Primary, Double;
+    }
 }