Initial spawns

src/main/java/com/volmit/iris/ProjectManager.java

@@ -444,11 +444,16 @@ public class ProjectManager
 		biomes.forEach((r) -> r.getLoot().getTables().forEach((i) -> loot.add(Iris.globaldata.getLootLoader().load(i))));
 		structures.forEach((r) -> r.getLoot().getTables().forEach((i) -> loot.add(Iris.globaldata.getLootLoader().load(i))));
 		structures.forEach((b) -> b.getTiles().forEach((r) -> r.getLoot().getTables().forEach((i) -> loot.add(Iris.globaldata.getLootLoader().load(i)))));
-		structures.forEach((r) -> r.getEntitySpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity()))));
+		structures.forEach((r) -> r.getEntitySpawnOverrides().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity()))));
-		structures.forEach((s) -> s.getTiles().forEach((r) -> r.getEntitySpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity())))));
+		structures.forEach((s) -> s.getTiles().forEach((r) -> r.getEntitySpawnOverrides().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity())))));
-		biomes.forEach((r) -> r.getEntitySpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity()))));
+		biomes.forEach((r) -> r.getEntitySpawnOverrides().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity()))));
-		regions.forEach((r) -> r.getEntitySpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity()))));
+		regions.forEach((r) -> r.getEntitySpawnOverrides().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity()))));
-		dimension.getEntitySpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity())));
+		dimension.getEntitySpawnOverrides().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity())));
+		structures.forEach((r) -> r.getEntityInitialSpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity()))));
+		structures.forEach((s) -> s.getTiles().forEach((r) -> r.getEntityInitialSpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity())))));
+		biomes.forEach((r) -> r.getEntityInitialSpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity()))));
+		regions.forEach((r) -> r.getEntityInitialSpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity()))));
+		dimension.getEntityInitialSpawns().forEach((sp) -> entities.add(Iris.globaldata.getEntityLoader().load(sp.getEntity())));
 
 		KMap<String, String> renameObjects = new KMap<>();
 		String a = "";

src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java

@@ -26,7 +26,8 @@ import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisBlockDrops;
 import com.volmit.iris.object.IrisDimension;
 import com.volmit.iris.object.IrisEffect;
-import com.volmit.iris.object.IrisEntitySpawn;
+import com.volmit.iris.object.IrisEntityInitialSpawn;
+import com.volmit.iris.object.IrisEntitySpawnOverride;
 import com.volmit.iris.object.IrisRegion;
 import com.volmit.iris.util.Form;
 import com.volmit.iris.util.IrisStructureResult;
@@ -409,6 +410,33 @@ public class IrisTerrainProvider extends PostBlockTerrainProvider implements Iri
 		}
 	}
 
