Skip to content

Commit 32b691e

Browse files
committed
Reformat task
1 parent 8022bd2 commit 32b691e

File tree

8 files changed

+26
-18
lines changed

8 files changed

+26
-18
lines changed

common/src/main/kotlin/com/lambda/task/Task.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ abstract class Task<Result> : Nameable, Muteable {
192192
@Ta5kBuilder
193193
fun failure(
194194
e: Throwable,
195-
stacktrace: MutableList<Task<*>> = mutableListOf()
195+
stacktrace: MutableList<Task<*>> = mutableListOf(),
196196
) {
197197
state = State.FAILED
198198
unsubscribe()

common/src/main/kotlin/com/lambda/task/TaskDecisionTree.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@
1717

1818
package com.lambda.task
1919

20-
class TaskDecisionTree {
21-
22-
}
20+
class TaskDecisionTree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
package com.lambda.task.tasks
1919

2020
import com.lambda.context.SafeContext
21+
import com.lambda.interaction.material.StackSelection
2122
import com.lambda.interaction.material.container.ContainerManager
2223
import com.lambda.interaction.material.container.ContainerManager.findContainerWithMaterial
23-
import com.lambda.interaction.material.StackSelection
2424
import com.lambda.task.Task
2525

2626
class AcquireMaterial @Ta5kBuilder constructor(
27-
val selection: StackSelection
27+
val selection: StackSelection,
2828
) : Task<StackSelection>() {
2929
override val name: String
3030
get() = "Acquiring $selection"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import com.lambda.util.player.SlotUtils.clickSlot
3737
import com.lambda.util.player.SlotUtils.hotbarAndStorage
3838
import net.minecraft.block.BlockState
3939
import net.minecraft.entity.ItemEntity
40-
import net.minecraft.entity.data.TrackedDataHandlerRegistry
4140
import net.minecraft.screen.slot.SlotActionType
4241
import net.minecraft.util.math.BlockPos
4342
import net.minecraft.util.math.Direction

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
package com.lambda.task.tasks
1919

2020
import com.lambda.Lambda.LOG
21-
import com.lambda.config.groups.*
21+
import com.lambda.config.groups.BuildConfig
22+
import com.lambda.config.groups.InteractionConfig
23+
import com.lambda.config.groups.RotationConfig
2224
import com.lambda.context.SafeContext
2325
import com.lambda.event.events.MovementEvent
2426
import com.lambda.event.events.PacketEvent
25-
import com.lambda.event.events.RotationEvent
2627
import com.lambda.event.events.TickEvent
2728
import com.lambda.event.listener.SafeListener.Companion.listen
2829
import com.lambda.interaction.RotationManager.rotate
@@ -123,15 +124,19 @@ class BuildTask @Ta5kBuilder constructor(
123124
is BuildResult.Ignored,
124125
is BuildResult.Unbreakable,
125126
is BuildResult.Restricted,
126-
is BuildResult.NoPermission -> {
127+
is BuildResult.NoPermission,
128+
-> {
127129
if (finishOnDone) success()
128130
}
131+
129132
is BuildResult.NotVisible, is PlaceResult.NoIntegrity -> {
130133
if (build.pathing) BaritoneUtils.setGoalAndPath(BuildGoal(blueprint.simulation()))
131134
}
135+
132136
is Navigable -> {
133137
if (build.pathing) BaritoneUtils.setGoalAndPath(result.goal)
134138
}
139+
135140
is PlaceResult.Place -> {
136141
if (pendingPlacements.size >= build.maxPendingPlacements) return@listen
137142

@@ -142,6 +147,7 @@ class BuildTask @Ta5kBuilder constructor(
142147

143148
currentPlacement = result.context
144149
}
150+
145151
is Resolvable -> {
146152
LOG.info("Resolving: ${result.name}")
147153

@@ -200,7 +206,7 @@ class BuildTask @Ta5kBuilder constructor(
200206
collectDrops: Boolean = TaskFlowModule.build.collectDrops,
201207
build: BuildConfig = TaskFlowModule.build,
202208
rotation: RotationConfig = TaskFlowModule.rotation,
203-
interact: InteractionConfig = TaskFlowModule.interact
209+
interact: InteractionConfig = TaskFlowModule.interact,
204210
) = BuildTask(toBlueprint(), finishOnDone, collectDrops, build, rotation, interact)
205211

206212
@Ta5kBuilder
@@ -209,7 +215,7 @@ class BuildTask @Ta5kBuilder constructor(
209215
collectDrops: Boolean = TaskFlowModule.build.collectDrops,
210216
build: BuildConfig = TaskFlowModule.build,
211217
rotation: RotationConfig = TaskFlowModule.rotation,
212-
interact: InteractionConfig = TaskFlowModule.interact
218+
interact: InteractionConfig = TaskFlowModule.interact,
213219
) = BuildTask(this, finishOnDone, collectDrops, build, rotation, interact)
214220

215221
@Ta5kBuilder
@@ -219,7 +225,7 @@ class BuildTask @Ta5kBuilder constructor(
219225
collectDrops: Boolean = true,
220226
build: BuildConfig = TaskFlowModule.build,
221227
rotation: RotationConfig = TaskFlowModule.rotation,
222-
interact: InteractionConfig = TaskFlowModule.interact
228+
interact: InteractionConfig = TaskFlowModule.interact,
223229
) = BuildTask(
224230
blockPos.toStructure(TargetState.Air).toBlueprint(),
225231
finishOnDone, collectDrops, build, rotation, interact
@@ -232,7 +238,7 @@ class BuildTask @Ta5kBuilder constructor(
232238
collectDrops: Boolean = TaskFlowModule.build.collectDrops,
233239
build: BuildConfig = TaskFlowModule.build,
234240
rotation: RotationConfig = TaskFlowModule.rotation,
235-
interact: InteractionConfig = TaskFlowModule.interact
241+
interact: InteractionConfig = TaskFlowModule.interact,
236242
) = BuildTask(
237243
blockPos.toStructure(TargetState.Air).toBlueprint(),
238244
finishOnDone, collectDrops, build, rotation, interact

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

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

1818
package com.lambda.task.tasks
1919

20-
import com.lambda.config.groups.RotationConfig
2120
import com.lambda.config.groups.InteractionConfig
21+
import com.lambda.config.groups.RotationConfig
2222
import com.lambda.event.events.InventoryEvent
2323
import com.lambda.event.events.RotationEvent
2424
import com.lambda.event.listener.SafeListener.Companion.listen

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ package com.lambda.task.tasks
2020
import com.lambda.Lambda.LOG
2121
import com.lambda.config.groups.InteractionConfig
2222
import com.lambda.context.SafeContext
23-
import com.lambda.event.events.*
23+
import com.lambda.event.events.MovementEvent
24+
import com.lambda.event.events.PacketEvent
25+
import com.lambda.event.events.RotationEvent
26+
import com.lambda.event.events.TickEvent
2427
import com.lambda.event.listener.SafeListener.Companion.listen
2528
import com.lambda.interaction.construction.context.PlaceContext
2629
import com.lambda.interaction.rotation.Rotation.Companion.rotation
@@ -33,8 +36,6 @@ import com.lambda.util.Communication.info
3336
import com.lambda.util.Communication.warn
3437
import net.minecraft.block.BlockState
3538
import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket
36-
import kotlin.time.DurationUnit
37-
import kotlin.time.toDuration
3839

3940
class PlaceBlock @Ta5kBuilder constructor(
4041
private val ctx: PlaceContext,
@@ -99,12 +100,14 @@ class PlaceBlock @Ta5kBuilder constructor(
99100
if (event.context.rotation != primeContext?.rotation) return@listen
100101
state = State.ROTATING
101102
}
103+
102104
State.ROTATING -> {
103105
if (event.context.rotation != ctx.rotation.rotation) return@listen
104106
if (!event.context.isValid) return@listen
105107

106108
state = State.PLACING
107109
}
110+
108111
else -> return@listen
109112
}
110113
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,15 @@ class PlaceContainer @Ta5kBuilder constructor(
7878
Items.ENDER_CHEST -> {
7979
!ChestBlock.isChestBlocked(world, blockPos)
8080
}
81+
8182
in shulkerBoxes -> {
8283
val box = ShulkerEntity
8384
.calculateBoundingBox(direction, 0.0f, 0.5f)
8485
.offset(blockPos)
8586
.contract(1.0E-6)
8687
world.isSpaceEmpty(box)
8788
}
89+
8890
else -> false
8991
}
9092
}

0 commit comments

Comments
 (0)