secondary request submit function for usage diversity

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/construction/context/InteractionContext.kt

@@ -20,6 +20,7 @@ package com.lambda.interaction.construction.context
 import com.lambda.context.SafeContext
 import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
+import com.lambda.interaction.request.Request.Companion.submit
 import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.hotbar.HotbarRequest
 import com.lambda.interaction.request.interacting.InteractRequest
@@ -66,8 +67,8 @@ class InteractionContext(
     }
 
     fun requestDependencies(request: InteractRequest): Boolean {
-        val hotbarRequest = HotbarRequest(hotbarIndex, request.hotbar).submit(false)
-        val validRotation = if (request.rotate) rotation.submit(false).done else true
+        val hotbarRequest = submit(HotbarRequest(hotbarIndex, request.hotbar), false)
+        val validRotation = if (request.rotate) submit(rotation, false).done else true
         return hotbarRequest.done && validRotation
     }
 }

common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt

@@ -21,6 +21,7 @@ import com.lambda.Lambda.mc
 import com.lambda.context.SafeContext
 import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
+import com.lambda.interaction.request.Request.Companion.submit
 import com.lambda.interaction.request.hotbar.HotbarManager
 import com.lambda.interaction.request.hotbar.HotbarRequest
 import com.lambda.interaction.request.placing.PlaceRequest
@@ -76,9 +77,9 @@ data class PlaceContext(
     }
 
     fun requestDependencies(request: PlaceRequest): Boolean {
-        val hotbarRequest = HotbarRequest(hotbarIndex, request.hotbar).submit(false)
+        val hotbarRequest = submit(HotbarRequest(hotbarIndex, request.hotbar), false)
         val validRotation = if (request.rotateForPlace) {
-            rotation.submit(false).done && currentDirIsValid
+            submit(rotation, false).done && currentDirIsValid
         } else true
         return hotbarRequest.done && validRotation
     }

common/src/main/kotlin/com/lambda/interaction/request/Request.kt

@@ -24,4 +24,9 @@ abstract class Request {
     abstract val done: Boolean
 
     abstract fun submit(queueIfClosed: Boolean = true): Request
+
+    companion object {
+        fun submit(request: Request, queueIfClosed: Boolean = true) =
+            request.submit(queueIfClosed)
+    }
 }

common/src/main/kotlin/com/lambda/module/modules/debug/SilentSwap.kt

@@ -20,6 +20,7 @@ package com.lambda.module.modules.debug
 import com.lambda.config.groups.HotbarSettings
 import com.lambda.event.events.PlayerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.interaction.request.Request.Companion.submit
 import com.lambda.interaction.request.hotbar.HotbarRequest
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
@@ -34,7 +35,7 @@ object SilentSwap : Module(
 
     init {
         listen<PlayerEvent.Attack.Block> {
-            if (!HotbarRequest(0, hotbar).submit().done) {
+            if (!submit(HotbarRequest(0, hotbar)).done) {
                 it.cancel()
                 return@listen
             }

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

@@ -22,6 +22,7 @@ import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.interaction.request.Request.Companion.submit
 import com.lambda.interaction.request.rotating.Rotation
 import com.lambda.interaction.request.rotating.Rotation.Companion.rotationTo
 import com.lambda.interaction.request.rotating.Rotation.Companion.wrap
@@ -158,7 +159,7 @@ object AntiAim : Module(
 
         listen<UpdateManagerEvent.Rotation>(priority = Int.MIN_VALUE) {
             if (currentYaw == wrap(player.yaw) && currentPitch == player.pitch) return@listen
-            RotationRequest(lookAt(Rotation(currentYaw, currentPitch)), rotation).submit(false)
+            submit(RotationRequest(lookAt(Rotation(currentYaw, currentPitch)), rotation), false)
         }
     }
 

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

@@ -176,7 +176,7 @@ object PacketMine : Module(
         if (!reBreaking) {
             queuePositions.retainAllPositions(breakContexts)
         }
-        val request = breakRequest(
+        breakRequest(
             breakContexts, pendingInteractions, rotation, hotbar, interact, inventory, build,
         ) {
             onStart { queuePositions.removePos(it); addBreak(it) }
@@ -186,8 +186,7 @@ object PacketMine : Module(
             onReBreakStart { reBreakPos = it }
             onReBreak { reBreakPos = it }
             onItemDrop { _ -> itemDrops++ }
-        }
-        request.submit()
+        }.submit()
     }
 
     private fun SafeContext.breakContexts(positions: Collection<BlockPos?>) =

common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt

@@ -156,15 +156,14 @@ class BuildTask @Ta5kBuilder constructor(
                                 requestContexts.addAll(breakResults.map { it.context })
                             }
 
-                            val request = breakRequest(
+                            breakRequest(
                                 requestContexts, pendingInteractions, rotation, hotbar, interactionConfig, inventory, build,
                             ) {
                                 onStop { breaks++ }
                                 onItemDrop?.let { onItemDrop ->
                                     onItemDrop { onItemDrop(it) }
                                 }
-                            }
-                            request.submit()
+                            }.submit()
                             return@listen
                         }
                         is PlaceResult.Place -> {