Skip to content

Commit 518283f

Browse files
AvanatikerAvanatiker
committed
Granular global build settings and tons of fixes
1 parent 9ec4c1d commit 518283f

32 files changed

+283
-185
lines changed

‎common/src/main/kotlin/com/lambda/config/InteractionSettings.kt‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎common/src/main/kotlin/com/lambda/config/groups/BuildConfig.kt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.lambda.config.groups
2+
3+
interface BuildConfig {
4+
val collectDrops: Boolean
5+
val breakWeakBlocks: Boolean
6+
val pathing: Boolean
7+
val interactLimit: Int
8+
val breakInstantAtOnce: Boolean
9+
val rotateForBreak: Boolean
10+
val swingHand: Boolean
11+
val particlesOnBreak: Boolean
12+
}

‎common/src/main/kotlin/com/lambda/config/groups/BuildSettings.kt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.lambda.config.groups
2+
3+
import com.lambda.config.Configurable
4+
5+
class BuildSettings(
6+
c: Configurable,
7+
vis: () -> Boolean = { true }
8+
) : BuildConfig {
9+
override val collectDrops by c.setting("Collect All Drops", false, "Collect all drops when breaking blocks", vis)
10+
override val breakWeakBlocks by c.setting("Break Weak Blocks", false, "Break blocks that dont have structural integrity (e.g: grass)", vis)
11+
override val pathing by c.setting("Pathing", true, "Path to blocks", vis)
12+
override val interactLimit by c.setting("Interaction Limit", 15, 1..100, 1, "Max interactions per tick", " i/t", vis)
13+
override val breakInstantAtOnce by c.setting("Break Instant At Once", true, "Break all instant blocks at once", vis)
14+
override val rotateForBreak by c.setting("Rotate For Break", false, "Rotate towards block while breaking", vis)
15+
override val swingHand by c.setting("Swing Hand", true, "Swing hand on interactions", vis)
16+
override val particlesOnBreak by c.setting("Particles On Break", true, "Show particles when breaking blocks", vis)
17+
}

common/src/main/kotlin/com/lambda/interaction/rotation/IRotationConfig.kt renamed to common/src/main/kotlin/com/lambda/config/groups/IRotationConfig.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.lambda.interaction.rotation
1+
package com.lambda.config.groups
2+
3+
import com.lambda.interaction.rotation.RotationMode
24

35
interface IRotationConfig {
46
/**

common/src/main/kotlin/com/lambda/interaction/InteractionConfig.kt renamed to common/src/main/kotlin/com/lambda/config/groups/InteractionConfig.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.lambda.interaction
2-
3-
import com.lambda.util.world.raycast.RayCastMask
1+
package com.lambda.config.groups
42

53
interface InteractionConfig {
64
/**
@@ -13,7 +11,5 @@ interface InteractionConfig {
1311
*/
1412
val resolution: Int
1513

16-
val rayCastMask: RayCastMask
17-
18-
val ignoreRayCast: Boolean
14+
val useRayCast: Boolean
1915
}

‎common/src/main/kotlin/com/lambda/config/groups/InteractionSettings.kt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.lambda.config.groups
2+
3+
import com.lambda.config.Configurable
4+
import com.lambda.util.world.raycast.RayCastMask
5+
6+
class InteractionSettings(
7+
c: Configurable,
8+
vis: () -> Boolean = { true },
9+
) : InteractionConfig {
10+
override val reach by c.setting("Reach", 4.9, 0.1..10.0, 0.1, "Players reach / range", " blocks", vis)
11+
override val useRayCast by c.setting("Raycast", false, "Verify hit vector with ray casting (for very strict ACs)", vis)
12+
override val resolution by c.setting("Resolution", 5, 1..20, 1, "How many raycast checks per surface (will be squared)") { vis() && useRayCast }
13+
}

common/src/main/kotlin/com/lambda/config/RotationSettings.kt renamed to common/src/main/kotlin/com/lambda/config/groups/RotationSettings.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.lambda.config
1+
package com.lambda.config.groups
22

