feat(JOML): migrate OnChunkGenerated (#77)

PR: MovingBlocks/Terasology#4426
Terasology · Jan 27, 2021 · f5a53a1 · f5a53a1
1 parent 115fc8e
commit f5a53a1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/main/java/org/terasology/wildAnimals/system/WildAnimalsSpawnSystem.java b/src/main/java/org/terasology/wildAnimals/system/WildAnimalsSpawnSystem.java
@@ -7,22 +7,21 @@
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 import org.joml.Vector3i;
+import org.joml.Vector3ic;
 import org.terasology.entitySystem.entity.EntityManager;
 import org.terasology.entitySystem.entity.EntityRef;
 import org.terasology.entitySystem.event.ReceiveEvent;
 import org.terasology.entitySystem.prefab.Prefab;
 import org.terasology.entitySystem.systems.BaseComponentSystem;
 import org.terasology.entitySystem.systems.RegisterMode;
 import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.math.JomlUtil;
 import org.terasology.registry.In;
 import org.terasology.registry.Share;
 import org.terasology.utilities.Assets;
 import org.terasology.wildAnimals.AnimalSpawnConfig;
 import org.terasology.world.WorldProvider;
 import org.terasology.world.block.Block;
 import org.terasology.world.block.BlockManager;
-import org.terasology.world.chunks.ChunkConstants;
 import org.terasology.world.chunks.Chunks;
 import org.terasology.world.chunks.event.OnChunkGenerated;
 
@@ -112,7 +111,7 @@ public void onChunkGenerated(OnChunkGenerated event, EntityRef worldEntity) {
         if (!trySpawn) {
             return;
         }
-        Vector3i chunkPos = JomlUtil.from(event.getChunkPos());
+        Vector3ic chunkPos = event.getChunkPos();
         // randomly decide whether to spawn deer or sheep in this chunk
         Prefab animalPrefab = flockAnimals.get(random.nextInt(flockAnimals.size()));
         tryFlockAnimalSpawn(animalPrefab, chunkPos);
@@ -124,7 +123,7 @@ public void onChunkGenerated(OnChunkGenerated event, EntityRef worldEntity) {
      *
      * @param chunkPos The chunk which the game will try to spawn deers on
      */
-    private void tryFlockAnimalSpawn(Prefab animalPrefab, Vector3i chunkPos) {
+    private void tryFlockAnimalSpawn(Prefab animalPrefab, Vector3ic chunkPos) {
         List<Vector3i> foundPositions = findFlockAnimalSpawnPositions(chunkPos);
 
         if (foundPositions.size() < config.minFlockSize * config.minGroundPerFlockAnimal) {
@@ -150,7 +149,7 @@ private void tryFlockAnimalSpawn(Prefab animalPrefab, Vector3i chunkPos) {
      * @param chunkPos The chunk that is being checked for valid spawnpoints
      * @return a list of positions of potential deer spawnpoints
      */
-    private List<Vector3i> findFlockAnimalSpawnPositions(Vector3i chunkPos) {
+    private List<Vector3i> findFlockAnimalSpawnPositions(Vector3ic chunkPos) {
         Vector3i worldPos = new Vector3i(chunkPos);
         worldPos.mul(Chunks.SIZE_X, Chunks.SIZE_Y, Chunks.SIZE_Z);
         List<Vector3i> foundPositions = Lists.newArrayList();