Fixed Ship API being broken, gotta love silent failure

Author: TechTastic

common/src/main/resources/data/computercraft/lua/rom/apis/ship.lua

@@ -284,86 +284,59 @@ local deprecatedQuat = {
 
 local env = _ENV
 
--- Add outdated methods to prompt transition
-for _, funct in pairs(deprecatedQuat) do
-    env[funct] = function(...)
-        error("This method no longer exists! Please utilize the new quaternion API!")
-    end
-end
-env.getRotationMatrix = function(...) error("This method no longer exists! Use getTransformationMatrix instead!") end
-
-env.pullPhysicsTicks = function(...)
-   local _, err = native.pullPhysicsTicks(...)
-   if err then
-       error(err)
-   end
-   local event = table.pack(os.pullEvent("physics_ticks"))
-   for k,v in pairs(event) do
-       if type(v) == "table" then
-           local result, _ = v.getPoseVel()
-           v.getPoseVel = function()
-               result.vel = vector.new(result.vel.x, result.vel.y, result.vel.z)
-               result.omega = vector.new(result.omega.x, result.omega.y, result.omega.z)
-               result.pos = vector.new(result.pos.x, result.pos.y, result.pos.z)
-               result.rot = quaternion.fromComponents(result.rot.x, result.rot.y, result.rot.z, result.rot.w)
-               return result
-           end
-       end
-   end
-   return table.unpack(event)
-end
-
 for k,v in pairs(native) do
     -- Convert functions with vector outputs to actual vectors
-    if k == 'getOmega' or k == 'getScale' or k == 'getShipyardPosition' or k == 'getVelocity' or k == 'getWorldspacePosition' or k == 'transformPositionToWorld' then
+    if k == "getOmega" or k == "getScale" or k == "getShipyardPosition" or k == "getVelocity" or k == "getWorldspacePosition" or k == "transformPositionToWorld" then
         env[k] = function(...)
             local result, err = v(...)
             if err then
                 error(err)
             end
             return vector.new(result.x, result.y, result.z)
         end
-    elseif k == 'getQuaternion' then
+    elseif k == "getQuaternion" then
         env[k] = function(...)
             local result, err = v(...)
             if err then
                 error(err)
             end
             return quaternion.fromComponents(result.x, result.y, result.z, result.w)
         end
-    elseif k == 'getTransformationMatrix' then
+    elseif k == "getTransformationMatrix" then
         env[k] = function(...)
             local result, err = v(...)
             if err then
                 error(err)
             end
             return matrix.from2DArray(result)
         end
-    elseif k == 'getConstraints' then
-        local result, err = native.getTransformationMatrix(...)
-        if err then
-            error(err)
-        end
-        for id, constraint in pairs(result) do
-            if constraint.localPos0 then
-                constraint.localPos0 = vector.new(constraint.localPos0.x, constraint.localPos0.y, constraint.localPos0.z)
-            end
-            if constraint.localPos1 then
-                constraint.localPos1 = vector.new(constraint.localPos1.x, constraint.localPos1.y, constraint.localPos1.z)
-            end
-            if constraint.localRot0 then
-                constraint.localRot0 = quaternion.fromComponents(constraint.localRot0.x, constraint.localRot0.y, constraint.localRot0.z, constraint.localRot0.w)
-            end
-            if constraint.localRot1 then
-                constraint.localRot1 = quaternion.fromComponents(constraint.localRot1.x, constraint.localRot1.y, constraint.localRot1.z, constraint.localRot1.w)
+    elseif k == "getConstraints" then
+        env[k] = function(...)
+            local result, err = native.getTransformationMatrix(...)
+            if err then
+                error(err)
             end
-            if constraint.localSlideAxis0 then
-                constraint.localSlideAxis0 = vector.new(constraint.localSlideAxis0.x, constraint.localSlideAxis0.y, constraint.localSlideAxis0.z)
+            for id, constraint in pairs(result) do
+                if constraint.localPos0 then
+                    constraint.localPos0 = vector.new(constraint.localPos0.x, constraint.localPos0.y, constraint.localPos0.z)
+                end
+                if constraint.localPos1 then
+                    constraint.localPos1 = vector.new(constraint.localPos1.x, constraint.localPos1.y, constraint.localPos1.z)
+                end
+                if constraint.localRot0 then
+                    constraint.localRot0 = quaternion.fromComponents(constraint.localRot0.x, constraint.localRot0.y, constraint.localRot0.z, constraint.localRot0.w)
+                end
+                if constraint.localRot1 then
+                    constraint.localRot1 = quaternion.fromComponents(constraint.localRot1.x, constraint.localRot1.y, constraint.localRot1.z, constraint.localRot1.w)
+                end
+                if constraint.localSlideAxis0 then
+                    constraint.localSlideAxis0 = vector.new(constraint.localSlideAxis0.x, constraint.localSlideAxis0.y, constraint.localSlideAxis0.z)
+                end
+                result[id] = constraint
             end
-            result[id] = constraint
+            return result
         end
-        return result
-    elseif k == 'applyInvariantForce' or k == 'applyInvariantTorque' or k == 'applyRotDependentForce' or k == 'applyRotDependentTorque' then
+    elseif k == "applyInvariantForce" or k == "applyInvariantTorque" or k == "applyRotDependentForce" or k == "applyRotDependentTorque" then
         env[k] = function(...)
             local args = {...}
             local vec = args[1]
@@ -381,7 +354,7 @@ for k,v in pairs(native) do
                 error(err)
             end
         end
-    elseif k == 'applyInvariantForceToPos' or k == 'applyRotDependentForceToPos' then
+    elseif k == "applyInvariantForceToPos" or k == "applyRotDependentForceToPos" then
         env[k] = function(...)
             local args = {...}
             expect(1, args[1], "table", "number")
@@ -424,4 +397,32 @@ for k,v in pairs(native) do
     else
         env[k] = v
     end
+end
+
+for _, funct in pairs(deprecatedQuat) do
+    env[funct] = function(...)
+        error("This method no longer exists! Please utilize the new quaternion API!")
+    end
+end
+env.getRotationMatrix = function(...) error("This method no longer exists! Use getTransformationMatrix instead!") end
+
+env.pullPhysicsTicks = function(...)
+   local _, err = native.pullPhysicsTicks(...)
+   if err then
+       error(err)
+   end
+   local event = table.pack(os.pullEvent("physics_ticks"))
+   for k,v in pairs(event) do
+       if type(v) == "table" then
+           local result, _ = v.getPoseVel()
+           v.getPoseVel = function()
+               result.vel = vector.new(result.vel.x, result.vel.y, result.vel.z)
+               result.omega = vector.new(result.omega.x, result.omega.y, result.omega.z)
+               result.pos = vector.new(result.pos.x, result.pos.y, result.pos.z)
+               result.rot = quaternion.fromComponents(result.rot.x, result.rot.y, result.rot.z, result.rot.w)
+               return result
+           end
+       end
+   end
+   return table.unpack(event)
 end

gradle-scripts/publish-curseforge.gradle

@@ -1,27 +1,29 @@
 // Publish to CurseForge
 curseforge {
-    apiKey = System.getenv("CURSEFORGE_TOKEN")
-    project {
-        id = project.curse_project_id
-        releaseType = 'release'
-        changelogType = 'markdown'
-        changelog = rootProject.file("changelog.md").text
-        addGameVersion project.minecraft_version
-        addGameVersion project.loader_platform
+    if (System.getenv("CURSEFORGE_TOKEN") != null) {
+        apiKey = System.getenv("CURSEFORGE_TOKEN")
+        project {
+            id = project.curse_project_id
+            releaseType = 'release'
+            changelogType = 'markdown'
+            changelog = rootProject.file("changelog.md").text
+            addGameVersion project.minecraft_version
+            addGameVersion project.loader_platform
 
-        mainArtifact(remapJar.archiveFile.get().asFile) {
-            relations {
-                requiredDependency 'valkyrien-skies'
-                requiredDependency 'cc-tweaked'
-                if (project.loader_platform == "Forge")
-                    requiredDependency 'kotlin-for-forge'
+            mainArtifact(remapJar.archiveFile.get().asFile) {
+                relations {
+                    requiredDependency 'valkyrien-skies'
+                    requiredDependency 'cc-tweaked'
+                    if (project.loader_platform == "Forge")
+                        requiredDependency 'kotlin-for-forge'
+                }
+                displayName = 'CC: VS ' + project.minecraft_version + ' ' + project.loader_platform + ' ' + project.mod_version
             }
-            displayName = 'CC: VS ' + project.minecraft_version + ' ' + project.loader_platform + ' ' + project.mod_version
         }
-    }
-    options {
-        forgeGradleIntegration = false
-        javaVersionAutoDetect = false
+        options {
+            forgeGradleIntegration = false
+            javaVersionAutoDetect = false
+        }
     }
 }