+	public void spawnInitials(Chunk c, RNG rng)
+	{
+		int x = (c.getX() * 16) + rng.nextInt(15);
+		int z = (c.getZ() * 16) + rng.nextInt(15);
+		int y = getCarvedHeight(x, z);
+		IrisDimension dim = getDimension();
+		IrisRegion region = sampleRegion(x, z);
+		IrisBiome above = sampleTrueBiome(x, z);
+
+		IrisStructureResult res = getStructure(x, y, z);
+
+		if(res != null && res.getTile() != null)
+		{
+			trySpawn(res.getTile().getEntityInitialSpawns(), c, rng);
+		}
+
+		if(res != null && res.getStructure() != null)
+		{
+			trySpawn(res.getStructure().getEntityInitialSpawns(), c, rng);
+
+		}
+
+		trySpawn(above.getEntityInitialSpawns(), c, rng);
+		trySpawn(region.getEntityInitialSpawns(), c, rng);
+		trySpawn(dim.getEntityInitialSpawns(), c, rng);
+	}
+
 	@Override
 	protected void onSpawn(EntitySpawnEvent e)
 	{
@@ -431,7 +459,7 @@ public class IrisTerrainProvider extends PostBlockTerrainProvider implements Iri
 
 			if(res != null && res.getTile() != null)
 			{
-				if(trySpawn(res.getTile().getEntitySpawns(), e))
+				if(trySpawn(res.getTile().getEntitySpawnOverrides(), e))
 				{
 					return;
 				}
@@ -439,7 +467,7 @@ public class IrisTerrainProvider extends PostBlockTerrainProvider implements Iri
 
 			if(res != null && res.getStructure() != null)
 			{
-				if(trySpawn(res.getStructure().getEntitySpawns(), e))
+				if(trySpawn(res.getStructure().getEntitySpawnOverrides(), e))
 				{
 					return;
 				}
@@ -447,32 +475,32 @@ public class IrisTerrainProvider extends PostBlockTerrainProvider implements Iri
 
 			if(below != null)
 			{
-				if(trySpawn(below.getEntitySpawns(), e))
+				if(trySpawn(below.getEntitySpawnOverrides(), e))
 				{
 					return;
 				}
 			}
 
-			if(trySpawn(above.getEntitySpawns(), e))
+			if(trySpawn(above.getEntitySpawnOverrides(), e))
 			{
 				return;
 			}
 
-			if(trySpawn(region.getEntitySpawns(), e))
+			if(trySpawn(region.getEntitySpawnOverrides(), e))
 			{
 				return;
 			}
 
-			if(trySpawn(dim.getEntitySpawns(), e))
+			if(trySpawn(dim.getEntitySpawnOverrides(), e))
 			{
 				return;
 			}
 		}
 	}
 
-	private boolean trySpawn(KList<IrisEntitySpawn> s, EntitySpawnEvent e)
+	private boolean trySpawn(KList<IrisEntitySpawnOverride> s, EntitySpawnEvent e)
 	{
-		for(IrisEntitySpawn i : s)
+		for(IrisEntitySpawnOverride i : s)
 		{
 			setSpawnable(false);
 
@@ -492,6 +520,14 @@ public class IrisTerrainProvider extends PostBlockTerrainProvider implements Iri
 		return false;
 	}
 
+	private void trySpawn(KList<IrisEntityInitialSpawn> s, Chunk c, RNG rng)
+	{
+		for(IrisEntityInitialSpawn i : s)
+		{
+			i.spawn(this, c, rng);
+		}
+	}
+
 	@Override
 	public boolean canSpawn(int x, int z)
 	{

src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java

@@ -13,6 +13,7 @@ import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.ParallaxTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicSliverMap;
 import com.volmit.iris.object.InventorySlotType;
@@ -61,6 +62,8 @@ public class GenLayerUpdate extends BlockPopulator
 			}
 		}
 
+		((IrisTerrainProvider) gen).spawnInitials(c, rx);
+
 		p.end();
 		gen.getMetrics().getUpdate().put(p.getMilliseconds());
 	}

src/main/java/com/volmit/iris/object/IrisBiome.java

@@ -48,8 +48,13 @@ public class IrisBiome extends IrisRegistrant implements IRare
 
 	@DontObfuscate
 	@Desc("Entity spawns to override or add to this biome")
-	@ArrayType(min = 1, type = IrisEntitySpawn.class)
+	@ArrayType(min = 1, type = IrisEntitySpawnOverride.class)
-	private KList<IrisEntitySpawn> entitySpawns = new KList<>();
+	private KList<IrisEntitySpawnOverride> entitySpawnOverrides = new KList<>();
+
+	@DontObfuscate
+	@Desc("Entity spawns during generation")
+	@ArrayType(min = 1, type = IrisEntityInitialSpawn.class)
+	private KList<IrisEntityInitialSpawn> entityInitialSpawns = new KList<>();
 
 	@ArrayType(min = 1, type = IrisEffect.class)
 	@DontObfuscate

src/main/java/com/volmit/iris/object/IrisDimension.java

@@ -53,8 +53,13 @@ public class IrisDimension extends IrisRegistrant
 
 	@DontObfuscate
 	@Desc("Entity spawns to override or add to this dimension")
