Skip to content

Commit 3041bf7

Browse files
committed
Reformat interaction
1 parent e9d2e49 commit 3041bf7

31 files changed

+107
-97
lines changed

common/src/main/kotlin/com/lambda/interaction/PlayerPacketManager.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818
package com.lambda.interaction
1919

2020
import com.lambda.context.SafeContext
21-
import com.lambda.core.Loadable
2221
import com.lambda.event.EventFlow.post
2322
import com.lambda.event.EventFlow.postChecked
2423
import com.lambda.event.events.PlayerPacketEvent
2524
import com.lambda.interaction.rotation.Rotation
2625
import com.lambda.threading.runSafe
2726
import com.lambda.util.collections.LimitedOrderedSet
28-
import com.lambda.util.math.VecUtils.approximate
29-
import com.lambda.util.player.MovementUtils.motionX
30-
import com.lambda.util.player.MovementUtils.motionZ
3127
import com.lambda.util.extension.component1
3228
import com.lambda.util.extension.component2
3329
import com.lambda.util.extension.component3
30+
import com.lambda.util.math.VecUtils.approximate
31+
import com.lambda.util.player.MovementUtils.motionX
32+
import com.lambda.util.player.MovementUtils.motionZ
3433
import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket
3534
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.*
3635
import net.minecraft.util.math.Vec3d

common/src/main/kotlin/com/lambda/interaction/blockplace/PlaceFinder.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,14 @@ import net.minecraft.util.math.Box
2929
import net.minecraft.util.math.Direction
3030
import net.minecraft.util.math.Vec3d
3131
import java.util.*
32-
import kotlin.collections.Collection
3332

3433
class PlaceFinder(
3534
private val basePos: BlockPos,
3635
private val maxAttempts: Int,
3736
range: Double,
3837
private val eyes: Vec3d,
3938
private val visibleCheck: Boolean,
40-
private val sides: Set<Direction>
39+
private val sides: Set<Direction>,
4140
) {
4241
private val rangeSq = range * range
4342

@@ -56,14 +55,14 @@ class PlaceFinder(
5655
range: Double = 3.25,
5756
eyes: Vec3d = player.eyePos,
5857
visibleCheck: Boolean = true,
59-
sides: Set<Direction> = EnumSet.allOf(Direction::class.java)
58+
sides: Set<Direction> = EnumSet.allOf(Direction::class.java),
6059
) = PlaceFinder(basePos, maxAttempts, range, eyes, visibleCheck, sides).build(this)
6160
}
6261

6362
private fun build(
6463
ctx: SafeContext,
6564
pos: BlockPos = basePos,
66-
attempts: Int = 0
65+
attempts: Int = 0,
6766
): PlaceInfo? = with(ctx) {
6867
if (sides.isEmpty()) return null
6968
if (!canPlaceAt(pos)) return null

common/src/main/kotlin/com/lambda/interaction/blockplace/PlaceInfo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ data class PlaceInfo(
2828
val hitVec: Vec3d,
2929

3030
val eyeDistanceSq: Double,
31-
val placeSteps: Int
31+
val placeSteps: Int,
3232
)

common/src/main/kotlin/com/lambda/interaction/construction/StructureRegistry.kt

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

1818
package com.lambda.interaction.construction
1919

20-
import com.lambda.Lambda.LOG
2120
import com.lambda.core.Loadable
2221
import com.lambda.util.Communication.logError
2322
import com.lambda.util.FolderRegister
@@ -30,9 +29,12 @@ import net.minecraft.nbt.NbtIo
3029
import net.minecraft.nbt.NbtSizeTracker
3130
import net.minecraft.registry.Registries
3231
import net.minecraft.structure.StructureTemplate
33-
import java.nio.file.*
32+
import java.nio.file.FileSystems
33+
import java.nio.file.Files
34+
import java.nio.file.Path
3435
import java.nio.file.StandardWatchEventKinds.ENTRY_CREATE
3536
import java.nio.file.StandardWatchEventKinds.ENTRY_DELETE
37+
import java.nio.file.WatchEvent
3638
import java.util.concurrent.ConcurrentHashMap
3739
import kotlin.io.path.*
3840

common/src/main/kotlin/com/lambda/interaction/construction/blueprint/DynamicBlueprint.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ data class DynamicBlueprint(
5252

5353
fun Structure.toBlueprint(
5454
init: SafeContext.(Structure) -> Structure = { this@toBlueprint },
55-
onTick: SafeContext.(Structure) -> Structure
55+
onTick: SafeContext.(Structure) -> Structure,
5656
) = DynamicBlueprint(init = init, update = onTick)
5757
}
5858
}

