chore: increase use of Vector3ic

Terasology · Aug 17, 2021 · 6f5e8ff · 6f5e8ff
1 parent f5e9cea
commit 6f5e8ff
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 91 deletions.
diff --git a/src/main/java/org/terasology/gf/SaplingInitializeSystem.java b/src/main/java/org/terasology/gf/SaplingInitializeSystem.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.gf;
 
-import org.joml.Vector3i;
+import org.joml.Vector3ic;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.terasology.climateConditions.ClimateConditionsSystem;
@@ -95,7 +95,7 @@ public void delayedInitialization(DelayedActionTriggeredEvent event, EntityRef s
                 PerformanceMonitor.startActivity("GrowingFlora - Initializing sapling");
                 processingEvent = true;
                 try {
-                    Vector3i blockLocation = blockComponent.getPosition(new Vector3i());
+                    Vector3ic blockLocation = blockComponent.getPosition();
                     String saplingType = generatedSapling.type;
                     PlantGrowthDefinition plantDefinition = plantRegistry.getPlantGrowthDefinition(saplingType);
                     Long updateDelay = plantDefinition.initializeGeneratedPlant(worldProvider, blockEntityRegistry, sapling);

diff --git a/src/main/java/org/terasology/gf/generator/ConnectedPlantGrowthDefinition.java b/src/main/java/org/terasology/gf/generator/ConnectedPlantGrowthDefinition.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.gf.generator;
 
-import org.joml.Vector3i;
+import org.joml.Vector3ic;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.world.BlockEntityRegistry;
 import org.terasology.engine.world.WorldProvider;
@@ -22,7 +22,7 @@ public interface ConnectedPlantGrowthDefinition extends PlantGrowthDefinition {
      * @param plant
      * @return
      */
-    boolean isBlockOwnedByPlant(WorldProvider worldProvider, BlockEntityRegistry blockEntityRegistry, Vector3i block, EntityRef plant);
+    boolean isBlockOwnedByPlant(WorldProvider worldProvider, BlockEntityRegistry blockEntityRegistry, Vector3ic block, EntityRef plant);
 
     /**
      * Returns a collection of locations that are dependand on existance of this block in this plant.
@@ -34,5 +34,5 @@ public interface ConnectedPlantGrowthDefinition extends PlantGrowthDefinition {
      * @param plant
      * @return
      */
-    Collection<Vector3i> getBlocksConnectedTo(WorldProvider worldProvider, BlockEntityRegistry blockEntityRegistry, Vector3i block, EntityRef plant);
+    Collection<Vector3ic> getBlocksConnectedTo(WorldProvider worldProvider, BlockEntityRegistry blockEntityRegistry, Vector3ic block, EntityRef plant);
 }
diff --git a/src/main/java/org/terasology/gf/tree/TreeDestructionSystem.java b/src/main/java/org/terasology/gf/tree/TreeDestructionSystem.java
@@ -3,7 +3,7 @@
 package org.terasology.gf.tree;
 
 import org.joml.Vector3f;
-import org.joml.Vector3i;
+import org.joml.Vector3ic;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.ReceiveEvent;
@@ -55,21 +55,21 @@ public void onTreePartDestroyed(BeforeDestroyEvent beforeDestroyEvent, EntityRef
         if (!processingDestruction) {
             processingDestruction = true;
             try {
-                Vector3i position = component.getPosition(new Vector3i());
+                Vector3ic position = component.getPosition();
 
                 for (EntityRef testedTree : entityManager.getEntitiesWith(LSystemTreeComponent.class)) {
                     BlockComponent blockComponent = testedTree.getComponent(BlockComponent.class);
                     if (blockComponent != null) {
-                        Vector3i testedPosition = blockComponent.getPosition(new Vector3i());
+                        Vector3ic testedPosition = blockComponent.getPosition();
 
-                        double distance = Math.sqrt((testedPosition.x - position.x) * (testedPosition.x - position.x)
-                                + (testedPosition.z - position.z) * (testedPosition.z - position.z));
+                        double distance = Math.sqrt((testedPosition.x() - position.x()) * (testedPosition.x() - position.x())
+                                + (testedPosition.z() - position.z()) * (testedPosition.z() - position.z()));
                         if (distance < Math.sqrt(512)) {
                             String type = testedTree.getComponent(LivingPlantComponent.class).type;
                             PlantGrowthDefinition plantGrowthDefinition = plantRegistry.getPlantGrowthDefinition(type);
                             if (plantGrowthDefinition instanceof ConnectedPlantGrowthDefinition) {
                                 ConnectedPlantGrowthDefinition plantDef = (ConnectedPlantGrowthDefinition) plantGrowthDefinition;
-                                Collection<Vector3i> blocksConnectedTo = plantDef.getBlocksConnectedTo(worldProvider, blockEntityRegistry, position, testedTree);
+                                Collection<Vector3ic> blocksConnectedTo = plantDef.getBlocksConnectedTo(worldProvider, blockEntityRegistry, position, testedTree);
                                 if (blocksConnectedTo != null) {
                                     destroyTheConnectedBlocksAndGatherItems(position, blocksConnectedTo);
                                 }
@@ -83,7 +83,7 @@ public void onTreePartDestroyed(BeforeDestroyEvent beforeDestroyEvent, EntityRef
         }
     }
 
-    private void destroyTheConnectedBlocksAndGatherItems(Vector3i position, Collection<Vector3i> blocksConnectedTo) {
+    private void destroyTheConnectedBlocksAndGatherItems(Vector3ic position, Collection<Vector3ic> blocksConnectedTo) {
         EntityRef worldEntity = worldProvider.getWorldEntity();
         worldEntity.send(new LargeBlockUpdateStarting());
         try {
@@ -93,8 +93,8 @@ private void destroyTheConnectedBlocksAndGatherItems(Vector3i position, Collecti
                 tempInventoryEntity.addComponent(inventory);
                 Prefab damagePrefab = prefabManager.getPrefab("GrowingFlora:TreeCutDamage");
 
-                for (Vector3i vector3i : blocksConnectedTo) {
-                    blockEntityRegistry.getEntityAt(vector3i).send(
+                for (Vector3ic blockPosition : blocksConnectedTo) {
+                    blockEntityRegistry.getEntityAt(blockPosition).send(
                             new DestroyEvent(tempInventoryEntity, EntityRef.NULL, damagePrefab));
                 }