-	@ArrayType(min = 1, type = IrisEntitySpawn.class)
+	@ArrayType(min = 1, type = IrisEntitySpawnOverride.class)
-	private KList<IrisEntitySpawn> entitySpawns = new KList<>();
+	private KList<IrisEntitySpawnOverride> entitySpawnOverrides = new KList<>();
+
+	@DontObfuscate
+	@Desc("Entity spawns during generation")
+	@ArrayType(min = 1, type = IrisEntityInitialSpawn.class)
+	private KList<IrisEntityInitialSpawn> entityInitialSpawns = new KList<>();
 
 	@DontObfuscate
 	@Desc("Reference loot tables in this area")

src/main/java/com/volmit/iris/object/IrisEntity.java

@@ -17,7 +17,7 @@ import org.bukkit.loot.LootTable;
 import org.bukkit.loot.Lootable;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.IrisTerrainProvider;
+import com.volmit.iris.gen.ParallaxTerrainProvider;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.C;
 import com.volmit.iris.util.Desc;
@@ -122,12 +122,12 @@ public class IrisEntity extends IrisRegistrant
 	@Desc("If specified, this entity will be leashed by this entity. I.e. THIS ENTITY Leashed by SPECIFIED. This has no effect on EnderDragons, Withers, Players, or Bats.Non-living entities excluding leashes will not persist as leashholders.")
 	private IrisEntity leashHolder = null;
 
-	public Entity spawn(IrisTerrainProvider gen, Location at)
+	public Entity spawn(ParallaxTerrainProvider gen, Location at)
 	{
 		return spawn(gen, at, new RNG(at.hashCode()));
 	}
 
