update gradle, update core, update quiltflower to vineflower

ValkyrienSkies · Sep 21, 2023 · b86112b · b86112b
1 parent 58550de
commit b86112b
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 225 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ plugins {
     // Needed for Forge+Fabric
     id "architectury-plugin" version "3.4.146"
     id "dev.architectury.loom" version "1.3.355" apply false
-    id 'io.github.juuxel.loom-quiltflower' version '1.8.0' apply false
+    id 'io.github.juuxel.loom-vineflower' version '1.11.0' apply false
     // Kotlin
     id "org.jetbrains.kotlin.jvm" version "1.9.10" apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
@@ -47,6 +47,10 @@ tasks.register("updateVsCore") {
         inputs.file(versionFile)
         outputs.file(gradleProperties)
         dependsOn(vsCoreBuild.task(":api-game:writeVersion"))
+
+        [':impl', ':api', ':api-game', ':util'].each {
+            dependsOn(vsCoreBuild.task("${it}:publishToMavenLocal"))
+        }
     } catch (UnknownDomainObjectException ignore) {}
 
     onlyIf {
@@ -64,7 +68,7 @@ subprojects {
     apply plugin: "dev.architectury.loom"
     // Apply checkstyle and ktlint to check the code style of every sub project
     apply plugin: "org.jetbrains.kotlin.jvm"
-    apply plugin: "io.github.juuxel.loom-quiltflower"
+    apply plugin: "io.github.juuxel.loom-vineflower"
 
     configurations.each { it.resolutionStrategy.useGlobalDependencySubstitutionRules.set(false) }
 

diff --git a/common/build.gradle b/common/build.gradle
@@ -17,6 +17,8 @@ dependencies {
         exclude module: "fastutil"
     }
 
+    implementation("org.valkyrienskies.core:util:${rootProject.vs_core_version}")
+
     // FTB Stuffs
     modCompileOnly("curse.maven:ftb-util-404465:4210935")
     modCompileOnly("curse.maven:ftb-teams-404468:4229138")

diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/client/MixinMinecraft.java b/common/src/main/java/org/valkyrienskies/mod/mixin/client/MixinMinecraft.java
@@ -30,7 +30,6 @@
 import org.valkyrienskies.mod.common.IShipObjectWorldServerProvider;
 import org.valkyrienskies.mod.common.ValkyrienSkiesMod;
 import org.valkyrienskies.mod.common.util.EntityDragger;
-import org.valkyrienskies.mod.common.world.DummyShipWorldClient;
 import org.valkyrienskies.mod.mixinducks.client.MinecraftDuck;
 
 @Mixin(Minecraft.class)
@@ -88,7 +87,7 @@ public ClientShipWorldCore getShipObjectWorld() {
 
         if (shipObjectWorldCopy == null) {
             log.warn("Requested getShipObjectWorld() when shipObjectWorld was null!");
-            return DummyShipWorldClient.INSTANCE;
+            return ValkyrienSkiesMod.getVsCore().getDummyShipWorldClient();
         }
         return shipObjectWorldCopy;
     }

diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientLevel.java b/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientLevel.java
@@ -33,8 +33,8 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.valkyrienskies.core.api.ships.Ship;
 import org.valkyrienskies.core.apigame.world.ClientShipWorldCore;
-import org.valkyrienskies.core.impl.util.AABBdUtilKt;
-import org.valkyrienskies.core.impl.util.VectorConversionsKt;
+import org.valkyrienskies.core.util.AABBdUtilKt;
+import org.valkyrienskies.core.util.VectorConversionsKt;
 import org.valkyrienskies.mod.client.audio.SimpleSoundInstanceOnShip;
 import org.valkyrienskies.mod.common.IShipObjectWorldClientProvider;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;

diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/feature/get_entities/MixinLevel.java b/common/src/main/java/org/valkyrienskies/mod/mixin/feature/get_entities/MixinLevel.java
@@ -17,7 +17,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.valkyrienskies.core.impl.util.RateLimiter;
+import org.valkyrienskies.core.util.RateLimiter;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
 @Mixin(Level.class)

diff --git a/...java/org/valkyrienskies/mod/mixin/world/level/levelgen/MixinNoiseBasedChunkGenerator.java b/...java/org/valkyrienskies/mod/mixin/world/level/levelgen/MixinNoiseBasedChunkGenerator.java
@@ -23,7 +23,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.valkyrienskies.core.impl.game.ChunkAllocator;
 import org.valkyrienskies.mod.common.VS2ChunkAllocator;
 
 @Mixin(NoiseBasedChunkGenerator.class)

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/VS2ChunkAllocator.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/VS2ChunkAllocator.kt
@@ -1,14 +1,8 @@
 package org.valkyrienskies.mod.common
 
-import org.valkyrienskies.core.api.ships.properties.ChunkClaim
-import org.valkyrienskies.core.impl.game.ChunkAllocator
-
 object VS2ChunkAllocator {
     // TODO: Move this to ChunkAllocator eventually
     fun isChunkInShipyardCompanion(chunkX: Int, chunkZ: Int): Boolean {
-        val claimXIndex = ChunkClaim.getClaimXIndex(chunkX)
-        val claimZIndex = ChunkClaim.getClaimZIndex(chunkZ)
-
-        return (claimXIndex in ChunkAllocator.X_INDEX_START..ChunkAllocator.X_INDEX_END) and (claimZIndex in ChunkAllocator.Z_INDEX_START..ChunkAllocator.Z_INDEX_END)
+        return vsCore.isChunkInShipyard(chunkX, chunkZ)
     }
 }
diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt
@@ -35,15 +35,13 @@ import org.valkyrienskies.core.apigame.world.chunks.TerrainUpdate
 import org.valkyrienskies.core.apigame.world.properties.DimensionId
 import org.valkyrienskies.core.game.ships.ShipObjectServer
 import org.valkyrienskies.core.impl.hooks.VSEvents.TickEndEvent
-import org.valkyrienskies.core.impl.util.expand
+import org.valkyrienskies.core.util.expand
 import org.valkyrienskies.mod.common.util.DimensionIdProvider
 import org.valkyrienskies.mod.common.util.MinecraftPlayer
 import org.valkyrienskies.mod.common.util.set
 import org.valkyrienskies.mod.common.util.toJOML
 import org.valkyrienskies.mod.common.util.toJOMLD
 import org.valkyrienskies.mod.common.util.toMinecraft
-import org.valkyrienskies.mod.common.world.DummyShipWorldClient
-import org.valkyrienskies.mod.common.world.DummyShipWorldServer
 import org.valkyrienskies.mod.mixin.accessors.resource.ResourceKeyAccessor
 import org.valkyrienskies.mod.mixinducks.world.entity.PlayerDuck
 import java.util.function.Consumer
@@ -59,15 +57,15 @@ val Level?.shipWorldNullable: ShipWorldCore?
     }
 
 val Level?.shipObjectWorld
-    get() = shipWorldNullable ?: DummyShipWorldClient
+    get() = shipWorldNullable ?: vsCore.dummyShipWorldClient
 
 val Level?.allShips get() = this.shipObjectWorld.allShips
 
 val MinecraftServer.shipObjectWorld: ServerShipWorldCore
-    get() = (this as IShipObjectWorldServerProvider).shipObjectWorld ?: DummyShipWorldServer
+    get() = (this as IShipObjectWorldServerProvider).shipObjectWorld ?: vsCore.dummyShipWorldServer
 val MinecraftServer.vsPipeline get() = (this as IShipObjectWorldServerProvider).vsPipeline!!
 
-val ServerLevel?.shipObjectWorld: ServerShipWorldCore get() = this?.server?.shipObjectWorld ?: DummyShipWorldServer
+val ServerLevel?.shipObjectWorld: ServerShipWorldCore get() = this?.server?.shipObjectWorld ?: vsCore.dummyShipWorldServer
 
 val Level.dimensionId: DimensionId
     get() {
@@ -106,7 +104,7 @@ fun MinecraftServer.getLevelFromDimensionId(dimensionId: DimensionId): ServerLev
     return getLevel(getResourceKey(dimensionId))
 }
 
-val Minecraft.shipObjectWorld get() = (this as IShipObjectWorldClientProvider).shipObjectWorld ?: DummyShipWorldClient
+val Minecraft.shipObjectWorld get() = (this as IShipObjectWorldClientProvider).shipObjectWorld ?: vsCore.dummyShipWorldClient
 val ClientLevel?.shipObjectWorld get() = Minecraft.getInstance().shipObjectWorld
 
 val IPlayer.mcPlayer: Player get() = (this as MinecraftPlayer).playerEntityReference.get()!!

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/assembly/SeamlessChunksManager.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/assembly/SeamlessChunksManager.kt
@@ -13,7 +13,7 @@ import org.valkyrienskies.core.api.ships.ClientShip
 import org.valkyrienskies.core.api.ships.properties.ChunkClaim
 import org.valkyrienskies.core.impl.hooks.VSEvents.ShipLoadEventClient
 import org.valkyrienskies.core.impl.networking.simple.registerClientHandler
-import org.valkyrienskies.core.impl.util.pollUntilEmpty
+import org.valkyrienskies.core.util.pollUntilEmpty
 import org.valkyrienskies.mod.common.getShipManagingPos
 import org.valkyrienskies.mod.common.isChunkInShipyard
 import org.valkyrienskies.mod.common.networking.PacketRestartChunkUpdates

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/assembly/ShipAssembly.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/assembly/ShipAssembly.kt
@@ -5,7 +5,7 @@ import net.minecraft.server.level.ServerLevel
 import net.minecraft.world.level.ChunkPos
 import org.joml.Vector3d
 import org.valkyrienskies.core.api.ships.ServerShip
-import org.valkyrienskies.core.impl.datastructures.DenseBlockPosSet
+import org.valkyrienskies.core.util.datastructures.DenseBlockPosSet
 import org.valkyrienskies.core.impl.game.ships.ShipData
 import org.valkyrienskies.core.impl.game.ships.ShipTransformImpl
 import org.valkyrienskies.core.impl.networking.simple.sendToClient

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/block/TestChairBlock.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/block/TestChairBlock.kt
@@ -20,9 +20,9 @@ import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
 import org.joml.Vector3d
 import org.joml.Vector3dc
-import org.valkyrienskies.core.impl.util.x
-import org.valkyrienskies.core.impl.util.y
-import org.valkyrienskies.core.impl.util.z
+import org.valkyrienskies.core.util.x
+import org.valkyrienskies.core.util.y
+import org.valkyrienskies.core.util.z
 import org.valkyrienskies.mod.common.ValkyrienSkiesMod
 import org.valkyrienskies.mod.common.util.toDoubles
 

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/command/VSCommands.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/command/VSCommands.kt
@@ -26,9 +26,9 @@ import org.valkyrienskies.core.apigame.ShipTeleportData
 import org.valkyrienskies.core.impl.game.ShipTeleportDataImpl
 import org.valkyrienskies.core.impl.game.ships.ShipData
 import org.valkyrienskies.core.impl.game.ships.ShipObject
-import org.valkyrienskies.core.impl.util.x
-import org.valkyrienskies.core.impl.util.y
-import org.valkyrienskies.core.impl.util.z
+import org.valkyrienskies.core.util.x
+import org.valkyrienskies.core.util.y
+import org.valkyrienskies.core.util.z
 import org.valkyrienskies.mod.common.dimensionId
 import org.valkyrienskies.mod.common.getShipManagingPos
 import org.valkyrienskies.mod.common.util.toJOML

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/entity/handling/WorldEntityHandler.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/entity/handling/WorldEntityHandler.kt
@@ -8,9 +8,9 @@ import net.minecraft.world.entity.projectile.AbstractHurtingProjectile
 import org.joml.Vector3d
 import org.valkyrienskies.core.api.ships.ClientShip
 import org.valkyrienskies.core.api.ships.Ship
-import org.valkyrienskies.core.impl.util.component1
-import org.valkyrienskies.core.impl.util.component2
-import org.valkyrienskies.core.impl.util.component3
+import org.valkyrienskies.core.util.component1
+import org.valkyrienskies.core.util.component2
+import org.valkyrienskies.core.util.component3
 import org.valkyrienskies.mod.common.toWorldCoordinates
 import org.valkyrienskies.mod.common.util.toJOML
 import org.valkyrienskies.mod.common.util.toMinecraft

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipAssemblerItem.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipAssemblerItem.kt
@@ -7,7 +7,7 @@ import net.minecraft.world.InteractionResult
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.context.UseOnContext
 import net.minecraft.world.level.block.state.BlockState
-import org.valkyrienskies.core.impl.datastructures.DenseBlockPosSet
+import org.valkyrienskies.core.util.datastructures.DenseBlockPosSet
 import org.valkyrienskies.mod.common.assembly.createNewShipWithBlocks
 import org.valkyrienskies.mod.common.isChunkInShipyard
 

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/util/EntityShipCollisionUtils.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/util/EntityShipCollisionUtils.kt
@@ -12,16 +12,18 @@ import net.minecraft.world.phys.shapes.VoxelShape
 import org.joml.primitives.AABBd
 import org.joml.primitives.AABBdc
 import org.valkyrienskies.core.api.ships.Ship
-import org.valkyrienskies.core.impl.collision.ConvexPolygonc
-import org.valkyrienskies.core.impl.collision.EntityPolygonCollider
-import org.valkyrienskies.core.impl.collision.EntityPolygonCollider.createPolygonFromAABB
-import org.valkyrienskies.core.impl.util.extend
+import org.valkyrienskies.core.apigame.collision.ConvexPolygonc
+import org.valkyrienskies.core.impl.collision.k.createPolygonFromAABB
+import org.valkyrienskies.core.util.extend
 import org.valkyrienskies.mod.common.getShipsIntersecting
 import org.valkyrienskies.mod.common.shipObjectWorld
+import org.valkyrienskies.mod.common.vsCore
 import kotlin.math.max
 
 object EntityShipCollisionUtils {
 
+    private val collider = vsCore.entityPolygonCollider
+
     @JvmStatic
     fun isCollidingWithUnloadedShips(entity: Entity): Boolean {
         val level = entity.level
@@ -86,7 +88,7 @@ object EntityShipCollisionUtils {
             return movement
         }
 
-        val (newMovement, shipCollidingWith) = EntityPolygonCollider.adjustEntityMovementForPolygonCollisions(
+        val (newMovement, shipCollidingWith) = collider.adjustEntityMovementForPolygonCollisions(
             movement.toJOML(), entityBoundingBox.toJOML(), stepHeight, collidingShipPolygons
         )
         if (entity != null) {
@@ -109,7 +111,7 @@ object EntityShipCollisionUtils {
         val entityBoundingBoxExtended = entityBoundingBox.toJOML().extend(movement.toJOML())
         for (shipObject in world.shipObjectWorld.loadedShips.getIntersecting(entityBoundingBoxExtended)) {
             val shipTransform = shipObject.transform
-            val entityPolyInShipCoordinates: ConvexPolygonc = createPolygonFromAABB(
+            val entityPolyInShipCoordinates: ConvexPolygonc = collider.createPolygonFromAABB(
                 entityBoxWithMovement.toJOML(),
                 shipTransform.worldToShip
             )

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/util/GameTickForceApplier.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/util/GameTickForceApplier.kt
@@ -3,7 +3,7 @@ package org.valkyrienskies.mod.common.util
 import org.joml.Vector3dc
 import org.valkyrienskies.core.api.ships.PhysShip
 import org.valkyrienskies.core.api.ships.ShipForcesInducer
-import org.valkyrienskies.core.impl.util.pollUntilEmpty
+import org.valkyrienskies.core.util.pollUntilEmpty
 import java.util.concurrent.ConcurrentLinkedQueue
 
 class GameTickForceApplier : ShipForcesInducer {

diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/world/DummyShipWorldClient.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/world/DummyShipWorldClient.kt