Skip to content

Commit 248c690

Browse files
committed
removed unused priority
1 parent a5fd6f3 commit 248c690

File tree

7 files changed

+14
-26
lines changed

7 files changed

+14
-26
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717

1818
package com.lambda.interaction.request
1919

20-
abstract class Request (
21-
val priority: Priority,
20+
abstract class Request(
2221
val config: RequestConfig<*>
2322
) {
2423
var fresh = true

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package com.lambda.interaction.request.breaking
2020
import com.lambda.config.groups.BuildConfig
2121
import com.lambda.interaction.construction.context.BreakContext
2222
import com.lambda.interaction.construction.context.BuildContext
23-
import com.lambda.interaction.request.Priority
2423
import com.lambda.interaction.request.Request
2524
import com.lambda.interaction.request.hotbar.HotbarConfig
2625
import com.lambda.interaction.request.rotating.RotationConfig
@@ -38,9 +37,8 @@ data class BreakRequest(
3837
val build: BuildConfig,
3938
val rotation: RotationConfig,
4039
val hotbar: HotbarConfig,
41-
val pendingInteractions: MutableCollection<BuildContext>,
42-
private val prio: Priority = 0
43-
) : Request(prio, build.breaking) {
40+
val pendingInteractions: MutableCollection<BuildContext>
41+
) : Request(build.breaking) {
4442
var onStart: ((BlockPos) -> Unit)? = null
4543
var onUpdate: ((BlockPos) -> Unit)? = null
4644
var onStop: ((BlockPos) -> Unit)? = null
@@ -58,10 +56,9 @@ data class BreakRequest(
5856
build: BuildConfig,
5957
rotation: RotationConfig,
6058
hotbar: HotbarConfig,
61-
pendingInteractions: MutableCollection<BuildContext>,
62-
prio: Priority = 0
59+
pendingInteractions: MutableCollection<BuildContext>
6360
) {
64-
val request = BreakRequest(contexts, build, rotation, hotbar, pendingInteractions, prio)
61+
val request = BreakRequest(contexts, build, rotation, hotbar, pendingInteractions)
6562

6663
@BreakRequestBuilder
6764
fun onStart(callback: (BlockPos) -> Unit) {
@@ -110,8 +107,7 @@ data class BreakRequest(
110107
rotation: RotationConfig,
111108
hotbar: HotbarConfig,
112109
pendingInteractions: MutableCollection<BuildContext>,
113-
prio: Priority = 0,
114110
builder: RequestBuilder.() -> Unit
115-
) = RequestBuilder(contexts, build, rotation, hotbar, pendingInteractions, prio).apply(builder).build()
111+
) = RequestBuilder(contexts, build, rotation, hotbar, pendingInteractions).apply(builder).build()
116112
}
117113
}

common/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarRequest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,14 @@
1717

1818
package com.lambda.interaction.request.hotbar
1919

20-
import com.lambda.interaction.request.Priority
2120
import com.lambda.interaction.request.Request
2221

2322
class HotbarRequest(
2423
val slot: Int,
2524
val hotbar: HotbarConfig,
2625
var keepTicks: Int = hotbar.keepTicks,
27-
var swapPause: Int = hotbar.swapPause,
28-
priority: Priority = 0,
29-
) : Request(priority, hotbar) {
26+
var swapPause: Int = hotbar.swapPause
27+
) : Request(hotbar) {
3028
var activeRequestAge = 0
3129
var swapPauseAge = 0
3230

common/src/main/kotlin/com/lambda/interaction/request/interacting/InteractionRequest.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ data class InteractionRequest(
3535
val interact: InteractionConfig,
3636
val build: BuildConfig,
3737
val hotbar: HotbarConfig,
38-
val rotation: RotationConfig,
39-
private val prio: Int = 0
40-
) : Request(prio, interact) {
38+
val rotation: RotationConfig
39+
) : Request(interact) {
4140
override val done: Boolean
4241
get() = contexts.all { mc.world?.getBlockState(it.blockPos)?.matches(it.expectedState) == true }
4342
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package com.lambda.interaction.request.placing
2020
import com.lambda.config.groups.BuildConfig
2121
import com.lambda.interaction.construction.context.BuildContext
2222
import com.lambda.interaction.construction.context.PlaceContext
23-
import com.lambda.interaction.request.Priority
2423
import com.lambda.interaction.request.Request
2524
import com.lambda.interaction.request.hotbar.HotbarConfig
2625
import com.lambda.interaction.request.rotating.RotationConfig
@@ -34,9 +33,8 @@ data class PlaceRequest(
3433
val rotation: RotationConfig,
3534
val hotbar: HotbarConfig,
3635
val pendingInteractions: MutableCollection<BuildContext>,
37-
private val prio: Priority = 0,
3836
val onPlace: () -> Unit
39-
) : Request(prio, build.placing) {
37+
) : Request(build.placing) {
4038
override val done: Boolean
4139
get() = runSafe {
4240
contexts.all { it.expectedState.matches(blockState(it.blockPos)) }

common/src/main/kotlin/com/lambda/interaction/request/rotating/RotationRequest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,26 @@
1717

1818
package com.lambda.interaction.request.rotating
1919

20-
import com.lambda.interaction.request.Priority
2120
import com.lambda.interaction.request.Request
2221
import com.lambda.interaction.request.rotating.visibilty.RotationTarget
2322
import com.lambda.threading.runSafe
2423

2524
data class RotationRequest(
2625
val target: RotationTarget,
27-
val prio: Priority,
2826
val mode: RotationMode,
2927
val rot: RotationConfig,
3028
var keepTicks: Int = 3,
3129
var decayTicks: Int = 0,
3230
val turnSpeed: () -> Double = { 180.0 },
3331
val speedMultiplier: Double = 1.0
34-
) : Request(prio, rot) {
32+
) : Request(rot) {
3533
var age = 0
3634

3735
constructor(
3836
target: RotationTarget,
3937
config: RotationConfig,
4038
speedMultiplier: Double = 1.0
41-
) : this(target, config.priority, config.rotationMode, config, config.keepTicks, config.decayTicks, config::turnSpeed, speedMultiplier)
39+
) : this(target, config.rotationMode, config, config.keepTicks, config.decayTicks, config::turnSpeed, speedMultiplier)
4240

4341
override val done: Boolean get() =
4442
mode == RotationMode.None || runSafe { target.verify() } == true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ object Nuker : Module(
3737
private val height by setting("Height", 4, 1..8, 1)
3838
private val width by setting("Width", 4, 1..8, 1)
3939
private val flatten by setting("Flatten", true)
40-
private val onlyBreakInstant by setting("Only Break Instant", true)
40+
private val onlyBreakInstant by setting("Only Break Instant", false)
4141
private val fillFloor by setting("Fill Floor", false)
4242
private val baritoneSelection by setting("Baritone Selection", false, "Restricts nuker to your baritone selection")
4343

0 commit comments

Comments
 (0)