Updating to VS2.5

Author: TechTastic

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id "architectury-plugin" version "3.4.146"
     id "dev.architectury.loom" version "1.3.355" apply false
     // Kotlin
-    id "org.jetbrains.kotlin.jvm" version "1.9.10" apply false
+    id "org.jetbrains.kotlin.jvm" version "2.1.0" apply false
     // Kotlin linter
     id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
     // Java linter

changelog.md

@@ -1,7 +1 @@
-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
+# Updating to VS2.5

common/build.gradle

@@ -23,8 +23,8 @@ dependencies {
     compileOnly("org.valkyrienskies.core:util:${rootProject.vs_core_version}")
     compileOnly("org.valkyrienskies.core:impl:${rootProject.vs_core_version}")
 
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
-    api "org.jetbrains.kotlin:kotlin-reflect:1.9.10"
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0"
+    api "org.jetbrains.kotlin:kotlin-reflect:2.1.0"
 
     // KubeJS
     modCompileOnly("dev.latvian.mods:kubejs:${kubejs_version}")

common/src/main/java/io/github/techtastic/kubevs/bindings/KubeVSJavaBindings.java

@@ -1,16 +1,12 @@
 package io.github.techtastic.kubevs.bindings;
 
 import dev.latvian.mods.kubejs.script.BindingsEvent;
-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;
+import org.valkyrienskies.mod.api.ValkyrienSkies;
+import org.valkyrienskies.mod.common.assembly.ShipAssembler;
 
 public class KubeVSJavaBindings {
     public static void addBindings(BindingsEvent event) {
-        event.add("VSGameUtilsKt", VSGameUtilsKt.class);
-        event.add("VectorConversionsKt", VectorConversionsKt.class);
-        event.add("VectorConversionsMCKt", VectorConversionsMCKt.class);
-        event.add("ShipAssemblyKt", ShipAssemblyKt.class);
+        event.add("ShipAssemblyKt", ShipAssembler.class);
+        event.add("ValkyrienSkies", ValkyrienSkies.class);
     }
 }

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

@@ -1,13 +1,17 @@
 package io.github.techtastic.kubevs
 
 import io.github.techtastic.kubevs.registry.KubeVSBSIP
+import io.github.techtastic.kubevs.ship.KubeVSShipAccess
+import org.valkyrienskies.mod.api.vsApi
 
 object KubeVS {
     const val MOD_ID = "kubevs"
 
     @JvmStatic
     fun init() {
         KubeVSBSIP.register()
+
+        vsApi.registerAttachment(KubeVSShipAccess::class.java)
     }
 
     @JvmStatic

common/src/main/kotlin/io/github/techtastic/kubevs/plugin/KubeVSEvents.kt

@@ -5,9 +5,8 @@ import io.github.techtastic.kubevs.registry.KubeVSBSIP
 import io.github.techtastic.kubevs.util.BlockTypeJS
 import net.minecraft.world.level.block.state.BlockState
 import org.valkyrienskies.core.api.ships.ClientShip
+import org.valkyrienskies.core.api.ships.LoadedServerShip
 import org.valkyrienskies.core.impl.game.ships.PhysShipImpl
-import org.valkyrienskies.core.impl.game.ships.ShipObjectClient
-import org.valkyrienskies.core.impl.game.ships.ShipObjectServer
 import org.valkyrienskies.core.impl.hooks.VSEvents
 import org.valkyrienskies.mod.common.hooks.VSGameEvents
 import java.util.function.Function
@@ -17,7 +16,7 @@ object KubeVSEvents {
     // Server Events
 
 
-    class ShipLoadServerEvent(val shipObjectServer: ShipObjectServer): EventJS() {
+    class ShipLoadServerEvent(val loadedServerShip: LoadedServerShip): EventJS() {
         constructor(event: VSEvents.ShipLoadEvent) : this(event.ship)
 
         override fun canCancel() = false
@@ -32,7 +31,7 @@ object KubeVSEvents {
     // Client Events
 
 
-    class ShipLoadClientEvent(val shipObjectClient: ShipObjectClient): EventJS() {
+    class ShipLoadClientEvent(val clientShip: ClientShip): EventJS() {
         constructor(event: VSEvents.ShipLoadEventClient) : this(event.ship)
 
         override fun canCancel() = false

common/src/main/kotlin/io/github/techtastic/kubevs/plugin/KubeVSPlugin.kt

@@ -23,6 +23,7 @@ import net.minecraft.server.level.ServerLevel
 import net.minecraft.world.entity.player.Player
 import org.joml.*
 import org.joml.primitives.*
+import org.valkyrienskies.core.api.VsCoreApi
 import org.valkyrienskies.core.api.ships.*
 import org.valkyrienskies.core.api.world.ClientShipWorld
 import org.valkyrienskies.core.api.world.ServerShipWorld
@@ -35,7 +36,10 @@ import org.valkyrienskies.core.apigame.world.ServerShipWorldCore
 import org.valkyrienskies.core.apigame.world.chunks.BlockType
 import org.valkyrienskies.core.impl.hooks.VSEvents
 import org.valkyrienskies.core.util.datastructures.DenseBlockPosSet
+import org.valkyrienskies.mod.api.vsApi
+import org.valkyrienskies.mod.api_impl.events.VsApiImpl
 import org.valkyrienskies.mod.common.*
+import org.valkyrienskies.mod.common.assembly.createNewShipWithBlocks
 import org.valkyrienskies.mod.common.hooks.VSGameEvents
 import org.valkyrienskies.mod.common.util.IEntityDraggingInformationProvider
 
@@ -129,6 +133,7 @@ class KubeVSPlugin: KubeJSPlugin() {
         filter.deny(BlockStateInfoProvider::class.java)
         filter.deny(BlockStateInfo::class.java)
         filter.deny(KubeVSBSIP::class.java)
+        filter.deny(VsCoreApi::class.java)
 
         if (type.isServer)
             filter.allow("org.valkyrienskies.mod.common.BlockStateInfo.INSTANCE.get")

common/src/main/kotlin/io/github/techtastic/kubevs/registry/KubeVSBSIP.kt

@@ -7,22 +7,11 @@ import net.minecraft.world.level.block.state.BlockState
 import org.valkyrienskies.core.apigame.world.chunks.BlockType
 import org.valkyrienskies.mod.common.BlockStateInfo
 import org.valkyrienskies.mod.common.BlockStateInfoProvider
-import org.valkyrienskies.physics_api.Lod1BlockStateId
-import org.valkyrienskies.physics_api.Lod1LiquidBlockStateId
-import org.valkyrienskies.physics_api.Lod1SolidBlockStateId
-import org.valkyrienskies.physics_api.voxel.Lod1LiquidBlockState
-import org.valkyrienskies.physics_api.voxel.Lod1SolidBlockState
 import java.util.function.Function
 
 object KubeVSBSIP : BlockStateInfoProvider {
-    override val blockStateData: List<Triple<Lod1SolidBlockStateId, Lod1LiquidBlockStateId, Lod1BlockStateId>>
-        get() = listOf()
-    override val liquidBlockStates: List<Lod1LiquidBlockState>
-        get() = listOf()
     override val priority: Int
         get() = 300
-    override val solidBlockStates: List<Lod1SolidBlockState>
-        get() = listOf()
 
     lateinit var MASS_CALLBACK: Function<BlockState, Double?>
     lateinit var TYPE_CALLBACK: Function<BlockState, BlockTypeJS?>

common/src/main/kotlin/io/github/techtastic/kubevs/ship/KubeVSShipAccess.kt

@@ -2,6 +2,7 @@ package io.github.techtastic.kubevs.ship
 
 import dev.latvian.mods.kubejs.script.ScriptType
 import io.github.techtastic.kubevs.plugin.KubeVSEvents
+import org.valkyrienskies.core.api.attachment.getOrPutAttachment
 import org.valkyrienskies.core.api.ships.*
 import org.valkyrienskies.core.impl.game.ships.PhysShipImpl
 
@@ -12,9 +13,9 @@ class KubeVSShipAccess: ShipForcesInducer {
 
     companion object {
         fun getOrCreateAccess(ship: LoadedServerShip): KubeVSShipAccess {
-            return ship.getAttachment<KubeVSShipAccess>() ?: run {
+            return ship.getOrPutAttachment<KubeVSShipAccess> {
                 val access = KubeVSShipAccess()
-                ship.saveAttachment<KubeVSShipAccess>(access)
+                ship.setAttachment(access)
                 access
             }
         }

gradle-scripts/publish-curseforge.gradle

@@ -4,7 +4,7 @@ curseforge {
         apiKey = project.curse_api_key
         project {
             id = project.curse_project_id
-            releaseType = 'release'
+            releaseType = 'alpha'
             changelogType = 'markdown'
             changelog = rootProject.file("changelog.md").text
             addGameVersion project.minecraft_version
@@ -31,7 +31,7 @@ curseforge {
 modrinth {
     token = project.modrinth_api_key
     projectId = project.modrinth_project_id
-    versionType = "release"
+    versionType = "alpha"
     versionName = 'KubeVS ' + project.minecraft_version + '-' + project.loader_platform.toLowerCase() + '-' + project.mod_version
     versionNumber = project.mod_version
     uploadFile = remapJar.archiveFile.get().asFile