Pausing, loops and sanity checks

Author: Avanatiker

common/src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java

@@ -63,7 +63,7 @@ void processMovement(Input input, boolean slowDown, float slowDownFactor) {
 
     @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isSprinting()Z"))
     boolean isSprinting(ClientPlayerEntity entity) {
-        return !EventFlow.post(new MovementEvent.Sprint()).isCanceled();
+        return EventFlow.post(new MovementEvent.Sprint(entity.isSprinting())).getSprint();
     }
 
     @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)

common/src/main/kotlin/com/lambda/config/Configurable.kt

@@ -242,8 +242,8 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         range: ClosedRange<Byte>,
         step: Byte = 1,
         description: String = "",
-        visibility: () -> Boolean = { true },
         unit: String = "",
+        visibility: () -> Boolean = { true },
     ) = ByteSetting(name, defaultValue, range, step, description, visibility, unit).also {
         settings.add(it)
     }
@@ -267,8 +267,8 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         range: ClosedRange<Double>,
         step: Double = 1.0,
         description: String = "",
-        visibility: () -> Boolean = { true },
         unit: String = "",
+        visibility: () -> Boolean = { true },
     ) = DoubleSetting(name, defaultValue, range, step, description, visibility, unit).also {
         settings.add(it)
     }
@@ -292,8 +292,8 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         range: ClosedRange<Float>,
         step: Float = 1f,
         description: String = "",
-        visibility: () -> Boolean = { true },
         unit: String = "",
+        visibility: () -> Boolean = { true },
     ) = FloatSetting(name, defaultValue, range, step, description, visibility, unit).also {
         settings.add(it)
     }
@@ -317,8 +317,8 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         range: ClosedRange<Int>,
         step: Int = 1,
         description: String = "",
-        visibility: () -> Boolean = { true },
         unit: String = "",
+        visibility: () -> Boolean = { true },
     ) = IntegerSetting(name, defaultValue, range, step, description, visibility, unit).also {
         settings.add(it)
     }
@@ -342,8 +342,8 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         range: ClosedRange<Long>,
         step: Long = 1,
         description: String = "",
-        visibility: () -> Boolean = { true },
         unit: String = "",
+        visibility: () -> Boolean = { true },
     ) = LongSetting(name, defaultValue, range, step, description, visibility, unit).also {
         settings.add(it)
     }
@@ -367,8 +367,8 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         range: ClosedRange<Short>,
         step: Short = 1,
         description: String = "",
-        visibility: () -> Boolean = { true },
         unit: String = "",
+        visibility: () -> Boolean = { true },
     ) = ShortSetting(name, defaultValue, range, step, description, visibility, unit).also {
         settings.add(it)
     }

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

@@ -7,7 +7,7 @@ class InteractionSettings(
     c: Configurable,
     vis: () -> Boolean = { true },
 ) : InteractionConfig {
-    override val reach by c.setting("Reach", 5.0, 0.1..10.0, 0.1, "Players reach / range", vis)
-    override val resolution by c.setting("Resolution", 10, 1..100, 1, "Raycast resolution", vis)
+    override val reach by c.setting("Reach", 5.0, 0.1..10.0, 0.1, "Players reach / range", "", vis)
+    override val resolution by c.setting("Resolution", 10, 1..100, 1, "Raycast resolution", "", vis)
     override val rayCastMask by c.setting("Raycast Mask", RayCastMask.BOTH, "What to raycast against", vis)
 }

common/src/main/kotlin/com/lambda/config/RotationSettings.kt

@@ -9,11 +9,11 @@ class RotationSettings(
     vis: () -> Boolean = { true },
 ) : IRotationConfig {
     override var rotationMode by c.setting("Mode", RotationMode.SYNC, "SILENT - server-side rotation, SYNC - server-side rotation; client-side movement, LOCK - Lock camera", vis)
-    override val keepTicks by c.setting("Keep Rotation", 3, 1..10, 1, "Ticks to keep rotation", vis)
-    override val resetTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", vis)
+    override val keepTicks by c.setting("Keep Rotation", 3, 1..10, 1, "Ticks to keep rotation", "", vis)
+    override val resetTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", "", vis)
 
-    private val r1 by c.setting("Turn Speed 1", 70.0, 1.0..180.0, 0.1, "Rotation Speed 1", vis)
-    private val r2 by c.setting("Turn Speed 2", 110.0, 1.0..180.0, 0.1, "Rotation Speed 2", vis)
+    private val r1 by c.setting("Turn Speed 1", 70.0, 1.0..180.0, 0.1, "Rotation Speed 1", "", vis)
+    private val r2 by c.setting("Turn Speed 2", 110.0, 1.0..180.0, 0.1, "Rotation Speed 2", "", vis)
 
     override val turnSpeed get() = Random.nextDouble(r1, r2)
 

common/src/main/kotlin/com/lambda/event/events/MovementEvent.kt

@@ -15,7 +15,7 @@ abstract class MovementEvent : Event {
         var slowDownFactor: Float,
     ) : MovementEvent()
 
-    class Sprint : MovementEvent(), ICancellable by Cancellable()
+    class Sprint(var sprint: Boolean) : MovementEvent()
 
     class ClipAtLedge(
         var clip: Boolean,