Backporting 1.20.1/main and finally putting this branch to rest

Author: TechTastic

changelog.md

@@ -1,17 +1,7 @@
 # Changes
-### Ship API
-- Made `getOmega`, `getScale`, `getShipyardPosition`, `getVelocity`, `getWorldspacePosition`, and `transformPositionToWorld` output proper `vector`s with correct metatable
-- Made `getQuaternion` output a proper `quaternion` with correct metatable
-- Made `getTransformationMatrix` output a proper `matrix` with correct metatable
-- Made `getConstraints` output use proper `vector`s and `quaternion`s where applicable
-- Re-added `getEulerAnglesZYX"`, `getEulerAnglesZXY`, `getEulerAnglesYXZ`, `getEulerAnglesXYZ`, `getRoll`, `getYaw`, `getPitch`, and `getRotationMatrix` ***only*** so they throw a more useful error redirecting to the new methods.
-- Updated Ship API help page
-- Iproved `physics_ticks` event output
-- Moved `physics_ticks` event to Ship API
-- Added `pullPhysicsTicks` to utilize `physics_ticks` with proper `vector` and `quaternion` support
-### Quaternion API
-- Moved to [CC: Advanced Math Library](https://github.com/TechTastic/Advanced-Math)
-### Extended Ship API
-- Moved `physics_ticks` event to Ship API
-### New APIs
-- [CC: Advanced Math Library](https://github.com/TechTastic/Advanced-Math) created and included to handle pure Lua math including `quaternion` and `matrix` APIs, as well as a new `pid` module
+- Fixed Physics Ticks Event Handler only responding to one computer only
+- Fixed Ship API missing methods
+- Merged Extended Ship API into Ship API
+- New documentation via LDoc (targeting `1.20.x/main`)
+
+# This version is now officially dead and archived!

common/build.gradle

@@ -6,10 +6,17 @@ loom {
     accessWidenerPath = file("src/main/resources/cc_vs.accesswidener")
 }
 
+repositories {
+    maven {
+        url "maven.fabricmc.net"
+    }
+}
+
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modCompileOnly "net.fabricmc.fabric-api:fabric-screen-handler-api-v1:1.0.0+045df74f45"
 
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 

common/src/main/kotlin/io/github/techtastic/cc_vs/CCVSMod.kt

@@ -1,6 +1,7 @@
 package io.github.techtastic.cc_vs
 
 import io.github.techtastic.cc_vs.ship.PhysTickEventHandler
+import io.github.techtastic.cc_vs.ship.PhysicsTicksEventHandler
 import org.valkyrienskies.core.impl.hooks.VSEvents
 
 object CCVSMod {
@@ -9,6 +10,10 @@ object CCVSMod {
     @JvmStatic
     fun init() {
         VSEvents.shipLoadEvent.on { huh -> huh.ship.setAttachment(PhysTickEventHandler::class.java, null) }
+
+        VSEvents.tickEndEvent.on { huh -> huh.world.loadedShips.forEach { ship ->
+            PhysicsTicksEventHandler.getOrCreateControl(ship).resetData()
+        } }
     }
 
     @JvmStatic

common/src/main/kotlin/io/github/techtastic/cc_vs/apis/ExtendedShipAPI.kt

@@ -5,23 +5,30 @@ import dan200.computercraft.api.lua.ILuaAPI
 import dan200.computercraft.api.lua.LuaException
 import dan200.computercraft.api.lua.LuaFunction
 import dan200.computercraft.shared.computer.blocks.TileComputer
-import dan200.computercraft.shared.computer.core.ServerComputer
+import dan200.computercraft.shared.computer.core.ComputerFamily
 import io.github.techtastic.cc_vs.PlatformUtils
 import io.github.techtastic.cc_vs.mixin.ShipObjectWorldAccessor
 import io.github.techtastic.cc_vs.ship.PhysicsTicksEventHandler
+import io.github.techtastic.cc_vs.ship.QueuedForcesApplier
 import io.github.techtastic.cc_vs.util.CCVSUtils.toLua
 import io.github.techtastic.cc_vs.util.CCVSUtils.toVector
 import net.minecraft.core.BlockPos
 import net.minecraft.server.level.ServerLevel
-import org.joml.Vector3d
-import org.joml.Vector4d
+import org.joml.*
 import org.joml.primitives.AABBi
 import org.valkyrienskies.core.api.ships.LoadedServerShip
 import org.valkyrienskies.core.apigame.constraints.VSConstraintAndId
+import org.valkyrienskies.core.impl.game.ShipTeleportDataImpl
 import org.valkyrienskies.mod.common.getShipObjectManagingPos
 import org.valkyrienskies.mod.common.shipObjectWorld
+import org.valkyrienskies.mod.common.vsCore
 
 open class ShipAPI(val level: ServerLevel, val pos: BlockPos) : ILuaAPI {
+    private fun verifyAdmin() {
+        if (PlatformUtils.isCommandOnly() && (level.getBlockEntity(pos) as? TileComputer)?.family == ComputerFamily.COMMAND)
+            throw LuaException("This method requires a Command Computer!")
+    }
+
     override fun startup() {
         try {
             if (PlatformUtils.exposePhysTick())
@@ -34,10 +41,7 @@ open class ShipAPI(val level: ServerLevel, val pos: BlockPos) : ILuaAPI {
         try {
             if (PlatformUtils.exposePhysTick()) {
                 val data = PhysicsTicksEventHandler.getOrCreateControl(getShip()).getData()
-                val clazz = TileComputer::class.java
-                val method = clazz.getMethod("getServerComputer")
-                val obj = method.invoke(level.getBlockEntity(pos))
-                (obj as? ServerComputer)?.queueEvent("physics_ticks", data)
+                (level.getBlockEntity(pos) as? TileComputer)?.let { computer -> computer.serverComputer?.queueEvent("physics_ticks", data) }
             }
         } catch (_: LuaException) {}
         super.update()
@@ -156,4 +160,113 @@ open class ShipAPI(val level: ServerLevel, val pos: BlockPos) : ILuaAPI {
             accessor.constraints[id]?.let { VSConstraintAndId(id, it) }
         }.map { combo -> combo?.toLua() }
     }
+
+    @LuaFunction
+    fun applyInvariantForce(forceX: Double, forceY: Double, forceZ: Double) {
+        verifyAdmin()
+        QueuedForcesApplier.getOrCreateControl(getShip()).applyInvariantForce(Vector3d(forceX, forceY, forceZ))
+    }
+
+    @LuaFunction
+    fun applyInvariantTorque(torqueX: Double, torqueY: Double, torqueZ: Double) {
+        verifyAdmin()
+        QueuedForcesApplier.getOrCreateControl(getShip()).applyInvariantTorque(Vector3d(torqueX, torqueY, torqueZ))
+    }
+
+    @LuaFunction
+    fun applyInvariantForceToPos(forceX: Double, forceY: Double, forceZ: Double, posX: Double, posY: Double, posZ: Double) {
+        verifyAdmin()
+        QueuedForcesApplier.getOrCreateControl(getShip()).applyInvariantForceToPos(Vector3d(forceX, forceY, forceZ), Vector3d(posX, posY, posZ))
+    }
+
+    @LuaFunction
+    fun applyRotDependentForce(forceX: Double, forceY: Double, forceZ: Double) {
+        verifyAdmin()
+        QueuedForcesApplier.getOrCreateControl(getShip()).applyRotDependentForce(Vector3d(forceX, forceY, forceZ))
+    }
+
+    @LuaFunction
+    fun applyRotDependentTorque(torqueX: Double, torqueY: Double, torqueZ: Double) {
+        verifyAdmin()
+        QueuedForcesApplier.getOrCreateControl(getShip()).applyRotDependentTorque(Vector3d(torqueX, torqueY, torqueZ))
+    }
+
+    @LuaFunction
+    fun applyRotDependentForceToPos(forceX: Double, forceY: Double, forceZ: Double, posX: Double, posY: Double, posZ: Double) {
+        verifyAdmin()
+        QueuedForcesApplier.getOrCreateControl(getShip()).applyRotDependentForceToPos(Vector3d(forceX, forceY, forceZ), Vector3d(posX, posY, posZ))
+    }
+
+    @LuaFunction
+    fun setStatic(b: Boolean) {
+        QueuedForcesApplier.getOrCreateControl(getShip()).setStatic(b)
+    }
+
+    @LuaFunction
+    fun setScale(scale: Double) {
+        vsCore.scaleShip(level.shipObjectWorld, getShip(), scale)
+    }
+
+    @LuaFunction
+    fun teleport(args: IArguments) {
+        if (!PlatformUtils.canTeleport())
+            throw LuaException("Teleporting is Disabled via CC: VS Config!")
+
+        val input = args.getTable(0)
+
+        var pos = getShip().transform.positionInWorld
+        if (input.containsKey("pos"))
+            pos = getVectorFromTable(input, "pos")
+
+        var rot = getShip().transform.shipToWorldRotation
+        if (input.containsKey("rot"))
+            rot = getQuaternionFromTable(input).normalize(Quaterniond())
+
+        var vel = getShip().velocity
+        if (input.containsKey("vel"))
+            vel = getVectorFromTable(input, "vel")
+
+        var omega = getShip().omega
+        if (input.containsKey("omega"))
+            omega = getVectorFromTable(input, "omega")
+
+        var dimension: String? = null
+        if (input.containsKey("dimension"))
+            dimension = (input["dimension"] ?: throwMalformedSectionError("dimension")) as String
+
+        var scale = getShip().transform.shipToWorldScaling.x()
+        if (input.containsKey("scale"))
+            scale = (input["scale"] ?: throwMalformedSectionError("scale")) as Double
+
+        val teleportData = ShipTeleportDataImpl(pos, rot, vel, omega, dimension, scale)
+
+        println("Rot: ${teleportData.newRot}\n")
+
+        //vsCore.teleportShip(this.level.shipObjectWorld, getShip(), teleportData)
+        level.shipObjectWorld.teleportShip(getShip(), teleportData)
+    }
+
+    private fun getVectorFromTable(input: Map<*, *>, section: String): Vector3dc {
+        val table = (input[section] ?: throwMalformedSectionError(section)) as Map<*, *>
+        return Vector3d(
+            (table["x"] ?: throwMalformedFieldError(section, "x")) as Double,
+            (table["y"] ?: throwMalformedFieldError(section, "y")) as Double,
+            (table["z"] ?: throwMalformedFieldError(section, "z")) as Double
+        )
+    }
+
+    private fun getQuaternionFromTable(input: Map<*, *>): Quaterniondc {
+        val table = (input["rot"] ?: throwMalformedSectionError("rot")) as Map<*, *>
+        return Quaterniond(
+            (table["x"] ?: throwMalformedFieldError("rot", "x")) as Double,
+            (table["y"] ?: throwMalformedFieldError("rot", "y")) as Double,
+            (table["z"] ?: throwMalformedFieldError("rot", "z")) as Double,
+            (table["w"] ?: throwMalformedFieldError("rot", "w")) as Double
+        )
+    }
+
+    private fun throwMalformedSectionError(section: String): Nothing =
+        throw LuaException("Malformed $section")
+    private fun throwMalformedFieldError(section: String, field: String): Nothing =
+        throw LuaException("Malformed $field key of $section")
 }

common/src/main/kotlin/io/github/techtastic/cc_vs/apis/ShipAPI.kt

@@ -19,11 +19,9 @@ class PhysicsTicksEventHandler: ShipForcesInducer {
     }
 
     @JsonIgnore
-    fun getData(): Array<LuaPhysShip> {
-        val data = this.queuedData.toTypedArray()
-        this.queuedData.clear()
-        return data
-    }
+    fun getData() = this.queuedData.toTypedArray()
+
+    fun resetData() = this.queuedData.clear()
 
     companion object {
         fun getOrCreateControl(ship: ServerShip): PhysicsTicksEventHandler {