test: add SettlementEntityManagerTest for placeParcel

module.txt

@@ -43,7 +43,7 @@
         },
         {
             "id": "ModuleTestingEnvironment",
-            "minVersion": "0.2.0",
+            "minVersion": "0.3.2",
             "optional": true
         },
         {

src/main/java/org/terasology/dynamicCities/buildings/BuildingManager.java

@@ -209,7 +209,7 @@ public Optional<GenericBuildingComponent> getRandomBuildingOfZoneForCulture(Stri
 
 
     private Optional<BuildingGenerator> getGenerator(String generatorName) {
-        Class generatorClass = GeneratorRegistry.GENERATORS.get(generatorName);
+        Class<?> generatorClass = GeneratorRegistry.GENERATORS.get(generatorName);
         for (BuildingGenerator generator : generators) {
             if (generator.getClass() == generatorClass) {
                 return Optional.of(generator);

src/main/java/org/terasology/dynamicCities/construction/Construction.java

@@ -8,7 +8,6 @@
 import org.joml.Vector3ic;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.cities.BlockTheme;
 import org.terasology.cities.DefaultBlockType;
 import org.terasology.cities.bldg.Building;
@@ -72,7 +71,6 @@
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.math.Side;
 import org.terasology.engine.network.NetworkSystem;
@@ -89,6 +87,8 @@
 import org.terasology.engine.world.block.entity.placement.PlaceBlocks;
 import org.terasology.engine.world.generation.Border3D;
 import org.terasology.engine.world.generation.facets.ElevationFacet;
+import org.terasology.gestalt.assets.management.AssetManager;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.structureTemplates.components.SpawnBlockRegionsComponent;
 import org.terasology.structureTemplates.interfaces.StructureTemplateProvider;
 import org.terasology.structureTemplates.util.BlockRegionTransform;
@@ -554,7 +554,7 @@ public RoadStatus buildRoadParcel(RoadParcel parcel, EntityRef settlement) {
 
             // Flatten the rect
             // TODO: Find a way to store the surface height at that point to the segment here.
-            segment.height = flatten(segment.getRect().expand(rectExpansionFactor,new BlockArea(BlockArea.INVALID)), segmentHeight);
+            segment.height = flatten(segment.getRect().expand(rectExpansionFactor, new BlockArea(BlockArea.INVALID)), segmentHeight);
 
             // Create raster targets
             RasterTarget rasterTarget = new BufferRasterTarget(blockBufferSystem, roadTheme, segment.rect);

src/main/java/org/terasology/dynamicCities/districts/DistrictManager.java

@@ -1,31 +1,18 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.dynamicCities.districts;
 
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.dynamicCities.utilities.Toolbox;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.registry.Share;
+import org.terasology.gestalt.assets.management.AssetManager;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -52,12 +39,7 @@ public void postBegin() {
             //Get building data
             if (prefab.hasComponent(DistrictType.class)) {
                 DistrictType districtType = prefab.getComponent(DistrictType.class);
-                if (!districtType.zones.isEmpty()) {
-                    Toolbox.stringsToLowerCase(districtType.zones);
-                    districts.add(districtType);
-                } else {
-                    logger.warn("Found district prefab with empty zone list");
-                }
+                addDistrict(districtType);
             }
         }
 
@@ -73,6 +55,15 @@ public void postBegin() {
         logger.info("Finished loading districts: " + districts.size() + " district types found: " + districtNames);
     }
 
+    public void addDistrict(DistrictType districtType) {
+        if (!districtType.zones.isEmpty()) {
+            Toolbox.stringsToLowerCase(districtType.zones);
+            districts.add(districtType);
+        } else {
+            logger.warn("Found district prefab with empty zone list");
+        }
+    }
+
     public Optional<DistrictType> getDistrictFromName(String name) {
         for (DistrictType districtType : districts) {
             if (districtType.name.equals(name)) {

src/main/java/org/terasology/dynamicCities/districts/DistrictType.java

@@ -9,6 +9,7 @@
 import org.terasology.nui.Color;
 import org.terasology.reflection.MappedContainer;
 
+import java.util.Arrays;
 import java.util.List;
 
 //TODO: give mixing factors for zones
@@ -20,7 +21,12 @@ public class DistrictType implements Component<DistrictType> {
     public int color;
     public List<String> zones = Lists.newArrayList();
 
-    public DistrictType ( ) { }
+    public DistrictType() { }
+
+    public DistrictType(String name, String... zones) {
+        this.name = name;
+        this.zones.addAll(Arrays.asList(zones));
+    };
 
     public boolean isValidType(DynParcel parcel) {
         String zone = parcel.getZone();

src/main/java/org/terasology/dynamicCities/population/CultureManager.java

@@ -1,24 +1,10 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.dynamicCities.population;
 
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.dynamicCities.utilities.Toolbox;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
@@ -27,6 +13,7 @@
 import org.terasology.engine.registry.In;
 import org.terasology.engine.registry.Share;
 import org.terasology.engine.utilities.random.MersenneRandom;
+import org.terasology.gestalt.assets.management.AssetManager;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -49,27 +36,7 @@ public void postBegin() {
             //Get building data
             if (prefab.hasComponent(CultureComponent.class)) {
                 CultureComponent cultureComponent = prefab.getComponent(CultureComponent.class);
-                if (cultureComponent.theme != null) {
-                    cultureComponent.theme = cultureComponent.theme.toLowerCase();
-                } else {
-                    logger.warn("No theme defined for culture " + cultureComponent.name);
-                }
-                if (!cultureComponent.buildingNeedPerZone.isEmpty()) {
-                    cultureComponents.add(cultureComponent);
-                    cultureComponent.buildingNeedPerZone = Toolbox.stringsToLowerCase(cultureComponent.buildingNeedPerZone);
-                } else {
-                    logger.warn("Found culture prefab with empty buildingNeedPerZone list");
-                }
-                if (cultureComponent.availableBuildings != null) {
-                    Toolbox.stringsToLowerCase(cultureComponent.availableBuildings);
-                } else {
-                    logger.warn("No available Buildings defined for culture " + cultureComponent.name);
-                }
-                if (cultureComponent.residentialZones != null) {
-                    Toolbox.stringsToLowerCase(cultureComponent.residentialZones);
-                } else {
-                    logger.warn("No residential zones defined for culture " + cultureComponent.name);
-                }
+                addCulture(cultureComponent);
             }
         }
 
@@ -83,13 +50,37 @@ public void postBegin() {
         rng = new MersenneRandom(assetManager.hashCode() * 5 + this.hashCode());
     }
 
+    public void addCulture(CultureComponent cultureComponent) {
+        if (cultureComponent.theme != null) {
+            cultureComponent.theme = cultureComponent.theme.toLowerCase();
+        } else {
+            logger.warn("No theme defined for culture " + cultureComponent.name);
+        }
+        if (!cultureComponent.buildingNeedPerZone.isEmpty()) {
+            cultureComponents.add(cultureComponent);
+            cultureComponent.buildingNeedPerZone = Toolbox.stringsToLowerCase(cultureComponent.buildingNeedPerZone);
+        } else {
+            logger.warn("Found culture prefab with empty buildingNeedPerZone list");
+        }
+        if (cultureComponent.availableBuildings != null) {
+            Toolbox.stringsToLowerCase(cultureComponent.availableBuildings);
+        } else {
+            logger.warn("No available Buildings defined for culture " + cultureComponent.name);
+        }
+        if (cultureComponent.residentialZones != null) {
+            Toolbox.stringsToLowerCase(cultureComponent.residentialZones);
+        } else {
+            logger.warn("No residential zones defined for culture " + cultureComponent.name);
+        }
+    }
+
     public CultureComponent getRandomCulture() {
         if (!cultureComponents.isEmpty()) {
             int max = cultureComponents.size();
             int index = rng.nextInt(max);
             return (CultureComponent) cultureComponents.toArray()[index];
         }
-        logger.error("No culture found...barbarians..." );
+        logger.error("No culture found...barbarians...");
         return null;
     }
 

src/main/java/org/terasology/dynamicCities/region/RegionEntityManager.java

@@ -295,10 +295,14 @@ public String toggleRegionTags(
     public List<EntityRef> getRegionsInArea(BlockAreac area) {
         List<EntityRef> result = new ArrayList<>();
         for (Vector2ic pos : area) {
-            EntityRef region = getNearest(new Vector2i(pos.x(), pos.y()));
+            EntityRef region = getNearest(pos);
 
             if (region == null || !region.isActive() || !region.exists()) {
-                logger.debug("Failed to get nearest region for " + pos.toString());
+                logger.debug("Failed to get nearest region for {}: {}, {}, {}",
+                        pos, region,
+                        region != null && region.isActive(),
+                        region != null && region.exists()
+                        );
             } else if (!result.contains(region)) {
                 result.add(region);
             }

src/main/java/org/terasology/dynamicCities/region/RegionEntityProvider.java

@@ -1,18 +1,5 @@
-/*
- * Copyright 2016 MovingBlocks
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.dynamicCities.region;
 
@@ -57,18 +44,22 @@ public void process(Region region, EntityBuffer buffer) {
         if (checkCorners(worldRegion, elevationFacet)) {
             RoughnessFacet roughnessFacet = region.getFacet(RoughnessFacet.class);
             ResourceFacet resourceFacet = region.getFacet(ResourceFacet.class);
-            TreeFacet treeFacet = region.getFacet(TreeFacet.class);
             SiteFacet siteFacet = region.getFacet(SiteFacet.class);
             SettlementFacet settlementFacet = region.getFacet(SettlementFacet.class);
 
             EntityStore entityStore = new EntityStore();
 
             RoughnessFacetComponent roughnessFacetComponent = new RoughnessFacetComponent(roughnessFacet);
             ResourceFacetComponent resourceFacetComponent = new ResourceFacetComponent(resourceFacet);
-            TreeFacetComponent treeFacetComponent = new TreeFacetComponent(treeFacet);
             entityStore.addComponent(roughnessFacetComponent);
             entityStore.addComponent(resourceFacetComponent);
-            entityStore.addComponent(treeFacetComponent);
+
+            // FIXME: is TreeFacet optional?
+            TreeFacet treeFacet = region.getFacet(TreeFacet.class);
+            if (treeFacet != null) {
+                TreeFacetComponent treeFacetComponent = new TreeFacetComponent(treeFacet);
+                entityStore.addComponent(treeFacetComponent);
+            }
 
             LocationComponent locationComponent = new LocationComponent(worldRegion.center(new Vector3f()));
             entityStore.addComponent(locationComponent);
@@ -99,8 +90,8 @@ protected boolean checkCorners(BlockRegion worldRegion, BaseFieldFacet2D facet)
 
         positions[0] = new Vector2i(max.x(), max.z());
         positions[1] = new Vector2i(min.x(), min.z());
-        positions[2] = new Vector2i(min.x() + worldRegion.getSizeX(), min.z());
-        positions[3] = new Vector2i(min.x(), min.z() + worldRegion.getSizeZ());
+        positions[2] = new Vector2i(max.x(), min.z());
+        positions[3] = new Vector2i(min.x(), max.z());
         positions[4] = new Vector2i(worldRegion.center(new Vector3f()).x, worldRegion.center(new Vector3f()).z,
             RoundingMode.FLOOR);