split Computer#tick into tick+renderTick

Signed-off-by: Octol1ttle <[email protected]>

Author: Octol1ttle

src/main/kotlin/nl/enjarai/doabarrelroll/compat/flightassistant/DaBRRollComputer.kt

@@ -22,9 +22,6 @@ class DaBRRollComputer(computers: ComputerBus) : Computer(computers), RollSource
         return (computers.data.player as RollEntity).`doABarrelRoll$setRoll`(getRoll() + diff)
     }
 
-    override fun tick() {
-    }
-
     override fun reset() {
     }
 

src/main/kotlin/ru/octol1ttle/flightassistant/api/computer/Computer.kt

@@ -27,12 +27,19 @@ abstract class Computer(val computers: ComputerBus) {
     }
 
     /**
-     * Called once per level render
+     * Called once per tick
      *
      * If this method throws an exception or error, it is caught and the computer is considered "faulted".
      * It won't be ticked until it is reset and an alert about the issue will be displayed
      */
-    abstract fun tick()
+    open fun tick() {}
+
+    /**
+     * Called once per level render.
+     *
+     * @see tick
+     */
+    open fun renderTick() {}
 
     /**
      * Called when this computer should be reset. This computer's state should be reset to the initial ("everything is good") state.

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/ComputerHost.kt

@@ -118,17 +118,24 @@ internal object ComputerHost : ModuleController<Computer>, ComputerBus {
             return
         }
 
+        mc.profiler.push("flightassistant:computer_host")
         for ((id: ResourceLocation, computer: Computer) in computers) {
+            mc.profiler.push(id.toString())
             if (!computer.isDisabledOrFaulted()) {
                 try {
-                    computer.tick()
+                    repeat(FATickCounter.ticksPassed) {
+                        computer.tick()
+                    }
+                    computer.renderTick()
                 } catch (t: Throwable) {
                     onComputerFault(computer)
 
                     FlightAssistant.logger.error("Exception ticking computer with identifier: $id", t)
                 }
             }
+            mc.profiler.pop()
         }
+        mc.profiler.pop()
     }
 
     @Deprecated("Will be private")

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/FlightPlanComputer.kt

@@ -12,7 +12,6 @@ import ru.octol1ttle.flightassistant.FlightAssistant
 import ru.octol1ttle.flightassistant.api.computer.Computer
 import ru.octol1ttle.flightassistant.api.computer.ComputerBus
 import ru.octol1ttle.flightassistant.api.computer.ComputerQuery
-import ru.octol1ttle.flightassistant.api.util.FATickCounter
 import ru.octol1ttle.flightassistant.api.util.LimitedFIFOQueue
 import ru.octol1ttle.flightassistant.api.util.extensions.distance2d
 import ru.octol1ttle.flightassistant.api.util.extensions.formatRoot
@@ -34,9 +33,7 @@ class FlightPlanComputer(computers: ComputerBus) : Computer(computers) {
     override fun tick() {
         updateEnrouteData()
         currentPhase = updateFlightPhase()
-        if (FATickCounter.ticksPassed != 0) {
-            groundSpeeds.add(computers.data.velocityPerSecond.horizontalDistance())
-        }
+        groundSpeeds.add(computers.data.velocityPerSecond.horizontalDistance())
     }
 
     private fun updateFlightPhase(): FlightPhase {

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/base/HeadingComputer.kt

@@ -31,16 +31,20 @@ class HeadingComputer(computers: ComputerBus) : Computer(computers) {
             return
         }
 
-        val heading: Float = computers.data.heading
         val finalInput: ControlInput? = inputs.getActiveHighestPriority().firstOrNull()
         if (finalInput == null) {
             activeInput = null
             return
         }
 
         activeInput = finalInput
-        if (computers.data.automationsAllowed() && finalInput.status == ControlInput.Status.ACTIVE) {
-            smoothSetHeading(computers.data.player, heading, finalInput.target.throwIfNotInRange(0.0f..360.0f), finalInput.deltaTimeMultiplier.throwIfNotInRange(0.001f..Float.MAX_VALUE))
+    }
+
+    override fun renderTick() {
+        val input = activeInput ?: return
+
+        if (computers.data.automationsAllowed() && input.status == ControlInput.Status.ACTIVE) {
+            smoothSetHeading(computers.data.player, computers.data.heading, input.target.throwIfNotInRange(0.0f..360.0f), input.deltaTimeMultiplier.throwIfNotInRange(0.001f..Float.MAX_VALUE))
         }
     }
 

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/base/PitchComputer.kt

@@ -63,23 +63,27 @@ class PitchComputer(computers: ComputerBus) : Computer(computers), FlightControl
             return
         }
 
-        val pitch: Float = computers.data.pitch
         val finalInput: ControlInput? = inputs.getActiveHighestPriority().maxByOrNull { it.target }
         if (finalInput == null) {
             activeInput = null
             return
         }
 
         activeInput = finalInput
-        if (canMoveOrBlockPitch() && finalInput.status == ControlInput.Status.ACTIVE) {
-            var target: Float = finalInput.target
-            if (!finalInput.priority.isHigherOrSame(minimumPitch?.priority)) {
+    }
+
+    override fun renderTick() {
+        val input = activeInput ?: return
+
+        if (canMoveOrBlockPitch() && input.status == ControlInput.Status.ACTIVE) {
+            var target: Float = input.target
+            if (!input.priority.isHigherOrSame(minimumPitch?.priority)) {
                 target = target.coerceAtLeast(minimumPitch!!.target + 1.0f)
             }
-            if (!finalInput.priority.isHigherOrSame(maximumPitch?.priority)) {
+            if (!input.priority.isHigherOrSame(maximumPitch?.priority)) {
                 target = target.coerceAtMost(maximumPitch!!.target - 1.0f)
             }
-            smoothSetPitch(computers.data.player, pitch, target.throwIfNotInRange(-90.0f..90.0f), finalInput.deltaTimeMultiplier.throwIfNotInRange(0.001f..Float.MAX_VALUE))
+            smoothSetPitch(computers.data.player, computers.data.pitch, target.throwIfNotInRange(-90.0f..90.0f), input.deltaTimeMultiplier.throwIfNotInRange(0.001f..Float.MAX_VALUE))
         }
     }
 
@@ -132,7 +136,6 @@ class PitchComputer(computers: ComputerBus) : Computer(computers), FlightControl
     }
 
     override fun reset() {
-        manualOverride = true
         minimumPitch = null
         maximumPitch = null
         activeInput = null

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/base/RollComputer.kt

@@ -25,16 +25,15 @@ class RollComputer(computers: ComputerBus) : Computer(computers) {
         RollControllerRegistrationCallback.EVENT.invoker().register(controllers::add)
     }
 
-    override fun tick() {
-        val rollSource: RollSource = sources.filterWorking().singleOrNull { computers.guardedCall(it, RollSource::isActive) == true } ?: return
-
+    override fun renderTick() {
         val inputs: List<ControlInput> = controllers.filterWorking().mapNotNull { computers.guardedCall(it, FlightController::getRollInput) }.sortedBy { it.priority.value }
         if (inputs.isEmpty()) {
             return
         }
         val finalInput: ControlInput = inputs.getActiveHighestPriority().firstOrNull() ?: return
 
         if (computers.data.automationsAllowed() && finalInput.status == ControlInput.Status.ACTIVE) {
+            val rollSource: RollSource = sources.filterWorking().singleOrNull { computers.guardedCall(it, RollSource::isActive) == true } ?: return
             smoothSetRoll(rollSource, finalInput.target.throwIfNotInRange(-180.0f..180.0f), finalInput.deltaTimeMultiplier.throwIfNotInRange(0.001f..Float.MAX_VALUE))
         }
     }

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/modes/BuiltInThrustModes.kt

@@ -2,6 +2,7 @@ package ru.octol1ttle.flightassistant.impl.computer.autoflight.modes
 
 import kotlin.math.abs
 import kotlin.math.pow
+import net.minecraft.SharedConstants
 import net.minecraft.network.chat.Component
 import ru.octol1ttle.flightassistant.api.autoflight.ControlInput
 import ru.octol1ttle.flightassistant.api.computer.ComputerBus
@@ -17,11 +18,8 @@ data class ConstantThrustMode(val target: Float, override val textOverride: Comp
 data class SpeedThrustMode(override val targetSpeed: Int, override val textOverride: Component? = null) : AutoFlightComputer.ThrustMode, AutoFlightComputer.FollowsSpeedMode {
     override fun getControlInput(computers: ComputerBus): ControlInput {
         val currentThrust: Float = computers.thrust.current
-        if (FATickCounter.ticksPassed == 0) {
-            return ControlInput(currentThrust, Component.translatable("mode.flightassistant.thrust.speed"))
-        }
         val currentSpeed: Double = computers.data.forwardVelocityPerSecond.length()
-        val acceleration: Double = computers.data.forwardAcceleration * 20.0
+        val acceleration: Double = computers.data.forwardAcceleration * SharedConstants.TICKS_PER_SECOND
 
         val speedCorrection: Double = (targetSpeed - currentSpeed) * FATickCounter.timePassed.pow(1.5f)
         val accelerationDamping: Double = -acceleration * FATickCounter.timePassed

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/modes/BuiltInVerticalModes.kt

@@ -6,7 +6,6 @@ import net.minecraft.util.Mth
 import org.joml.Vector2d
 import ru.octol1ttle.flightassistant.api.autoflight.ControlInput
 import ru.octol1ttle.flightassistant.api.computer.ComputerBus
-import ru.octol1ttle.flightassistant.api.util.FATickCounter
 import ru.octol1ttle.flightassistant.api.util.PIDController
 import ru.octol1ttle.flightassistant.api.util.extensions.getProgressOnTrack
 import ru.octol1ttle.flightassistant.api.util.extensions.vec2dFromInts
@@ -20,24 +19,17 @@ data class PitchVerticalMode(override val targetPitch: Float, override val textO
 
 data class VerticalSpeedVerticalMode(val targetVerticalSpeed: Double, override val textOverride: Component? = null) : AutoFlightComputer.VerticalMode {
     override fun getControlInput(computers: ComputerBus): ControlInput {
-        if (FATickCounter.ticksPassed == 0) {
-            return ControlInput(lastPitchCommand)
-        }
-
         val currentVerticalSpeed: Double = computers.data.velocityPerSecond.y
         val target: Float = controller.calculate(targetVerticalSpeed, currentVerticalSpeed, computers.data.pitch.toDouble()).toFloat()
-        lastPitchCommand = target
 
         return ControlInput(target)
     }
 
     companion object {
         private val controller: PIDController = PIDController(1.8, 0.1, 0.35, 10, -85.0, 85.0)
-        private var lastPitchCommand: Float = 0.0f
     }
 }
 
-// TODO: tick-based plsssssssss
 data class SelectedAltitudeVerticalMode(override val targetAltitude: Int, override val textOverride: Component? = null) : AutoFlightComputer.VerticalMode, AutoFlightComputer.FollowsAltitudeMode {
     override fun getControlInput(computers: ComputerBus): ControlInput {
         val diff: Double = targetAltitude - computers.data.altitude

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/data/HudDisplayDataComputer.kt

@@ -33,7 +33,7 @@ class HudDisplayDataComputer(computers: ComputerBus, private val mc: Minecraft)
     val roll: Float
         get() = degrees(atan2(-RenderMatrices.worldSpaceMatrix.m10(), RenderMatrices.worldSpaceMatrix.m11())).throwIfNotInRange(-180.0f..180.0f)
 
-    override fun tick() {
+    override fun renderTick() {
         lerpedPosition = player.getPosition(FATickCounter.partialTick)
         lerpedVelocity = player.getDeltaMovementLerped(FATickCounter.partialTick)
         lerpedForwardVelocity = computers.data.computeForwardVector(lerpedVelocity)