From 6e8def5fc3b32b10b9814a88d0629ddebdb5900a Mon Sep 17 00:00:00 2001 From: Tobias Nett Date: Fri, 29 Jan 2021 19:17:11 +0100 Subject: [PATCH] feat(JOML): migrate remaining occurrences (#34) --- src/main/java/org/terasology/lost/LevelSpawnSystem.java | 2 -- src/main/java/org/terasology/lost/OnSpawnSystem.java | 2 +- .../org/terasology/lost/ProgressTrackingComponent.java | 2 +- .../terasology/lost/generator/LostWorldGenerator.java | 9 +++------ 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/terasology/lost/LevelSpawnSystem.java b/src/main/java/org/terasology/lost/LevelSpawnSystem.java index bc7c593..a718458 100644 --- a/src/main/java/org/terasology/lost/LevelSpawnSystem.java +++ b/src/main/java/org/terasology/lost/LevelSpawnSystem.java @@ -23,8 +23,6 @@ import org.terasology.logic.location.LocationComponent; import org.terasology.lost.generator.LostWorldGenerator; import org.terasology.math.Side; -import org.terasology.math.geom.ImmutableVector2f; -import org.terasology.math.geom.Vector2f; import org.terasology.polyworld.graph.GraphFacet; import org.terasology.polyworld.graph.GraphRegion; import org.terasology.registry.In; diff --git a/src/main/java/org/terasology/lost/OnSpawnSystem.java b/src/main/java/org/terasology/lost/OnSpawnSystem.java index bed6378..4581cb6 100644 --- a/src/main/java/org/terasology/lost/OnSpawnSystem.java +++ b/src/main/java/org/terasology/lost/OnSpawnSystem.java @@ -90,7 +90,7 @@ public void onPlayerSpawn(OnPlayerSpawnedEvent event, EntityRef player, Inventor Vector3i spawnPosition = new Vector3i(x, height, y); spawnLevel("Lost:hut", spawnPosition, assetManager, entityManager); spawnPosition.y = 0; - progressTrackingComponent.hutPosition = JomlUtil.from(spawnPosition); + progressTrackingComponent.hutPosition.set(spawnPosition); } } diff --git a/src/main/java/org/terasology/lost/ProgressTrackingComponent.java b/src/main/java/org/terasology/lost/ProgressTrackingComponent.java index ad060c1..901810a 100644 --- a/src/main/java/org/terasology/lost/ProgressTrackingComponent.java +++ b/src/main/java/org/terasology/lost/ProgressTrackingComponent.java @@ -3,8 +3,8 @@ package org.terasology.lost; +import org.joml.Vector3i; import org.terasology.entitySystem.Component; -import org.terasology.math.geom.Vector3i; import java.util.HashMap; diff --git a/src/main/java/org/terasology/lost/generator/LostWorldGenerator.java b/src/main/java/org/terasology/lost/generator/LostWorldGenerator.java index 9962f2f..02a28bd 100644 --- a/src/main/java/org/terasology/lost/generator/LostWorldGenerator.java +++ b/src/main/java/org/terasology/lost/generator/LostWorldGenerator.java @@ -4,6 +4,7 @@ import org.joml.RoundingMode; import org.joml.Vector2fc; +import org.joml.Vector2i; import org.joml.Vector3f; import org.joml.Vector3fc; import org.joml.Vector3i; @@ -15,10 +16,6 @@ import org.terasology.entitySystem.entity.EntityRef; import org.terasology.logic.location.LocationComponent; import org.terasology.logic.spawner.FixedSpawner; -import org.terasology.math.JomlUtil; -import org.terasology.math.geom.ImmutableVector2f; -import org.terasology.math.geom.Vector2f; -import org.terasology.math.geom.Vector2i; import org.terasology.polyworld.biome.BiomeModel; import org.terasology.polyworld.biome.WhittakerBiome; import org.terasology.polyworld.biome.WhittakerBiomeModelFacet; @@ -156,12 +153,12 @@ public Vector3fc getSpawnPosition(EntityRef entity) { Vector2i target; if (picker.getClosest() != null) { Vector2fc hit = picker.getClosest().getCenter(); - target = new Vector2i(hit.x(), hit.y()); + target = new Vector2i(hit.x(), hit.y(), RoundingMode.FLOOR); } else { target = new Vector2i(desiredPos.x(), desiredPos.z()); } - FixedSpawner spawner = new FixedSpawner(target.getX(), target.getY()); + FixedSpawner spawner = new FixedSpawner(target.x(), target.y()); return spawner.getSpawnPosition(getWorld(), entity); }