Skip to content

Commit

Permalink
fix: nvm, i cant read hash numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
ThePlasticPotato committed Jun 30, 2024
1 parent 2a68254 commit e21b528
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion common/src/main/kotlin/org/valkyrienskies/mod/api/VsApi.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -392,7 +392,7 @@ fun Level?.getWorldCoordinates(blockPos: BlockPos, pos: Vector3d): Vector3d {
}

fun Level.getShipsIntersecting(aabb: AABB): Iterable<Ship> = getShipsIntersecting(aabb.toJOML())
fun Level.getShipsIntersecting(aabb: AABBdc): Iterable<Ship> = allShips.getIntersecting(aabb)
fun Level.getShipsIntersecting(aabb: AABBdc): Iterable<Ship> = allShips.getIntersecting(aabb, dimensionId)

fun Level?.transformAabbToWorld(aabb: AABB): AABB = transformAabbToWorld(aabb.toJOML()).toMinecraft()
fun Level?.transformAabbToWorld(aabb: AABBd) = this?.transformAabbToWorld(aabb, aabb) ?: aabb
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e21b528

Please sign in to comment.