diff --git a/src/main/java/org/terasology/lost/LevelSpawnSystem.java b/src/main/java/org/terasology/lost/LevelSpawnSystem.java index 33ba67e..bc7c593 100644 --- a/src/main/java/org/terasology/lost/LevelSpawnSystem.java +++ b/src/main/java/org/terasology/lost/LevelSpawnSystem.java @@ -4,6 +4,7 @@ package org.terasology.lost; import org.joml.RoundingMode; +import org.joml.Vector2fc; import org.joml.Vector3f; import org.joml.Vector3i; import org.slf4j.Logger; @@ -80,10 +81,10 @@ public void onBiomeChange(OnBiomeChangedEvent event, EntityRef player, // fetch the current voronoi region GraphRegion region = worldRegion.getFacet(GraphFacet.class).getWorldTriangle(Math.round(playerLocation.x), Math.round(playerLocation.z)).getRegion(); - ImmutableVector2f center = region.getCenter(); + Vector2fc center = region.getCenter(); - float distanceFromHut = center.distance(new Vector2f(progressTrackingComponent.hutPosition.x, - progressTrackingComponent.hutPosition.z)); + float distanceFromHut = center.distance(progressTrackingComponent.hutPosition.x, + progressTrackingComponent.hutPosition.z); if (distanceFromHut < MINIMUM_DISTANCE_FROM_HUT && !event.getNewBiome().getDisplayName().contains("forest")) { return; } @@ -93,8 +94,8 @@ public void onBiomeChange(OnBiomeChangedEvent event, EntityRef player, } if (levelURI != null && progressTrackingComponent.isWellFound()) { // round center coordinates to Integers - int x = Math.round(center.getX()); - int y = Math.round(center.getY()); + int x = Math.round(center.x()); + int y = Math.round(center.y()); int height = Math.round(surfacesFacet.getPrimarySurface(elevationFacet, x, y).orElse(elevationFacet.getWorld(x, y))); Vector3i spawnPosition = new Vector3i(x, height, y); diff --git a/src/main/java/org/terasology/lost/generator/LostWorldGenerator.java b/src/main/java/org/terasology/lost/generator/LostWorldGenerator.java index 1e0a32f..9962f2f 100644 --- a/src/main/java/org/terasology/lost/generator/LostWorldGenerator.java +++ b/src/main/java/org/terasology/lost/generator/LostWorldGenerator.java @@ -3,6 +3,7 @@ package org.terasology.lost.generator; import org.joml.RoundingMode; +import org.joml.Vector2fc; import org.joml.Vector3f; import org.joml.Vector3fc; import org.joml.Vector3i; @@ -143,7 +144,7 @@ public Vector3fc getSpawnPosition(EntityRef entity) { continue; } if (!biome.equals(WhittakerBiome.OCEAN) && !biome.equals(WhittakerBiome.LAKE) && !biome.equals(WhittakerBiome.BEACH)) { - picker.offer(JomlUtil.from(r.getCenter()), r); + picker.offer(r.getCenter(), r); locationFound = true; break; } @@ -154,8 +155,8 @@ public Vector3fc getSpawnPosition(EntityRef entity) { } Vector2i target; if (picker.getClosest() != null) { - ImmutableVector2f hit = picker.getClosest().getCenter(); - target = new Vector2i(hit.getX(), hit.getY()); + Vector2fc hit = picker.getClosest().getCenter(); + target = new Vector2i(hit.x(), hit.y()); } else { target = new Vector2i(desiredPos.x(), desiredPos.z()); }