diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/api/VsApi.kt b/common/src/main/kotlin/org/valkyrienskies/mod/api/VsApi.kt index 270bf4ebc..787296871 100644 --- a/common/src/main/kotlin/org/valkyrienskies/mod/api/VsApi.kt +++ b/common/src/main/kotlin/org/valkyrienskies/mod/api/VsApi.kt @@ -17,7 +17,7 @@ import org.valkyrienskies.mod.api.events.PreRenderShipEvent import org.valkyrienskies.mod.api.events.RegisterBlockStateEvent @NonExtendable -interface VsApi : VsCoreApi { +interface VsApi : VSCoreApi { /** * This event gets called when it's time to register physics block states for Minecraft block states. diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt index cf4b69a37..1049b9ec8 100644 --- a/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt +++ b/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt @@ -212,7 +212,7 @@ inline fun Level.transformToNearbyShipsAndWorld( cb(posInWorld.x(), posInWorld.y(), posInWorld.z()) } - for (nearbyShip in shipObjectWorld.allShips.getIntersecting(aabb)) { + for (nearbyShip in shipObjectWorld.allShips.getIntersecting(aabb, dimensionId)) { if (nearbyShip == currentShip) continue val posInShip = nearbyShip.worldToShip.transformPosition(posInWorld, temp0) cb(posInShip.x(), posInShip.y(), posInShip.z()) @@ -392,7 +392,7 @@ fun Level?.getWorldCoordinates(blockPos: BlockPos, pos: Vector3d): Vector3d { } fun Level.getShipsIntersecting(aabb: AABB): Iterable = getShipsIntersecting(aabb.toJOML()) -fun Level.getShipsIntersecting(aabb: AABBdc): Iterable = allShips.getIntersecting(aabb) +fun Level.getShipsIntersecting(aabb: AABBdc): Iterable = allShips.getIntersecting(aabb, dimensionId) fun Level?.transformAabbToWorld(aabb: AABB): AABB = transformAabbToWorld(aabb.toJOML()).toMinecraft() fun Level?.transformAabbToWorld(aabb: AABBd) = this?.transformAabbToWorld(aabb, aabb) ?: aabb diff --git a/gradle.properties b/gradle.properties index fd0f74256..c5c73d0a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,7 +28,7 @@ createbigcannons_version= 0.5.2.a create_utilities_version=0.2.1+1.20.1 energy_version=2.3.0 -vs_core_version=1.1.0+c366a39369 +vs_core_version=1.1.0+da86725858 # Prevent kotlin from autoincluding stdlib as a dependency, which breaks # gradle's composite builds (includeBuild) for some reason. We'll add it manually kotlin.stdlib.default.dependency=false