common/src/main/kotlin/com/lambda/interaction/construction/blueprint/StaticBlueprint.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package com.lambda.interaction.construction.blueprint
2020
import com.lambda.util.extension.Structure
2121

2222
data class StaticBlueprint(
23-
override val structure: Structure
23+
override val structure: Structure,
2424
) : Blueprint() {
2525
override fun toString() = "Static Blueprint at ${center.toShortString()}"
2626

common/src/main/kotlin/com/lambda/interaction/construction/processing/TaskPlanner.kt

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

1818
package com.lambda.interaction.construction.processing
1919

20-
object TaskPlanner {
21-
}
20+
object TaskPlanner

common/src/main/kotlin/com/lambda/interaction/construction/result/BreakResult.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import baritone.api.pathing.goals.GoalBlock
2121
import baritone.api.pathing.goals.GoalInverted
2222
import com.lambda.context.SafeContext
2323
import com.lambda.interaction.construction.context.BreakContext
24+
import com.lambda.interaction.material.StackSelection.Companion.select
25+
import com.lambda.interaction.material.StackSelection.Companion.selectStack
2426
import com.lambda.interaction.material.container.ContainerManager.findBestAvailableTool
2527
import com.lambda.interaction.material.container.ContainerManager.transfer
2628
import com.lambda.interaction.material.container.MaterialContainer
27-
import com.lambda.interaction.material.StackSelection.Companion.select
28-
import com.lambda.interaction.material.StackSelection.Companion.selectStack
2929
import com.lambda.interaction.material.container.containers.MainHandContainer
3030
import com.lambda.task.tasks.BreakBlock
3131
import net.minecraft.block.BlockState
@@ -42,7 +42,7 @@ sealed class BreakResult : BuildResult() {
4242
*/
4343
data class Break(
4444
override val blockPos: BlockPos,
45-
val context: BreakContext
45+
val context: BreakContext,
4646
) : Drawable, Resolvable, BreakResult() {
4747
override val rank = Rank.BREAK_SUCCESS
4848
private val color = Color(222, 0, 0, 100)
@@ -71,7 +71,7 @@ sealed class BreakResult : BuildResult() {
7171
*/
7272
data class NotExposed(
7373
override val blockPos: BlockPos,
74-
val side: Direction
74+
val side: Direction,
7575
) : Drawable, BreakResult() {
7676
override val rank = Rank.BREAK_NOT_EXPOSED
7777
private val color = Color(46, 0, 0, 30)
@@ -96,7 +96,7 @@ sealed class BreakResult : BuildResult() {
9696
data class ItemCantMine(
9797
override val blockPos: BlockPos,
9898
val blockState: BlockState,
99-
val badItem: Item
99+
val badItem: Item,
100100
) : Drawable, Resolvable, BreakResult() {
101101
override val rank = Rank.BREAK_ITEM_CANT_MINE
102102
private val color = Color(255, 0, 0, 100)
@@ -131,7 +131,7 @@ sealed class BreakResult : BuildResult() {
131131
data class Submerge(
132132
override val blockPos: BlockPos,
133133
val blockState: BlockState,
134-
val submerge: Set<BuildResult>
134+
val submerge: Set<BuildResult>,
135135
) : Drawable, BreakResult() {
136136
override val rank = Rank.BREAK_SUBMERGE
137137
private val color = Color(114, 27, 255, 100)
@@ -146,7 +146,7 @@ sealed class BreakResult : BuildResult() {
146146
*/
147147
data class BlockedByLiquid(
148148
override val blockPos: BlockPos,
149-
val blockState: BlockState
149+
val blockState: BlockState,
150150
) : Drawable, BreakResult() {
151151
override val rank = Rank.BREAK_IS_BLOCKED_BY_LIQUID
152152
private val color = Color(50, 12, 112, 100)
@@ -161,7 +161,7 @@ sealed class BreakResult : BuildResult() {
161161
*/
162162
data class PlayerOnTop(
163163
override val blockPos: BlockPos,
164-
val blockState: BlockState
164+
val blockState: BlockState,
165165
) : Navigable, Drawable, BreakResult() {
166166
override val rank = Rank.BREAK_PLAYER_ON_TOP
167167
private val color = Color(252, 3, 207, 100)

common/src/main/kotlin/com/lambda/interaction/construction/result/BuildResult.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import baritone.api.pathing.goals.GoalBlock
2121
import baritone.api.pathing.goals.GoalNear
2222
import com.lambda.context.SafeContext
2323
import com.lambda.interaction.construction.context.BuildContext
24+
import com.lambda.interaction.material.StackSelection.Companion.select
2425
import com.lambda.interaction.material.container.ContainerManager.transfer
2526
import com.lambda.interaction.material.container.MaterialContainer
26-
import com.lambda.interaction.material.StackSelection.Companion.select
2727
import com.lambda.interaction.material.container.containers.MainHandContainer
2828
import com.lambda.util.BlockUtils.blockState
2929
import com.lambda.util.Nameable
@@ -45,7 +45,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
4545
* The build action is done.
4646
*/
4747
data class Done(
48-
override val blockPos: BlockPos
48+
override val blockPos: BlockPos,
4949
) : BuildResult() {
5050
override val name: String
5151
get() = "Build at $blockPos is done."
@@ -56,7 +56,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
5656
* The build action is ignored.
5757
*/
5858
data class Ignored(
59-
override val blockPos: BlockPos
59+
override val blockPos: BlockPos,
6060
) : BuildResult() {
6161
override val name: String
6262
get() = "Build at $blockPos is ignored."
@@ -68,7 +68,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
6868
* @param blockPos The position of the block that is in an unloaded chunk.
6969
*/
7070
data class ChunkNotLoaded(
71-
override val blockPos: BlockPos
71+
override val blockPos: BlockPos,
7272
) : Navigable, Drawable, BuildResult() {
7373
override val name: String get() = "Chunk at $blockPos is not loaded."
7474
override val rank = Rank.CHUNK_NOT_LOADED
@@ -93,7 +93,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
9393
* @param blockPos The position of the block that is restricted.
9494
*/
9595
data class Restricted(
96-
override val blockPos: BlockPos
96+
override val blockPos: BlockPos,
9797
) : Drawable, BuildResult() {
9898
override val name: String get() = "Restricted at $blockPos."
9999
override val rank = Rank.BREAK_RESTRICTED
@@ -111,7 +111,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
111111
*/
112112
data class NoPermission(
113113
override val blockPos: BlockPos,
114-
val blockState: BlockState
114+
val blockState: BlockState,
115115
) : Drawable, BuildResult() {
116116
override val name: String get() = "No permission at $blockPos."
117117
override val rank get() = Rank.BREAK_NO_PERMISSION
@@ -127,7 +127,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
127127
* @param blockPos The position of the block that is out of the world.
128128
*/
129129
data class OutOfWorld(
130-
override val blockPos: BlockPos
130+
override val blockPos: BlockPos,
131131
) : Drawable, BuildResult() {
132132
override val name: String get() = "$blockPos is out of the world."
133133
override val rank = Rank.OUT_OF_WORLD
@@ -145,7 +145,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
145145
*/
146146
data class Unbreakable(
147147
override val blockPos: BlockPos,
148-
val blockState: BlockState
148+
val blockState: BlockState,
149149
) : Drawable, BuildResult() {
150150
override val name: String get() = "Unbreakable at $blockPos."
151151
override val rank = Rank.UNBREAKABLE
@@ -165,7 +165,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
165165
override val blockPos: BlockPos,
166166
val hitPos: BlockPos,
167167
val side: Direction,
168-
val distance: Double
168+
val distance: Double,
169169
) : Drawable, BuildResult() {
170170
override val name: String get() = "Not visible at $blockPos."
171171
override val rank = Rank.NOT_VISIBLE
@@ -226,7 +226,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
226226
data class WrongStack(
227227
override val blockPos: BlockPos,
228228
val context: BuildContext,
229-
val neededStack: ItemStack
229+
val neededStack: ItemStack,
230230
) : Drawable, Resolvable, BuildResult() {
231231
override val name: String get() = "Wrong stack for $blockPos need $neededStack."
232232
override val rank = Rank.WRONG_ITEM
@@ -262,7 +262,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
262262
data class OutOfReach(
263263
override val blockPos: BlockPos,
264264
val pov: Vec3d,
265-
val misses: Set<Vec3d>
265+
val misses: Set<Vec3d>,
266266
) : Navigable, Drawable, BuildResult() {
267267
override val name: String get() = "Out of reach at $blockPos."
268268
override val rank = Rank.OUT_OF_REACH

common/src/main/kotlin/com/lambda/interaction/construction/result/Drawable.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ package com.lambda.interaction.construction.result
2020
import com.lambda.context.SafeContext
2121
import com.lambda.graphics.renderer.esp.DirectionMask
2222
import com.lambda.graphics.renderer.esp.DirectionMask.include
23-
import com.lambda.graphics.renderer.esp.global.StaticESP
2423
import com.lambda.graphics.renderer.esp.builders.buildFilled
24+
import com.lambda.graphics.renderer.esp.global.StaticESP
2525
import com.lambda.util.BlockUtils.blockState
2626
import net.minecraft.block.BlockState
2727
import net.minecraft.util.math.BlockPos

0 commit comments

Comments
 (0)