Update pack

src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java

@@ -55,9 +55,11 @@ public class IrisGenerator extends ParallelChunkGenerator
 			MB.of(Material.SMOOTH_BRICK, 2),
 			MB.of(Material.SMOOTH_BRICK, 3),
 	});
+	public GMap<String, IrisBiome> biomeCache = new GMap<>();
 	//@done
 	private MB WATER = new MB(Material.STATIONARY_WATER);
 	private MB BEDROCK = new MB(Material.BEDROCK);
+	private GList<IrisBiome> internal;
 	private GenLayerBase glBase;
 	private GenLayerLayeredNoise glLNoise;
 	private GenLayerRidge glRidge;
@@ -78,18 +80,38 @@ public class IrisGenerator extends ParallelChunkGenerator
 	{
 		this(Iris.dimensions.get("overworld"));
 	}
-	
+
 	public GList<IrisBiome> getLoadedBiomes()
 	{
-		return IrisBiome.getAllBiomes().copy().add(dim.getBiomes());
+		return internal;
 	}
-	
+
 	public IrisGenerator(IrisDimension dim)
 	{
 		this.dim = dim;
 		L.i("Preparing Dimension: " + dim.getName() + " With " + dim.getBiomes().size() + " Biomes...");
+		internal = IrisBiome.getAllBiomes();
+
+		for(IrisBiome i : dim.getBiomes())
+		{
+			for(IrisBiome j : internal.copy())
+			{
+				if(j.getName().equals(i.getName()))
+				{
+					internal.remove(j);
+					L.i("Internal Biome: " + j.getName() + " overwritten by dimension " + dim.getName());
+				}
+			}
+		}
+
+		internal.addAll(dim.getBiomes());
+
+		for(IrisBiome i : internal)
+		{
+			biomeCache.put(i.getName(), i);
+		}
 	}
-	
+
 	@Override
 	public void onInit(World world, Random random)
 	{
@@ -121,6 +143,11 @@ public class IrisGenerator extends ParallelChunkGenerator
 		return glBiome.getBiome(wx * Iris.settings.gen.biomeScale, wz * Iris.settings.gen.biomeScale);
 	}
 
+	public IrisBiome biome(String name)
+	{
+		return biomeCache.get(name);
+	}
+
 	@Override
 	public Biome genColumn(int wxx, int wzx, int x, int z, ChunkPlan plan)
 	{
@@ -137,24 +164,19 @@ public class IrisGenerator extends ParallelChunkGenerator
 
 		if(height > 61 && height < 65)
 		{
-			override = IrisBiome.BEACH;
+			override = biome("Beach");
 		}
 
 		else if(height < 63)
 		{
 			if(height < 36)
 			{
-				override = IrisBiome.DEEP_OCEAN;
-			}
-
-			else if(height < 50)
-			{
-				override = IrisBiome.OCEAN;
+				override = biome("Deep Ocean");
 			}
 
 			else
 			{
-				override = IrisBiome.LAKE;
+				override = biome("Ocean");
 			}
 		}
 
@@ -277,4 +299,14 @@ public class IrisGenerator extends ParallelChunkGenerator
 	{
 		return world;
 	}
+
+	public GMap<String, SchematicGroup> getSchematicCache()
+	{
+		return schematicCache;
+	}
+
+	public void setSchematicCache(GMap<String, SchematicGroup> schematicCache)
+	{
+		this.schematicCache = schematicCache;
+	}
 }

src/main/java/ninja/bytecode/iris/generator/layer/GenLayerBiome.java

@@ -45,13 +45,13 @@ public class GenLayerBiome extends GenLayer
 	{
 		double x = xx + (fracture.noise(zz, xx) * 1550D);
 		double z = zz - (fracture.noise(xx, zz) * 1550D);
-		IrisBiome cbi = IrisBiome.OCEAN;
+		IrisBiome cbi = iris.biome("Ocean");
 		double land = island.noise(x, z);
 		double landChance = 1D - M.clip(Iris.settings.gen.landChance, 0D, 1D);
 		
 		if(land > landChance && land < landChance + 0.0175)
 		{
-			cbi = IrisBiome.BEACH;
+			cbi = iris.biome("Beach");
 		}
 		
 		else if(land > landChance + 0.0175)
@@ -60,7 +60,7 @@ public class GenLayerBiome extends GenLayer
 			{
 				if(biomeGenerator.hasBorder(3, 3 + Math.pow(riverCheck.noise(x, z), 1.25) * 16, x, z))
 				{
-					return IrisBiome.RIVER;
+					return iris.biome("River");
 				}
 			}
 
@@ -68,7 +68,7 @@ public class GenLayerBiome extends GenLayer
 
 			if(pathCheck.noise(x, z) > 0.33)
 			{
-				IrisBiome road = IrisBiome.ROAD_GRAVEL;
+				IrisBiome road = iris.biome("Beach");
 
 				if(cbi.getSurface().get(0).material.equals(Material.GRASS))
 				{
@@ -84,7 +84,7 @@ public class GenLayerBiome extends GenLayer
 		
 		else if(land < 0.3)
 		{
-			cbi = IrisBiome.DEEP_OCEAN;
+			cbi = iris.biome("Deep Ocean");
 		}
 		
 		return cbi;