Gutted and Re-wrote All of KubeVS, God Help Me

Author: TechTastic

.gitignore

@@ -16,5 +16,4 @@ classes/
 .metadata
 .vscode
 .settings
-*.launch
-/.architectury-transformer/debug.log
+*.launch

README.md

@@ -1,7 +1,148 @@
-![kubevs_logo](https://github.com/TechTastic/kubevs/assets/74630543/8787de6e-7b64-45dd-b7e9-5bbabd39e8df)
+![kubevs_logo](https://raw.githubusercontent.com/TechTastic/kubevs/refs/heads/1.18.x/main/forge/src/main/resources/logo.png)
 # KubeVS
 A KubeJS x Valkyrien Skies 2 integration addon!
 
-Wiki: https://github.com/TechTastic/kubevs/wiki
-
 Discord: https://discord.gg/CgApHqxZXX
+
+---
+
+### Bindings
+This addon was half-forced to add quite a few new bindings for VS-related classes.
+
+##### Common Bindings
+- Ship
+- LoadedShip
+- LoadedShipCore
+- Vector3i
+- Vector3ic
+- Vector3d
+- Vector3dc
+- Vector3f
+- Vector3fc
+- AABBi
+- AABBic
+- AABBd
+- AABBdc
+- AABBf
+- AABBfc
+- Matrix2d
+- Matrix2dc
+- Matrix2f
+- Matrix2dc
+- Matrix3d
+- Matrix3dc
+- Matrix3f
+- Matrix3dc
+- DenseBlockPosSet
+- BlockType
+- VSGameUtilsKt
+- VectorConversionsKt
+- VectorConversionsMCKt
+- ShipAssemblyKt
+
+##### Server Bindings
+- ServerShip
+- LoadedServerShip
+- ServerShipCore
+- ServerShipWorld
+- ServerShipWorldCore
+- BlockStateInfo
+  - Only for `get` which returns the mass and BlockType of a given BlockState as a pair.
+
+##### Client Bindings
+- ClientShip
+- ClientShipCore
+- ClientShipWorld
+- ClientShipWorldCore
+
+---
+
+### Attachments
+This addon also adds new fields to Server, Level, and Player.
+
+##### Server Attachments
+- serverShipObjectWorld
+- vsPipeline
+
+##### Level Attachments
+- shipObjectWorld
+- allShips
+- dimensionId
+- shipWorldNullable
+
+##### ServerLevel Attachments
+- serverShipObjectWorld
+
+##### ClientLevel Attachments
+- clientShipObjectWorld
+
+##### Player Attachments
+- dimensionId
+- draggingInformation
+
+---
+
+### Startup Events
+#### vs.blockstate.info
+This event is fired upon startup and cannot be cancelled.
+It is used to register callbacks to be called upon resolving mass and BlockTypes for BlockStates.
+
+This code sets all BlockStates to provide 0kg of mass and have the BlockType (and thus collision) of Air.
+```javascript
+onEvent('vs.blockstate.info', event => {
+    event.mass(state => {
+        return 0
+    })
+    
+    event.type(state => {
+        return BlockType.AIR
+    })
+})
+```
+
+---
+
+### Server Events
+#### vs.ship.load
+This event is fired upon a Ship being loaded and cannot be cancelled.
+
+This code prints out the Slug of a Ship as the Ship is loaded.
+```javascript
+onEvent('vs.ship.load', event => {
+    var ship = event.getShipObjectServer()
+    console.log("Ship Name: " + ship.getSlug())
+})
+```
+
+#### vs.ship.phys
+This event is fired upon the physics tick of a Ship and cannot be cancelled.
+
+This code flings the Ship up into the air along the world's Y axis by a force of 100x the Ship's mass in Newtons.
+```javascript
+onEvent('vs.ship.phys', event => {
+    event.physShip.applyInvariantForce(Vector3d(0.0, 100.0 * event.physShip.inertia.shipMass, 0.0))
+})
+```
+
+### Client Events
+#### vs.ship.load
+This event is fired upon a Ship being loaded and cannot be cancelled.
+
+This code prints out the Slug of a Ship as the Ship is loaded.
+```javascript
+onEvent('vs.ship.load', event => {
+    var ship = event.getShipObjectClient()
+    console.log("Ship Name: " + ship.getSlug())
+})
+```
+
+#### vs.ship.render
+This event is fired after a Ship is rendered and cannot be cancelled.
+
+```javascript
+onEvent('vs.ship.load', event => {
+    var ship = event.getClientShip()
+    
+    // TBH, theres not much I can think of putting here.
+})
+```

build.gradle

@@ -13,6 +13,11 @@ plugins {
     id "com.modrinth.minotaur" version "2.4.5" apply false
 }
 
+// Determine the version
+String platform = String.valueOf(loader_platform).toLowerCase()
+
+version = minecraft_version + "-" + platform + "-" + mod_version
+
 architectury {
     minecraft = rootProject.minecraft_version
 }
@@ -33,6 +38,13 @@ subprojects {
             name = "ParchmentMC"
             url = "https://maven.parchmentmc.org"
         }
+        maven {
+            // saps.dev Maven (KubeJS and Rhino)
+            url = "https://maven.saps.dev/releases"
+            content {
+                includeGroup "dev.latvian.mods"
+            }
+        }
     }
 
     dependencies {
@@ -83,7 +95,7 @@ allprojects {
     apply plugin: "maven-publish"
 
     archivesBaseName = rootProject.archives_base_name
-    version = rootProject.mod_version
+    version = rootProject.version
     group = rootProject.maven_group
 
     repositories {
@@ -103,13 +115,6 @@ allprojects {
                 }
             }
         }
-        maven {
-            // saps.dev Maven (KubeJS and Rhino)
-            url = "https://maven.saps.dev/releases"
-            content {
-                includeGroup "dev.latvian.mods"
-            }
-        }
     }
 
     tasks.withType(JavaCompile) {

changelog.md

@@ -0,0 +1,7 @@
+Gutted and Re-wrote All of KubeVS from scratch :)
+
+## Changes
+- Replaced `vs.info.init` with `vs.blockstate.info` event and remade it as a Startup Event (they are different I swear)
+- Removed `vs.ship.game_tick`
+- Renamed `vs.ship.phys_tick` to `vs.ship.phys`
+- Added `ShipAssemblyKt` to bindings

common/build.gradle

@@ -11,10 +11,13 @@ dependencies {
     // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
+    // Architectury API
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 
+    // Valkyrien Skies 2
     modApi("org.valkyrienskies:valkyrienskies-118-common:${rootProject.vs2_version}")
 
+    // VS Core
     compileOnly("org.valkyrienskies.core:api:${rootProject.vs_core_version}")
     compileOnly("org.valkyrienskies.core:api-game:${rootProject.vs_core_version}")
     compileOnly("org.valkyrienskies.core:util:${rootProject.vs_core_version}")
@@ -23,7 +26,8 @@ dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
     api "org.jetbrains.kotlin:kotlin-reflect:1.9.10"
 
-    modImplementation("dev.latvian.mods:kubejs:${kubejs_version}")
+    // KubeJS
+    modCompileOnly("dev.latvian.mods:kubejs:${kubejs_version}")
 }
 
 publishing {

…tastic/kubevs/KubeVSJavaIntegration.java …/kubevs/bindings/KubeVSJavaBindings.javacommon/src/main/java/io/github/techtastic/kubevs/KubeVSJavaIntegration.java renamed to common/src/main/java/io/github/techtastic/kubevs/bindings/KubeVSJavaBindings.java common/src/main/java/io/github/techtastic/kubevs/KubeVSJavaIntegration.java renamed to common/src/main/java/io/github/techtastic/kubevs/bindings/KubeVSJavaBindings.java

@@ -1,18 +1,16 @@
-package io.github.techtastic.kubevs;
+package io.github.techtastic.kubevs.bindings;
 
 import dev.latvian.mods.kubejs.script.BindingsEvent;
-import io.github.techtastic.kubevs.util.BlockStateInfoJS;
 import org.valkyrienskies.core.util.VectorConversionsKt;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
+import org.valkyrienskies.mod.common.assembly.ShipAssemblyKt;
 import org.valkyrienskies.mod.common.util.VectorConversionsMCKt;
 
-public class KubeVSJavaIntegration {
+public class KubeVSJavaBindings {
     public static void addBindings(BindingsEvent event) {
         event.add("VSGameUtilsKt", VSGameUtilsKt.class);
         event.add("VectorConversionsKt", VectorConversionsKt.class);
         event.add("VectorConversionsMCKt", VectorConversionsMCKt.class);
-
-        if (event.type.isServer())
-            event.add("BlockStateInfo", BlockStateInfoJS.INSTANCE);
+        event.add("ShipAssemblyKt", ShipAssemblyKt.class);
     }
 }

common/src/main/kotlin/io/github/techtastic/kubevs/KubeVS.kt

@@ -0,0 +1,15 @@
+package io.github.techtastic.kubevs
+
+import io.github.techtastic.kubevs.registry.KubeVSBSIP
+
+object KubeVS {
+    const val MOD_ID = "kubevs"
+
+    @JvmStatic
+    fun init() {
+        KubeVSBSIP.register()
+    }
+
+    @JvmStatic
+    fun initClient() {}
+}