3-
import com.lambda.interaction.rotation.IRotationConfig
3+
import com.lambda.config.Configurable
44
import com.lambda.interaction.rotation.RotationMode
55
import kotlin.math.max
66
import kotlin.math.min
@@ -11,8 +11,8 @@ class RotationSettings(
1111
vis: () -> Boolean = { true },
1212
) : IRotationConfig {
1313
override var rotationMode by c.setting("Mode", RotationMode.SYNC, "SILENT - server-side rotation, SYNC - server-side rotation; client-side movement, LOCK - Lock camera", vis)
14-
override val keepTicks by c.setting("Keep Rotation", 3, 1..10, 1, "Ticks to keep rotation", "", vis)
15-
override val resetTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", "", vis)
14+
override val keepTicks by c.setting("Keep Rotation", 3, 1..10, 1, "Ticks to keep rotation", " ticks", vis)
15+
override val resetTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", " ticks", vis)
1616

1717
var r1 by c.setting("Turn Speed 1", 70.0, 1.0..180.0, 0.1, "Rotation Speed 1", "", vis)
1818
var r2 by c.setting("Turn Speed 2", 110.0, 1.0..180.0, 0.1, "Rotation Speed 2", "", vis)

‎common/src/main/kotlin/com/lambda/event/events/RotationEvent.kt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,8 @@ package com.lambda.event.events
33
import com.lambda.event.Event
44
import com.lambda.event.callback.Cancellable
55
import com.lambda.event.callback.ICancellable
6-
import com.lambda.interaction.InteractionConfig
76
import com.lambda.interaction.RotationManager
8-
import com.lambda.interaction.rotation.IRotationConfig
97
import com.lambda.interaction.rotation.RotationContext
10-
import com.lambda.interaction.visibilty.VisibilityChecker.findRotation
11-
import com.lambda.module.modules.client.TaskFlow
12-
import com.lambda.threading.runSafe
13-
import com.lambda.util.BlockUtils.blockState
14-
import com.lambda.util.world.raycast.RayCastUtils.blockResult
15-
import com.lambda.util.world.raycast.RayCastUtils.entityResult
16-
import net.minecraft.entity.Entity
17-
import net.minecraft.util.math.BlockPos
18-
import net.minecraft.util.math.Direction
198

209
abstract class RotationEvent : Event {
2110
/**

‎common/src/main/kotlin/com/lambda/interaction/RotationManager.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.lambda.interaction
22

33
import baritone.utils.PlayerMovementInput
44
import com.lambda.Lambda.mc
5+
import com.lambda.config.groups.RotationSettings
56
import com.lambda.core.Loadable
6-
import com.lambda.config.RotationSettings
77
import com.lambda.context.SafeContext
88
import com.lambda.event.EventFlow.post
99
import com.lambda.event.events.*

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package com.lambda.interaction.construction
33
import com.lambda.context.SafeContext
44
import com.lambda.threading.runSafe
55
import com.lambda.util.primitives.extension.Structure
6+
import net.minecraft.util.math.BlockPos
67
import net.minecraft.util.math.Vec3i
78

89
data class DynamicBlueprint(
910
val init: SafeContext.(Structure) -> Structure = { emptyMap() },
1011
val onTick: SafeContext.(Structure) -> Structure = { it },
11-
val onDone: SafeContext.(Structure) -> Structure? = { null }
12+
val onDone: SafeContext.(Structure) -> Structure? = { null },
1213
) : Blueprint() {
1314
fun onTick(ctx: SafeContext) {
1415
structure = ctx.onTick(structure)
@@ -36,15 +37,15 @@ data class DynamicBlueprint(
3637
fun blueprintOnTick(
3738
init: SafeContext.(Structure) -> Structure = { emptyMap() },
3839
onTick: SafeContext.(Structure) -> Structure
39-
) = DynamicBlueprint(init, onTick = onTick)
40+
) = DynamicBlueprint(init = init, onTick = onTick)
4041

4142
fun blueprintOnDone(
4243
init: SafeContext.(Structure) -> Structure = { emptyMap() },
4344
onDone: SafeContext.(Structure) -> Structure
44-
) = DynamicBlueprint(init, onDone = onDone)
45+
) = DynamicBlueprint(init = init, onDone = onDone)
4546

4647
fun Structure.toBlueprint(
4748
onTick: SafeContext.(Structure) -> Structure
48-
) = DynamicBlueprint({ emptyMap() }, onTick)
49+
) = DynamicBlueprint(init = { emptyMap() }, onTick = onTick)
4950
}
5051
}

0 commit comments

Comments
 (0)