Skip to content

Commit ab4917b

Browse files
committed
Removed TickStage in favor of TickEvent
1 parent 7f7040c commit ab4917b

File tree

3 files changed

+6
-29
lines changed

3 files changed

+6
-29
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.lambda.config.groups
1919

2020
import com.lambda.config.Configurable
21+
import com.lambda.event.events.TickEvent
2122
import com.lambda.interaction.request.Priority
2223
import com.lambda.interaction.request.rotation.RotationConfig
2324
import com.lambda.interaction.request.rotation.RotationMode
@@ -44,7 +45,7 @@ class RotationSettings(
4445
/**
4546
* At what sub-tick stages rotations can be performed
4647
*/
47-
override val rotationStageMask by c.setting("Rotation Stage Mask", setOf(*TickStage.entries.toTypedArray()), "The sub-tick stages at which rotations can be performed", vis)
48+
override val rotationStageMask by c.setting("Rotation Stage Mask", setOf(TickEvent.Pre, TickEvent.Input.Pre, TickEvent.Player.Post), "The sub-tick stages at which rotations can be performed", vis)
4849

4950
/** Whether the rotation is instant */
5051
var instant by c.setting("Instant Rotation", true, "Instantly rotate") { rotate && vis() }

common/src/main/kotlin/com/lambda/config/groups/TickStage.kt

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

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationConfig.kt

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

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

20-
import com.lambda.config.groups.TickStage
20+
import com.lambda.event.Event
21+
import com.lambda.event.events.TickEvent
2122
import com.lambda.interaction.request.Priority
2223
import com.lambda.interaction.request.RequestConfig
2324

@@ -53,7 +54,7 @@ abstract class RotationConfig(priority: Priority) : RequestConfig<RotationReques
5354
/**
5455
* The sub-tick stages at which rotations can take place
5556
*/
56-
abstract val rotationStageMask: Set<TickStage>
57+
abstract val rotationStageMask: Set<Event>
5758

5859
val rotate: Boolean get() = rotationMode != RotationMode.None
5960

@@ -65,7 +66,7 @@ abstract class RotationConfig(priority: Priority) : RequestConfig<RotationReques
6566
override val turnSpeed get() = 360.0
6667
override val keepTicks get() = 1
6768
override val decayTicks get() = 1
68-
override val rotationStageMask = setOf(*TickStage.entries.toTypedArray())
69+
override val rotationStageMask = setOf(TickEvent.Pre, TickEvent.Input.Pre, TickEvent.Player.Post)
6970
override val rotationMode = mode
7071
}
7172
}

0 commit comments

Comments
 (0)