Skip to content

Commit 1512770

Browse files
committed
fix jvm names for request functions and use dsl builder functions in scaffold
1 parent 982e6fb commit 1512770

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/main/kotlin/com/lambda/interaction/request/breaking/BreakRequest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ data class BreakRequest private constructor(
141141
var requestCount = 0
142142

143143
@BreakRequestDsl
144+
@JvmName("breakRequest1")
144145
fun AutomatedSafeContext.breakRequest(
145146
positions: Collection<BlockPos>,
146147
pendingInteractions: MutableCollection<BuildContext>,
@@ -152,6 +153,7 @@ data class BreakRequest private constructor(
152153
.breakRequest(pendingInteractions, nowOrNothing, builder)
153154

154155
@BreakRequestDsl
156+
@JvmName("breakRequest2")
155157
context(automated: Automated)
156158
fun Collection<BuildResult>.breakRequest(
157159
pendingInteractions: MutableCollection<BuildContext>,
@@ -166,6 +168,7 @@ data class BreakRequest private constructor(
166168
?.let { automated.breakRequest(it, pendingInteractions, nowOrNothing, builder) }
167169

168170
@BreakRequestDsl
171+
@JvmName("breakRequest3")
169172
fun Automated.breakRequest(
170173
contexts: Collection<BreakContext>,
171174
pendingInteractions: MutableCollection<BuildContext>,

src/main/kotlin/com/lambda/interaction/request/placing/PlaceRequest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ data class PlaceRequest private constructor(
8080
var requestCount = 0
8181

8282
@PlaceRequestDsl
83+
@JvmName("placeRequest1")
8384
context(automated: Automated)
8485
fun Collection<BuildResult>.placeRequest(
8586
pendingInteractions: MutableCollection<BuildContext>,
@@ -94,6 +95,7 @@ data class PlaceRequest private constructor(
9495
?.let { automated.placeRequest(it, pendingInteractions, nowOrNothing, builder) }
9596

9697
@PlaceRequestDsl
98+
@JvmName("placeRequest2")
9799
fun Automated.placeRequest(
98100
contexts: Collection<PlaceContext>,
99101
pendingInteractions: MutableCollection<BuildContext>,

src/main/kotlin/com/lambda/module/modules/player/Scaffold.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import com.lambda.interaction.construction.context.BuildContext
2727
import com.lambda.interaction.construction.result.results.PlaceResult
2828
import com.lambda.interaction.construction.simulation.BuildSimulator.simulate
2929
import com.lambda.interaction.construction.verify.TargetState
30-
import com.lambda.interaction.request.Request.Companion.submit
31-
import com.lambda.interaction.request.placing.PlaceRequest
30+
import com.lambda.interaction.request.placing.PlaceRequest.Companion.placeRequest
3231
import com.lambda.module.Module
3332
import com.lambda.module.tag.ModuleTag
3433
import com.lambda.threading.runSafeAutomated
@@ -78,11 +77,7 @@ object Scaffold : Module(
7877
.filterIsInstance<PlaceResult.Place>()
7978
.minByOrNull { it.pos distSq beneath }
8079
?.let { result ->
81-
submit(PlaceRequest(
82-
setOf(result.context),
83-
pendingActions,
84-
this@Scaffold
85-
))
80+
placeRequest(setOf(result.context), pendingActions).submit()
8681
}
8782
}
8883
}

0 commit comments

Comments
 (0)