-	public Entity spawn(IrisTerrainProvider gen, Location at, RNG rng)
+	public Entity spawn(ParallaxTerrainProvider gen, Location at, RNG rng)
 	{
 		Entity e = at.getWorld().spawnEntity(at, getType());
 		e.setCustomName(getCustomName() != null ? C.translateAlternateColorCodes('&', getCustomName()) : null);

src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java

@@ -0,0 +1,94 @@
+package com.volmit.iris.object;
+
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+
+import com.volmit.iris.gen.ParallaxTerrainProvider;
+import com.volmit.iris.gen.atomics.AtomicCache;
+import com.volmit.iris.util.Desc;
+import com.volmit.iris.util.DontObfuscate;
+import com.volmit.iris.util.MinNumber;
+import com.volmit.iris.util.RNG;
+import com.volmit.iris.util.RegistryListEntity;
+import com.volmit.iris.util.Required;
+
+import lombok.Data;
+
+@Desc("Represents an entity spawn during initial chunk generation")
+@Data
+public class IrisEntityInitialSpawn
+{
+	@RegistryListEntity
+	@Required
+	@DontObfuscate
+	@Desc("The entity")
+	private String entity = "";
+
+	@MinNumber(1)
+	@DontObfuscate
+	@Desc("The 1 in RARITY chance for this entity to spawn")
+	private int rarity = 1;
+
+	@MinNumber(1)
+	@DontObfuscate
+	@Desc("The minumum of this entity to spawn")
+	private int minSpawns = 1;
+
+	@MinNumber(1)
+	@DontObfuscate
+	@Desc("The max of this entity to spawn")
+	private int maxSpawns = 1;
+
+	private transient AtomicCache<RNG> rng = new AtomicCache<>();
+	private transient AtomicCache<IrisEntity> ent = new AtomicCache<>();
+
+	@SuppressWarnings("unused")
+	public boolean spawn(ParallaxTerrainProvider gen, Chunk c, RNG rng)
+	{
+		int spawns = rng.i(1, rarity) == 1 ? rng.i(minSpawns, maxSpawns) : 0;
+
+		if(spawns > 0)
+		{
+			for(int i = 0; i < spawns; i++)
+			{
+				int x = (c.getX() * 16) + rng.i(15);
+				int z = (c.getZ() * 16) + rng.i(15);
+				int h = gen.getCarvedHeight(x, z, false);
+				return spawn100(gen, new Location(c.getWorld(), x, h, z)) != null;
+			}
+		}
+
+		return false;
+	}
+
+	public IrisEntity getRealEntity(ParallaxTerrainProvider g)
+	{
+		return ent.aquire(() -> g.getData().getEntityLoader().load(getEntity()));
+	}
+
+	public Entity spawn(ParallaxTerrainProvider g, Location at)
+	{
+		if(getRealEntity(g) == null)
+		{
+			return null;
+		}
+
+		if(rng.aquire(() -> new RNG(g.getTarget().getSeed() + 4)).i(1, getRarity()) == 1)
+		{
+			return spawn100(g, at);
+		}
+
+		return null;
+	}
+
+	private Entity spawn100(ParallaxTerrainProvider g, Location at)
+	{
+		return getRealEntity(g).spawn(g, at, rng.aquire(() -> new RNG(g.getTarget().getSeed() + 4)));
+	}
+
+	public IrisEntityInitialSpawn()
+	{
+
+	}
+}

src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java

@@ -18,7 +18,7 @@ import lombok.Data;
 
 @Desc("Represents an entity spawn")
 @Data
-public class IrisEntitySpawn
+public class IrisEntitySpawnOverride
 {
 	@RegistryListEntity
 	@Required
@@ -84,7 +84,7 @@ public class IrisEntitySpawn
 		return null;
 	}
 
-	public IrisEntitySpawn()
+	public IrisEntitySpawnOverride()
 	{
 
 	}

src/main/java/com/volmit/iris/object/IrisRegion.java

@@ -38,8 +38,13 @@ public class IrisRegion extends IrisRegistrant implements IRare
 
 	@DontObfuscate
 	@Desc("Entity spawns to override or add to this region")
-	@ArrayType(min = 1, type = IrisEntitySpawn.class)
+	@ArrayType(min = 1, type = IrisEntitySpawnOverride.class)
-	private KList<IrisEntitySpawn> entitySpawns = new KList<>();
+	private KList<IrisEntitySpawnOverride> entitySpawnOverrides = new KList<>();
+
+	@DontObfuscate
+	@Desc("Entity spawns during generation")
+	@ArrayType(min = 1, type = IrisEntityInitialSpawn.class)
+	private KList<IrisEntityInitialSpawn> entityInitialSpawns = new KList<>();
 
 	@MinNumber(1)
 	@MaxNumber(256)

src/main/java/com/volmit/iris/object/IrisStructure.java

@@ -29,9 +29,14 @@ public class IrisStructure extends IrisRegistrant
 
 	@DontObfuscate
 	@Desc("Entity spawns to override or add to this structure")
-	@ArrayType(min = 1, type = IrisEntitySpawn.class)
+	@ArrayType(min = 1, type = IrisEntitySpawnOverride.class)
-	private KList<IrisEntitySpawn> entitySpawns = new KList<>();
+	private KList<IrisEntitySpawnOverride> entitySpawnOverrides = new KList<>();
 
+	@DontObfuscate
+	@Desc("Entity spawns during generation")
+	@ArrayType(min = 1, type = IrisEntityInitialSpawn.class)
+	private KList<IrisEntityInitialSpawn> entityInitialSpawns = new KList<>();
+	
 	@DontObfuscate
 	@Desc("Wall style noise")
 	private IrisGeneratorStyle wallStyle = NoiseStyle.STATIC.style();

src/main/java/com/volmit/iris/object/IrisStructureTile.java

@@ -26,8 +26,13 @@ public class IrisStructureTile
 
 	@DontObfuscate
 	@Desc("Entity spawns to override or add to this structure tile")
-	@ArrayType(min = 1, type = IrisEntitySpawn.class)
+	@ArrayType(min = 1, type = IrisEntitySpawnOverride.class)
-	private KList<IrisEntitySpawn> entitySpawns = new KList<>();
+	private KList<IrisEntitySpawnOverride> entitySpawnOverrides = new KList<>();
+
+	@DontObfuscate
+	@Desc("Entity spawns during generation")
+	@ArrayType(min = 1, type = IrisEntityInitialSpawn.class)
+	private KList<IrisEntityInitialSpawn> entityInitialSpawns = new KList<>();
 
 	@DontObfuscate
 	@Desc("The place mode for this tile")