support for latest vs2 version

common/src/main/java/io/github/xiewuzhiying/vs_addition/mixin/VSAdditionCommonMixinCanceller.java

@@ -11,9 +11,6 @@ public boolean shouldCancel(List<String> targetClassNames, String mixinClassName
         if (mixinClassName.contains("org.valkyrienskies.create_interactive.mixin.deployer")) {
             return VSAdditionConfig.COMMON.getInsteadCreateInteractiveDeployer();
         }
-        if (mixinClassName.contains("org.valkyrienskies.mod.mixin.feature.transform_particles")) {
-            return true;
-        }
         return false;
     }
 }

common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/VSAdditionMod.kt

@@ -1,8 +1,7 @@
 package io.github.xiewuzhiying.vs_addition
 
 import dev.architectury.platform.Platform
-import io.github.xiewuzhiying.vs_addition.compats.computercraft.PeripheralCommon
-import org.valkyrienskies.core.impl.config.VSConfigClass
+import org.valkyrienskies.mod.common.ValkyrienSkiesMod
 
 object VSAdditionMod {
     const val MOD_ID = "vs_addition"
@@ -29,7 +28,7 @@ object VSAdditionMod {
         FRAMEDBLOCKS_ACTIVE = Platform.isModLoaded("framedblocks")
         CBCMW_ACTIVE = Platform.isModLoaded("cbcmodernwarfare")
 
-        VSConfigClass.registerConfig("vs_addition", VSAdditionConfig::class.java)
+        ValkyrienSkiesMod.vsCore.registerConfigLegacy("vs_addition", VSAdditionConfig::class.java)
     }
 
     @JvmStatic

common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/util/TransformUtils.kt

@@ -19,9 +19,9 @@ import net.minecraft.world.phys.shapes.CollisionContext
 import org.joml.*
 import org.joml.primitives.AABBd
 import org.joml.primitives.AABBdc
+import org.valkyrienskies.core.api.ships.ClientShip
 import org.valkyrienskies.core.api.ships.Ship
 import org.valkyrienskies.core.api.ships.properties.ShipId
-import org.valkyrienskies.core.impl.game.ships.ShipObjectClient
 import org.valkyrienskies.mod.common.getShipManagingPos
 import org.valkyrienskies.mod.common.getShipsIntersecting
 import org.valkyrienskies.mod.common.shipObjectWorld
@@ -262,8 +262,8 @@ fun Level.clipIncludeShipsWrapper(ctx: ClipContext, clipFunction: (Level, ClipCo
         if (skipShips != null && skipShips.contains(ship.id)) {
             continue
         }
-        val worldToShip = (ship as? ShipObjectClient)?.renderTransform?.worldToShip ?: ship.worldToShip
-        val shipToWorld = (ship as? ShipObjectClient)?.renderTransform?.shipToWorld ?: ship.shipToWorld
+        val worldToShip = (ship as? ClientShip)?.renderTransform?.worldToShip ?: ship.worldToShip
+        val shipToWorld = (ship as? ClientShip)?.renderTransform?.shipToWorld ?: ship.shipToWorld
 
         ctx.setForm(worldToShip.transformPosition(ctx.from.toJOML()).toMinecraft())
         ctx.setTo(worldToShip.transformPosition(ctx.to.toJOML()).toMinecraft())

common/src/main/resources/vs_addition-common.mixins.json

@@ -43,10 +43,6 @@
     "valkyrienskies.MixinEntityShipCollisionUtils",
     "valkyrienskies.MixinMassDatapackResolver",
     "valkyrienskies.MixinVSCommands",
-    "valkyrienskies.disableLogs.MixinAl",
-    "valkyrienskies.disableLogs.MixinAy",
-    "valkyrienskies.disableLogs.MixinLevel",
-    "valkyrienskies.disableLogs.MixinShipObjectServerWorld",
     "vs_clockwork.MixinDyedWing",
     "vs_clockwork.fan.MixinEncasedFanBlockEntity",
     "vs_clockwork.fan.MixinEncasedFanCreateData",

fabric/src/main/java/io/github/xiewuzhiying/vs_addition/fabric/mixin/create/MixinCommonEvents.java

@@ -2,7 +2,7 @@
 
 
 import com.simibubi.create.foundation.events.CommonEvents;
-import io.xiewuzhiying.vs_addition.fabric.compats.create.behaviour.link.DualLinkHandler;
+import io.github.xiewuzhiying.vs_addition.fabric.compats.create.behaviour.link.DualLinkHandler;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;

fabric/src/main/kotlin/io/github/xiewuzhiying/vs_addition/fabric/VSAdditionModFabric.kt

@@ -0,0 +1,38 @@
+package io.github.xiewuzhiying.vs_addition.fabric
+
+import dan200.computercraft.api.peripheral.PeripheralLookup
+import io.github.xiewuzhiying.vs_addition.VSAdditionMod.CC_ACTIVE
+import io.github.xiewuzhiying.vs_addition.VSAdditionMod.init
+import io.github.xiewuzhiying.vs_addition.VSAdditionMod.initClient
+import io.github.xiewuzhiying.vs_addition.compats.computercraft.PeripheralCommon.registerGenericPeripheralCommon
+import io.github.xiewuzhiying.vs_addition.fabric.compats.computercraft.FabricPeripheralLookup.peripheralProvider
+import net.fabricmc.api.ClientModInitializer
+import net.fabricmc.api.ModInitializer
+import net.minecraft.core.BlockPos
+import net.minecraft.core.Direction
+import net.minecraft.world.level.Level
+import net.minecraft.world.level.block.entity.BlockEntity
+import net.minecraft.world.level.block.state.BlockState
+import org.valkyrienskies.mod.fabric.common.ValkyrienSkiesModFabric
+
+class VSAdditionModFabric : ModInitializer {
+    override fun onInitialize() {
+        ValkyrienSkiesModFabric().onInitialize()
+        init()
+
+        if (CC_ACTIVE) {
+            registerGenericPeripheralCommon()
+            PeripheralLookup.get()
+                .registerFallback { level: Level?, blockPos: BlockPos?, blockState: BlockState?, blockEntity: BlockEntity?, direction: Direction? ->
+                    peripheralProvider(
+                        level!!, blockPos!!
+                    )
+                }
+        }
+    }
+}
+class VSAdditionalModFabricClient : ClientModInitializer {
+    override fun onInitializeClient() {
+        initClient()
+    }
+}

fabric/src/main/kotlin/io/xiewuzhiying/vs_addition/fabric/compats/computercraft/FabricPeripheralLookup.kt → fabric/src/main/kotlin/io/github/xiewuzhiying/vs_addition/fabric/compats/computercraft/FabricPeripheralLookup.kt

@@ -1,4 +1,4 @@
-package io.xiewuzhiying.vs_addition.fabric.compats.computercraft
+package io.github.xiewuzhiying.vs_addition.fabric.compats.computercraft
 
 import dan200.computercraft.api.peripheral.IPeripheral
 import io.github.xiewuzhiying.vs_addition.compats.computercraft.PeripheralCommon
@@ -7,6 +7,9 @@ import net.minecraft.world.level.Level
 
 object FabricPeripheralLookup {
     fun peripheralProvider(level: Level, blockPos: BlockPos): IPeripheral? {
-        return PeripheralCommon.getPeripheralCommon(level, blockPos) ?: PeripheralFabric.getPeripheralFarbic(level, blockPos)
+        return PeripheralCommon.getPeripheralCommon(level, blockPos) ?: PeripheralFabric.getPeripheralFarbic(
+            level,
+            blockPos
+        )
     }
 }

fabric/src/main/kotlin/io/xiewuzhiying/vs_addition/fabric/compats/computercraft/PeripheralFabric.kt → fabric/src/main/kotlin/io/github/xiewuzhiying/vs_addition/fabric/compats/computercraft/PeripheralFabric.kt

@@ -1,4 +1,4 @@
-package io.xiewuzhiying.vs_addition.fabric.compats.computercraft
+package io.github.xiewuzhiying.vs_addition.fabric.compats.computercraft
 
 import dan200.computercraft.api.peripheral.IPeripheral
 import io.github.xiewuzhiying.vs_addition.compats.computercraft.PeripheralCommon.PeripheralSupplier

fabric/src/main/kotlin/io/xiewuzhiying/vs_addition/fabric/compats/create/behaviour/link/DualLinkHandler.kt → fabric/src/main/kotlin/io/github/xiewuzhiying/vs_addition/fabric/compats/create/behaviour/link/DualLinkHandler.kt

@@ -1,4 +1,4 @@
-package io.xiewuzhiying.vs_addition.fabric.compats.create.behaviour.link
+package io.github.xiewuzhiying.vs_addition.fabric.compats.create.behaviour.link
 
 import com.simibubi.create.AllItems
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour

fabric/src/main/kotlin/io/xiewuzhiying/vs_addition/fabric/compats/modmenu/VSAdditionModMenu.kt → fabric/src/main/kotlin/io/github/xiewuzhiying/vs_addition/fabric/compats/modmenu/VSAdditionModMenu.kt

@@ -1,17 +1,16 @@
-package io.xiewuzhiying.vs_addition.fabric.compats.modmenu
+package io.github.xiewuzhiying.vs_addition.fabric.compats.modmenu
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory
 import com.terraformersmc.modmenu.api.ModMenuApi
 import io.github.xiewuzhiying.vs_addition.VSAdditionConfig
-import org.valkyrienskies.core.impl.config.VSConfigClass
 import org.valkyrienskies.mod.compat.clothconfig.VSClothConfig
 
 class VSAdditionModMenu : ModMenuApi {
     override fun getModConfigScreenFactory(): ConfigScreenFactory<*> {
         return ConfigScreenFactory { parent ->
             VSClothConfig.createConfigScreenFor(
                 parent,
-                VSConfigClass.getRegisteredConfig(VSAdditionConfig::class.java)
+                VSAdditionConfig::class.java
             )
         }
     }

fabric/src/main/resources/fabric.mod.json

@@ -19,13 +19,10 @@
       "io.github.xiewuzhiying.vs_addition.fabric.VSAdditionModFabric"
     ],
     "client": [
-      "io.github.xiewuzhiying.vs_addition.fabric.VSAdditionModFabricClient"
-    ],
-    "preLaunch": [
-      "io.github.xiewuzhiying.vs_addition.fabric.ValkyrienPreLaunch"
+      "io.github.xiewuzhiying.vs_addition.fabric.VSAdditionalModFabricClient"
     ],
     "modmenu": [
-      "io.xiewuzhiying.vs_addition.fabric.compats.modmenu.VSAdditionModMenu"
+      "io.github.xiewuzhiying.vs_addition.fabric.compats.modmenu.VSAdditionModMenu"
     ]
   },
   "mixins": [

forge/build.gradle

@@ -74,9 +74,6 @@ dependencies {
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
 
-    // Kotlin for Forge
-    implementation "thedarkcolour:kotlinforforge:$forge_kotlin_version"
-
     // Create compats
     modImplementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
     modImplementation("com.jozufozu.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")