Added Comparable to the CubicPopulators in order to make an orderable generation && caching Heightmaps in order to use on another generators

.gitignore

@@ -2,6 +2,8 @@
 gradle/.DS_Store
 .DS_Store
 
+/logs/
+
 # eclipse
 bin
 *.launch

src/main/java/io/github/terra121/EarthTerrainProcessor.java

@@ -1,12 +1,6 @@
 package io.github.terra121;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 
 import io.github.opencubicchunks.cubicchunks.api.util.Coords;
 import io.github.opencubicchunks.cubicchunks.api.util.CubePos;
@@ -23,6 +17,7 @@
 import io.github.opencubicchunks.cubicchunks.cubicgen.common.biome.IBiomeBlockReplacerProvider;
 import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.CustomGeneratorSettings;
 import io.github.opencubicchunks.cubicchunks.cubicgen.customcubic.structure.CubicCaveGenerator;
+import io.github.terra121.dataset.HeightmapModel;
 import io.github.terra121.dataset.Heights;
 import io.github.terra121.dataset.OpenStreetMaps;
 import io.github.terra121.populator.CliffReplacer;
@@ -60,6 +55,8 @@ public class EarthTerrainProcessor extends BasicCubeGenerator {
 	private boolean doRoads;
 	private boolean doBuildings;
 
+	public static final int spawnSize = 5;
+
     public EarthTerrainProcessor(World world) {
         super(world);
 
@@ -81,7 +78,7 @@ public EarthTerrainProcessor(World world) {
         unnaturals.add(Blocks.CONCRETE);
         unnaturals.add(Blocks.BRICK_BLOCK);
 
-        surfacePopulators = new HashSet<ICubicPopulator>();
+        surfacePopulators = new TreeSet<>();
         if(doRoads || cfg.settings.osmwater)surfacePopulators.add(new RoadGenerator(osm, heights, projection));
         surfacePopulators.add(new EarthTreePopulator(projection));
         snow = new SnowPopulator(); //this will go after the rest
@@ -124,7 +121,7 @@ public CubePrimer generateCube(int cubeX, int cubeY, int cubeZ) {
         boolean surface = false;
 
        //null island
-    	if(-5 < cubeX && cubeX < 5 && -5 < cubeZ && cubeZ < 5) {
+    	if(-spawnSize < cubeX && cubeX < spawnSize && -spawnSize < cubeZ && cubeZ < spawnSize) {
     		for(int x=0; x<16; x++)
                 for(int z=0; z<16; z++)
                 	heightarr[x][z] = 1;
@@ -145,6 +142,11 @@ public CubePrimer generateCube(int cubeX, int cubeY, int cubeZ) {
 	        }
     	}
 
+    	CubePos pos = new CubePos(cubeX, cubeY, cubeZ);
+        HeightmapModel model = new HeightmapModel(surface, heightarr);
+
+        HeightmapModel.add(pos, model);
+
     	//fill in the world
         for(int x=0; x<16; x++) {
             for(int z=0; z<16; z++) {

src/main/java/io/github/terra121/dataset/HeightmapModel.java

@@ -0,0 +1,35 @@
+package io.github.terra121.dataset;
+
+import io.github.opencubicchunks.cubicchunks.api.util.CubePos;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class HeightmapModel {
+    public boolean surface;
+    public double[][] heightmap;
+
+    private HeightmapModel() {}
+
+    public HeightmapModel(boolean surface, double[][] heightmap) {
+        this.heightmap = heightmap;
+        this.surface = surface;
+    }
+
+    private static Map<CubePos, HeightmapModel> cachedHeightmaps = new HashMap<>();
+
+    public static HeightmapModel getModel(int chunkX, int chunkY, int chunkZ) {
+        return getModel(new CubePos(chunkX, chunkY, chunkZ));
+    }
+
+    public static HeightmapModel getModel(CubePos pos) {
+        if(!cachedHeightmaps.containsKey(pos))
+            return null;
+
+        return cachedHeightmaps.get(pos);
+    }
+
+    public static void add(CubePos pos, HeightmapModel model) {
+        cachedHeightmaps.put(pos, model);
+    }
+}

src/main/java/io/github/terra121/populator/EarthTreePopulator.java

@@ -17,7 +17,7 @@
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
-public class EarthTreePopulator implements ICubicPopulator {
+public class EarthTreePopulator implements ICubicPopulator, Comparable<Object> {
 
 	Trees trees;
 
@@ -106,5 +106,10 @@ private int quickElev(World world, int x, int z, int low, int high) {
 
         return low;
     }
+
+    @Override
+    public int compareTo(Object o) {
+        return 1;
+    }
 
 }

src/main/java/io/github/terra121/populator/RoadGenerator.java

@@ -1,5 +1,6 @@
 package io.github.terra121.populator;
 
+import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 import java.util.function.BiFunction;
@@ -20,7 +21,9 @@
 import net.minecraft.world.biome.Biome;
 import net.minecraftforge.event.entity.player.PlayerContainerEvent;
 
-public class RoadGenerator implements ICubicPopulator {
+public class RoadGenerator implements ICubicPopulator, Comparable<Object> {
+
+    private static Set<CubePos> roadChunks = new HashSet<>();
 
     private static final IBlockState ASPHALT = Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, EnumDyeColor.GRAY);
     private static final IBlockState WATER_SOURCE = Blocks.WATER.getDefaultState();
@@ -93,6 +96,8 @@ public void generate(World world, Random rand, CubePos pos, Biome biome) {
                     }
                 }
 	        }
+
+            roadChunks.add(new CubePos(cubeX, cubeY, cubeZ));
         }
     }
 
@@ -214,4 +219,16 @@ private static double bound(double x, double slope, double j, double k, double r
         }
         return slope*x + sign*b;
     }
+
+    public static boolean isRoad(int cubeX, int cubeY, int cubeZ) {
+        CubePos pos = new CubePos(cubeX, cubeY, cubeZ);
+        boolean isRoad = roadChunks.contains(pos);
+        // roadChunks.remove(pos);
+        return isRoad;
+    }
+
+    @Override
+    public int compareTo(Object o) {
+        return 0;
+    }
 }