tweaks

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>bytecode.ninja</groupId>
 	<artifactId>Iris</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<name>Iris</name>
 	<properties>
 		<skip.copy>false</skip.copy>

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

@@ -18,7 +18,7 @@ import org.bukkit.plugin.Plugin;
 
 import com.volmit.iris.command.CommandIris;
 import com.volmit.iris.command.PermissionIris;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.post.PostFloatingNibDeleter;
 import com.volmit.iris.gen.post.PostFoliageCleaner;
 import com.volmit.iris.gen.post.PostNibSmoother;
@@ -92,9 +92,9 @@ public class Iris extends MortarPlugin
 		return new ProvisionBukkit(createIrisProvider(config));
 	}
 
-	public IrisChunkGenerator createIrisProvider(IrisGenConfiguration config)
+	public IrisTerrainProvider createIrisProvider(IrisGenConfiguration config)
 	{
-		return new IrisChunkGenerator(config);
+		return new IrisTerrainProvider(config);
 	}
 
 	private static boolean doesSupport3DBiomes()
@@ -173,7 +173,7 @@ public class Iris extends MortarPlugin
 			{
 				if(i.getGenerator() instanceof ProvisionBukkit)
 				{
-					((IrisChunkGenerator) ((ProvisionBukkit) i.getGenerator()).getProvider()).close();
+					((IrisTerrainProvider) ((ProvisionBukkit) i.getGenerator()).getProvider()).close();
 				}
 			}
 

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

@@ -8,7 +8,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.provisions.ProvisionBukkit;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.object.IrisBiome;
@@ -55,7 +55,7 @@ public class IrisBoardManager implements BoardProvider, Listener
 	@DontObfuscate
 	private boolean isIrisWorld(World w)
 	{
-		return (w.getGenerator() instanceof ProvisionBukkit) && ((IrisChunkGenerator) ((ProvisionBukkit) w.getGenerator()).getProvider()).isDev();
+		return (w.getGenerator() instanceof ProvisionBukkit) && ((IrisTerrainProvider) ((ProvisionBukkit) w.getGenerator()).getProvider()).isDev();
 	}
 
 	public void updatePlayer(Player p)
@@ -89,7 +89,7 @@ public class IrisBoardManager implements BoardProvider, Listener
 			return v;
 		}
 
-		IrisChunkGenerator g = (IrisChunkGenerator) ((ProvisionBukkit) player.getWorld().getGenerator()).getProvider();
+		IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) player.getWorld().getGenerator()).getProvider();
 
 		if(cl.flip())
 		{

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

@@ -26,7 +26,7 @@ import org.zeroturnaround.zip.commons.FileUtils;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.nms.NMSCreator;
 import com.volmit.iris.gen.post.Post;
 import com.volmit.iris.gen.provisions.ProvisionBukkit;
@@ -89,7 +89,7 @@ import lombok.Data;
 public class ProjectManager
 {
 	private KMap<String, String> cacheListing = null;
-	private IrisChunkGenerator currentProject;
+	private IrisTerrainProvider currentProject;
 	private TaskExecutor tx = new TaskExecutor(8, Thread.MIN_PRIORITY, "Iris Compiler");
 	private ReentrantLock lock = new ReentrantLock();
 
@@ -324,7 +324,7 @@ public class ProjectManager
 		ProvisionBukkit gen = Iris.instance.createProvisionBukkit(IrisGenConfiguration.builder().threads(IrisSettings.get().threads).dimension(dimm).target(TerrainTarget.builder().environment(d.getEnvironment()).folder(new File(wfp)).name(wfp).seed(1337).build()).build());
 		//@done
 
-		IrisChunkGenerator gx = (IrisChunkGenerator) gen.getProvider();
+		IrisTerrainProvider gx = (IrisTerrainProvider) gen.getProvider();
 		currentProject = gx;
 		gx.setDev(true);
 		sender.sendMessage("Generating with " + IrisSettings.get().threads + " threads per chunk");

src/main/java/com/volmit/iris/command/CommandIrisCTC.java

@@ -4,7 +4,7 @@ import org.bukkit.World;
 import org.bukkit.entity.Player;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.provisions.ProvisionBukkit;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
@@ -33,7 +33,7 @@ public class CommandIrisCTC extends MortarCommand
 				return true;
 			}
 
-			IrisChunkGenerator g = (IrisChunkGenerator) ((ProvisionBukkit) world.getGenerator()).getProvider();
+			IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) world.getGenerator()).getProvider();
 			int m = Math.min(Math.max(Integer.valueOf(args[0]), 2), 256);
 			g.changeThreadCount(m);
 			sender.sendMessage("Thread count changed to " + m);

src/main/java/com/volmit/iris/command/CommandIrisCreate.java

@@ -13,7 +13,7 @@ import org.zeroturnaround.zip.commons.FileUtils;
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisDataManager;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.nms.NMSCreator;
 import com.volmit.iris.gen.provisions.ProvisionBukkit;
 import com.volmit.iris.gen.scaffold.IrisGenConfiguration;
@@ -168,7 +168,7 @@ public class CommandIrisCreate extends MortarCommand
 			while(!done.get())
 			{
 				boolean derp = false;
-				double v = (double) ((IrisChunkGenerator) gen.getProvider()).getGenerated() / (double) req;
+				double v = (double) ((IrisTerrainProvider) gen.getProvider()).getGenerated() / (double) req;
 
 				if(last > v || v > 1)
 				{

src/main/java/com/volmit/iris/command/CommandIrisMetrics.java

@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisMetrics;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.provisions.ProvisionBukkit;
 import com.volmit.iris.util.C;
 import com.volmit.iris.util.Form;
@@ -35,7 +35,7 @@ public class CommandIrisMetrics extends MortarCommand
 				return true;
 			}
 
-			IrisChunkGenerator g = (IrisChunkGenerator) ((ProvisionBukkit) world.getGenerator()).getProvider();
+			IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) world.getGenerator()).getProvider();
 			IrisMetrics m = g.getMetrics();
 			sender.sendMessage("Thread Count: " + C.BOLD + "" + C.WHITE + g.getThreads());
 			sender.sendMessage("Total     : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTotal().getAverage(), 2));

src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java

@@ -6,7 +6,7 @@ import org.bukkit.entity.Player;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.provisions.ProvisionBukkit;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.util.MortarCommand;
@@ -49,7 +49,7 @@ public class CommandIrisStudioGoto extends MortarCommand
 				return true;
 			}
 
-			IrisChunkGenerator g = (IrisChunkGenerator) ((ProvisionBukkit) world.getGenerator()).getProvider();
+			IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) world.getGenerator()).getProvider();
 			int tries = 10000;
 			boolean cave = false;
 			IrisBiome biome2 = null;

src/main/java/com/volmit/iris/command/CommandIrisStudioHotload.java

@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.provisions.ProvisionBukkit;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
@@ -39,7 +39,7 @@ public class CommandIrisStudioHotload extends MortarCommand
 				return true;
 			}
 
-			IrisChunkGenerator g = (IrisChunkGenerator) ((ProvisionBukkit) world.getGenerator()).getProvider();
+			IrisTerrainProvider g = (IrisTerrainProvider) ((ProvisionBukkit) world.getGenerator()).getProvider();
 			g.onHotload();
 			sender.sendMessage("Hotloaded!");
 			return true;

src/main/java/com/volmit/iris/command/CommandIrisStudioMap.java

@@ -2,7 +2,7 @@ package com.volmit.iris.command;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gui.IrisVision;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
@@ -32,7 +32,7 @@ public class CommandIrisStudioMap extends MortarCommand
 			return true;
 		}
 
-		IrisChunkGenerator g = Iris.proj.getCurrentProject();
+		IrisTerrainProvider g = Iris.proj.getCurrentProject();
 		IrisVision.launch(g);
 		sender.sendMessage("Opening Map!");
 		return true;

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

@@ -51,7 +51,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public abstract class ContextualChunkGenerator implements TerrainProvider, Listener
+public abstract class ContextualTerrainProvider implements TerrainProvider, Listener
 {
 	private KList<BlockPosition> noLoot;
 	private BlockPosition allowLoot;
@@ -75,7 +75,7 @@ public abstract class ContextualChunkGenerator implements TerrainProvider, Liste
 	private volatile boolean hotloadable = false;
 	private final TerrainTarget target;
 
-	public ContextualChunkGenerator(TerrainTarget target)
+	public ContextualTerrainProvider(TerrainTarget target)
 	{
 		this.target = target;
 		pushLatch = new ChronoLatch(3000);

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

@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public abstract class DimensionChunkGenerator extends ContextualChunkGenerator
+public abstract class DimensionalTerrainProvider extends ContextualTerrainProvider
 {
 	private String dimensionName;
 	protected static final BlockData AIR = Material.AIR.createBlockData();
@@ -28,7 +28,7 @@ public abstract class DimensionChunkGenerator extends ContextualChunkGenerator
 	protected static final BlockData BEDROCK = Material.BEDROCK.createBlockData();
 	protected static final BlockData WATER = Material.WATER.createBlockData();
 
-	public DimensionChunkGenerator(TerrainTarget t, String dimensionName)
+	public DimensionalTerrainProvider(TerrainTarget t, String dimensionName)
 	{
 		super(t);
 		setDimensionName(dimensionName);

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

@@ -39,28 +39,28 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class IrisChunkGenerator extends PostBlockChunkGenerator implements IrisContext
+public class IrisTerrainProvider extends PostBlockTerrainProvider implements IrisContext
 {
 	private IrisBiome hb = null;
 	private IrisRegion hr = null;
 	private boolean spawnable = false;
 
-	public IrisChunkGenerator(IrisGenConfiguration config)
+	public IrisTerrainProvider(IrisGenConfiguration config)
 	{
 		super(config.getTarget(), config.getDimension(), config.getThreads());
 	}
 
-	public IrisChunkGenerator(TerrainTarget t, String dimensionName, int threads)
+	public IrisTerrainProvider(TerrainTarget t, String dimensionName, int threads)
 	{
 		super(t, dimensionName, threads);
 	}
 
-	public IrisChunkGenerator(TerrainTarget t, String dimensionName)
+	public IrisTerrainProvider(TerrainTarget t, String dimensionName)
 	{
 		super(t, dimensionName, 16);
 	}
 
-	public IrisChunkGenerator(TerrainTarget t, int tc)
+	public IrisTerrainProvider(TerrainTarget t, int tc)
 	{
 		super(t, "", tc);
 	}

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

@@ -38,7 +38,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator implements IObjectPlacer
+public abstract class ParallaxTerrainProvider extends TopographicTerrainProvider implements IObjectPlacer
 {
 	private short cacheID = 0;
 	private KMap<ChunkPosition, AtomicSliver> sliverCache;
@@ -50,7 +50,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple
 	private GenLayerText glText;
 	private int sliverBuffer;
 
-	public ParallaxChunkGenerator(TerrainTarget t, String dimensionName, int threads)
+	public ParallaxTerrainProvider(TerrainTarget t, String dimensionName, int threads)
 	{
 		super(t, dimensionName, threads);
 		setSliverCache(new KMap<>());

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

@@ -16,13 +16,13 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public abstract class ParallelChunkGenerator extends DimensionChunkGenerator
+public abstract class ParallelTerrainProvider extends DimensionalTerrainProvider
 {
 	private GroupedExecutor accelerant;
 	private int threads;
 	private boolean cachingAllowed;
 
-	public ParallelChunkGenerator(TerrainTarget t, String dimensionName, int threads)
+	public ParallelTerrainProvider(TerrainTarget t, String dimensionName, int threads)
 	{
 		super(t, dimensionName);
 		setThreads(threads);

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

@@ -26,14 +26,14 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public abstract class PostBlockChunkGenerator extends ParallaxChunkGenerator implements IPostBlockAccess
+public abstract class PostBlockTerrainProvider extends ParallaxTerrainProvider implements IPostBlockAccess
 {
 	private String postKey;
 	private IrisLock postLock;
 	private int minPhase;
 	private int maxPhase;
 
-	public PostBlockChunkGenerator(TerrainTarget t, String dimensionName, int threads)
+	public PostBlockTerrainProvider(TerrainTarget t, String dimensionName, int threads)
 	{
 		super(t, dimensionName, threads);
 		setPostKey("post-" + dimensionName);

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

@@ -41,7 +41,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
+public abstract class TopographicTerrainProvider extends ParallelTerrainProvider
 {
 	private long lastUpdateRequest = M.ms();
 	private long lastChunkLoad = M.ms();
@@ -54,7 +54,7 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
 	private CNG masterFracture;
 	private ChronoLatch cwarn = new ChronoLatch(1000);
 
-	public TerrainChunkGenerator(TerrainTarget t, String dimensionName, int threads)
+	public TopographicTerrainProvider(TerrainTarget t, String dimensionName, int threads)
 	{
 		super(t, dimensionName, threads);
 		setGenerators(new KMap<>());

src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java

@@ -9,7 +9,7 @@ import java.io.OutputStream;
 import org.bukkit.generator.ChunkGenerator.BiomeGrid;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.DimensionChunkGenerator;
+import com.volmit.iris.gen.DimensionalTerrainProvider;
 import com.volmit.iris.object.IrisStructure;
 import com.volmit.iris.object.IrisStructureTile;
 import com.volmit.iris.util.HeightMap;
@@ -56,7 +56,7 @@ public class AtomicSliverMap
 		structures.put(y, s.getLoadKey() + "." + s.getTiles().indexOf(t));
 	}
 
-	public IrisStructureResult getStructure(DimensionChunkGenerator g, int y)
+	public IrisStructureResult getStructure(DimensionalTerrainProvider g, int y)
 	{
 		String v = structures.get(y);
 

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

@@ -1,6 +1,6 @@
 package com.volmit.iris.gen.layer;
 
-import com.volmit.iris.gen.ContextualChunkGenerator;
+import com.volmit.iris.gen.ContextualTerrainProvider;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.object.InferredType;
 import com.volmit.iris.object.IrisBiome;
@@ -23,12 +23,12 @@ public class BiomeDataProvider
 		generator = layer.getIris().getDimension().getBiomeStyle(type).create(rng.nextParallelRNG(4645079 + (type.ordinal() * 23845)));
 	}
 
-	public IrisBiome generatePureData(ContextualChunkGenerator g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
+	public IrisBiome generatePureData(ContextualTerrainProvider g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
 	{
 		return layer.generateBiomeData(bx, bz, regionData, getGenerator(), regionData.getBiomes(g, getType()), getType(), rawX, rawZ, true);
 	}
 
-	public IrisBiome generateData(ContextualChunkGenerator g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
+	public IrisBiome generateData(ContextualTerrainProvider g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
 	{
 		return layer.generateBiomeData(bx, bz, regionData, getGenerator(), regionData.getBiomes(g, getType()), getType(), rawX, rawZ, false);
 	}

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

@@ -2,7 +2,7 @@ package com.volmit.iris.gen.layer;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.DimensionChunkGenerator;
+import com.volmit.iris.gen.DimensionalTerrainProvider;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.object.InferredType;
 import com.volmit.iris.object.IrisBiome;
@@ -30,9 +30,9 @@ public class GenLayerBiome extends GenLayer
 	private BiomeDataProvider caveProvider;
 	private BiomeDataProvider riverProvider;
 	private BiomeDataProvider lakeProvider;
-	private DimensionChunkGenerator iris;
+	private DimensionalTerrainProvider iris;
 
-	public GenLayerBiome(DimensionChunkGenerator iris, RNG rng)
+	public GenLayerBiome(DimensionalTerrainProvider iris, RNG rng)
 	{
 		super(iris, rng);
 		this.iris = iris;

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

@@ -1,6 +1,6 @@
 package com.volmit.iris.gen.layer;
 
-import com.volmit.iris.gen.DimensionChunkGenerator;
+import com.volmit.iris.gen.DimensionalTerrainProvider;
 import com.volmit.iris.object.IrisCarveLayer;
 import com.volmit.iris.util.GenLayer;
 import com.volmit.iris.util.RNG;
@@ -11,7 +11,7 @@ public class GenLayerCarve extends GenLayer
 	private int minimum;
 	private int maximum;
 
-	public GenLayerCarve(DimensionChunkGenerator iris, RNG rng)
+	public GenLayerCarve(DimensionalTerrainProvider iris, RNG rng)
 	{
 		super(iris, rng);
 

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

@@ -3,7 +3,7 @@ package com.volmit.iris.gen.layer;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 
-import com.volmit.iris.gen.DimensionChunkGenerator;
+import com.volmit.iris.gen.DimensionalTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicSliver;
 import com.volmit.iris.noise.FastNoise;
 import com.volmit.iris.noise.FastNoise.CellularDistanceFunction;
@@ -24,7 +24,7 @@ public class GenLayerCave extends GenLayer
 	private static final KList<CaveResult> EMPTY = new KList<>();
 	private FastNoise gg;
 
-	public GenLayerCave(DimensionChunkGenerator iris, RNG rng)
+	public GenLayerCave(DimensionalTerrainProvider iris, RNG rng)
 	{
 		//@builder
 		super(iris, rng);

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

@@ -8,7 +8,7 @@ import java.awt.image.BufferedImage;
 import org.bukkit.block.data.BlockData;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.DimensionChunkGenerator;
+import com.volmit.iris.gen.DimensionalTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.object.IrisMaterialPalette;
 import com.volmit.iris.object.IrisObject;
@@ -22,7 +22,7 @@ public class GenLayerText extends GenLayer
 
 	private AtomicCache<IrisObject> debug = new AtomicCache<>();
 
-	public GenLayerText(DimensionChunkGenerator iris, RNG rng)
+	public GenLayerText(DimensionalTerrainProvider iris, RNG rng)
 	{
 		super(iris, rng);
 	}

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

@@ -13,7 +13,7 @@ import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.ParallaxChunkGenerator;
+import com.volmit.iris.gen.ParallaxTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicSliverMap;
 import com.volmit.iris.object.InventorySlotType;
 import com.volmit.iris.object.IrisBiome;
@@ -29,10 +29,10 @@ import com.volmit.iris.util.RNG;
 
 public class GenLayerUpdate extends BlockPopulator
 {
-	private ParallaxChunkGenerator gen;
+	private ParallaxTerrainProvider gen;
 	private RNG rng;
 
-	public GenLayerUpdate(ParallaxChunkGenerator gen)
+	public GenLayerUpdate(ParallaxTerrainProvider gen)
 	{
 		this.gen = gen;
 		this.rng = new RNG(gen.getTarget().getSeed() + 4996788).nextParallelRNG(-98618289);

src/main/java/com/volmit/iris/gen/post/PostFloatingNibDeleter.java

@@ -3,7 +3,7 @@ package com.volmit.iris.gen.post;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.PostBlockChunkGenerator;
+import com.volmit.iris.gen.PostBlockTerrainProvider;
 import com.volmit.iris.util.B;
 import com.volmit.iris.util.DontObfuscate;
 import com.volmit.iris.util.IrisPostBlockFilter;
@@ -14,13 +14,13 @@ public class PostFloatingNibDeleter extends IrisPostBlockFilter
 	private static final BlockData AIR = B.getBlockData("AIR");
 
 	@DontObfuscate
-	public PostFloatingNibDeleter(PostBlockChunkGenerator gen, int phase)
+	public PostFloatingNibDeleter(PostBlockTerrainProvider gen, int phase)
 	{
 		super(gen, phase);
 	}
 
 	@DontObfuscate
-	public PostFloatingNibDeleter(PostBlockChunkGenerator gen)
+	public PostFloatingNibDeleter(PostBlockTerrainProvider gen)
 	{
 		this(gen, 0);
 	}

src/main/java/com/volmit/iris/gen/post/PostFoliageCleaner.java

@@ -4,7 +4,7 @@ import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.PostBlockChunkGenerator;
+import com.volmit.iris.gen.PostBlockTerrainProvider;
 import com.volmit.iris.util.B;
 import com.volmit.iris.util.DontObfuscate;
 import com.volmit.iris.util.IrisPostBlockFilter;
@@ -15,13 +15,13 @@ public class PostFoliageCleaner extends IrisPostBlockFilter
 	public static final BlockData AIR = B.get("AIR");
 
 	@DontObfuscate
-	public PostFoliageCleaner(PostBlockChunkGenerator gen, int phase)
+	public PostFoliageCleaner(PostBlockTerrainProvider gen, int phase)
 	{
 		super(gen, phase);
 	}
 
 	@DontObfuscate
-	public PostFoliageCleaner(PostBlockChunkGenerator gen)
+	public PostFoliageCleaner(PostBlockTerrainProvider gen)
 	{
 		this(gen, 0);
 	}

src/main/java/com/volmit/iris/gen/post/PostNibSmoother.java

@@ -4,7 +4,7 @@ import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.PostBlockChunkGenerator;
+import com.volmit.iris.gen.PostBlockTerrainProvider;
 import com.volmit.iris.util.DontObfuscate;
 import com.volmit.iris.util.IrisPostBlockFilter;
 
@@ -12,13 +12,13 @@ import com.volmit.iris.util.IrisPostBlockFilter;
 public class PostNibSmoother extends IrisPostBlockFilter
 {
 	@DontObfuscate
-	public PostNibSmoother(PostBlockChunkGenerator gen, int phase)
+	public PostNibSmoother(PostBlockTerrainProvider gen, int phase)
 	{
 		super(gen, phase);
 	}
 
 	@DontObfuscate
-	public PostNibSmoother(PostBlockChunkGenerator gen)
+	public PostNibSmoother(PostBlockTerrainProvider gen)
 	{
 		this(gen, 0);
 	}

src/main/java/com/volmit/iris/gen/post/PostPotholeFiller.java

@@ -2,7 +2,7 @@ package com.volmit.iris.gen.post;
 
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.PostBlockChunkGenerator;
+import com.volmit.iris.gen.PostBlockTerrainProvider;
 import com.volmit.iris.util.DontObfuscate;
 import com.volmit.iris.util.IrisPostBlockFilter;
 
@@ -10,13 +10,13 @@ import com.volmit.iris.util.IrisPostBlockFilter;
 public class PostPotholeFiller extends IrisPostBlockFilter
 {
 	@DontObfuscate
-	public PostPotholeFiller(PostBlockChunkGenerator gen, int phase)
+	public PostPotholeFiller(PostBlockTerrainProvider gen, int phase)
 	{
 		super(gen, phase);
 	}
 
 	@DontObfuscate
-	public PostPotholeFiller(PostBlockChunkGenerator gen)
+	public PostPotholeFiller(PostBlockTerrainProvider gen)
 	{
 		this(gen, 0);
 	}

src/main/java/com/volmit/iris/gen/post/PostSlabber.java

@@ -4,7 +4,7 @@ import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.PostBlockChunkGenerator;
+import com.volmit.iris.gen.PostBlockTerrainProvider;
 import com.volmit.iris.util.DontObfuscate;
 import com.volmit.iris.util.IrisPostBlockFilter;
 import com.volmit.iris.util.RNG;
@@ -17,14 +17,14 @@ public class PostSlabber extends IrisPostBlockFilter
 	private RNG rng;
 
 	@DontObfuscate
-	public PostSlabber(PostBlockChunkGenerator gen, int phase)
+	public PostSlabber(PostBlockTerrainProvider gen, int phase)
 	{
 		super(gen, phase);
 		rng = gen.getMasterRandom().nextParallelRNG(166456);
 	}
 
 	@DontObfuscate
-	public PostSlabber(PostBlockChunkGenerator gen)
+	public PostSlabber(PostBlockTerrainProvider gen)
 	{
 		this(gen, 0);
 	}

src/main/java/com/volmit/iris/gen/post/PostWallPatcher.java

@@ -4,7 +4,7 @@ import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.PostBlockChunkGenerator;
+import com.volmit.iris.gen.PostBlockTerrainProvider;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.util.DontObfuscate;
 import com.volmit.iris.util.IrisPostBlockFilter;
@@ -17,14 +17,14 @@ public class PostWallPatcher extends IrisPostBlockFilter
 	private RNG rng;
 
 	@DontObfuscate
-	public PostWallPatcher(PostBlockChunkGenerator gen, int phase)
+	public PostWallPatcher(PostBlockTerrainProvider gen, int phase)
 	{
 		super(gen, phase);
 		rng = gen.getMasterRandom().nextParallelRNG(1239456);
 	}
 
 	@DontObfuscate
-	public PostWallPatcher(PostBlockChunkGenerator gen)
+	public PostWallPatcher(PostBlockTerrainProvider gen)
 	{
 		this(gen, 0);
 	}

src/main/java/com/volmit/iris/gen/post/PostWaterlogger.java

@@ -5,7 +5,7 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Waterlogged;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.PostBlockChunkGenerator;
+import com.volmit.iris.gen.PostBlockTerrainProvider;
 import com.volmit.iris.util.B;
 import com.volmit.iris.util.DontObfuscate;
 import com.volmit.iris.util.IrisPostBlockFilter;
@@ -16,13 +16,13 @@ public class PostWaterlogger extends IrisPostBlockFilter
 	private static final BlockData WATER = B.getBlockData("WATER");
 
 	@DontObfuscate
-	public PostWaterlogger(PostBlockChunkGenerator gen, int phase)
+	public PostWaterlogger(PostBlockTerrainProvider gen, int phase)
 	{
 		super(gen, phase);
 	}
 
 	@DontObfuscate
-	public PostWaterlogger(PostBlockChunkGenerator gen)
+	public PostWaterlogger(PostBlockTerrainProvider gen)
 	{
 		super(gen);
 	}

src/main/java/com/volmit/iris/gen/scaffold/IrisGenConfiguration.java

@@ -1,6 +1,6 @@
 package com.volmit.iris.gen.scaffold;
 
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 
 import lombok.Builder;
 import lombok.Data;
@@ -17,8 +17,8 @@ public class IrisGenConfiguration
 	@Builder.Default
 	private String dimension = "";
 
-	public IrisChunkGenerator buildGenerator()
+	public IrisTerrainProvider buildGenerator()
 	{
-		return new IrisChunkGenerator(this);
+		return new IrisTerrainProvider(this);
 	}
 }

src/main/java/com/volmit/iris/gen/scaffold/IrisWorlds.java

@@ -2,7 +2,7 @@ package com.volmit.iris.gen.scaffold;
 
 import org.bukkit.World;
 
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 
 public class IrisWorlds
 {
@@ -11,11 +11,11 @@ public class IrisWorlds
 		return world.getGenerator() instanceof Provisioned;
 	}
 
-	public IrisChunkGenerator getProvider(World world)
+	public IrisTerrainProvider getProvider(World world)
 	{
 		if(isIrisWorld(world))
 		{
-			return (IrisChunkGenerator) ((Provisioned) world.getGenerator()).getProvider();
+			return (IrisTerrainProvider) ((Provisioned) world.getGenerator()).getProvider();
 		}
 
 		return null;

src/main/java/com/volmit/iris/gui/IrisVision.java

@@ -22,7 +22,7 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.util.BlockPosition;
 import com.volmit.iris.util.J;
 import com.volmit.iris.util.KMap;
@@ -330,7 +330,7 @@ public class IrisVision extends JPanel implements MouseWheelListener
 		}
 	}
 
-	public static void launch(IrisChunkGenerator g)
+	public static void launch(IrisTerrainProvider g)
 	{
 		J.a(() ->
 		{

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

@@ -6,7 +6,7 @@ import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.ContextualChunkGenerator;
+import com.volmit.iris.gen.ContextualTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;
@@ -207,7 +207,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
 		});
 	}
 
-	public double getHeight(ContextualChunkGenerator xg, double x, double z, long seed)
+	public double getHeight(ContextualTerrainProvider xg, double x, double z, long seed)
 	{
 		double height = 0;
 
@@ -494,7 +494,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
 		return biomeSkyScatter.get(getBiomeGenerator(rng).fit(0, biomeSkyScatter.size() - 1, x, y, z));
 	}
 
-	public KList<IrisBiome> getRealChildren(ContextualChunkGenerator g)
+	public KList<IrisBiome> getRealChildren(ContextualTerrainProvider g)
 	{
 		return realChildren.aquire(() ->
 		{
@@ -509,7 +509,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
 		});
 	}
 
-	public KList<String> getAllChildren(ContextualChunkGenerator g, int limit)
+	public KList<String> getAllChildren(ContextualTerrainProvider g, int limit)
 	{
 		KSet<String> m = new KSet<>();
 		m.addAll(getChildren());

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

@@ -1,7 +1,7 @@
 package com.volmit.iris.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.ContextualChunkGenerator;
+import com.volmit.iris.gen.ContextualTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.util.DependsOn;
 import com.volmit.iris.util.Desc;
@@ -46,7 +46,7 @@ public class IrisBiomeGeneratorLink
 
 	}
 
-	public IrisGenerator getCachedGenerator(ContextualChunkGenerator g)
+	public IrisGenerator getCachedGenerator(ContextualTerrainProvider g)
 	{
 		return gen.aquire(() ->
 		{
@@ -61,7 +61,7 @@ public class IrisBiomeGeneratorLink
 		});
 	}
 
-	public double getHeight(ContextualChunkGenerator xg, double x, double z, long seed)
+	public double getHeight(ContextualTerrainProvider xg, double x, double z, long seed)
 	{
 		double g = getCachedGenerator(xg).getHeight(x, z, seed);
 		g = g < 0 ? 0 : g;

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

@@ -1,6 +1,6 @@
 package com.volmit.iris.object;
 
-import com.volmit.iris.gen.ContextualChunkGenerator;
+import com.volmit.iris.gen.ContextualTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
@@ -56,17 +56,17 @@ public class IrisBiomeMutation
 	private transient AtomicCache<KList<String>> sideACache = new AtomicCache<>();
 	private transient AtomicCache<KList<String>> sideBCache = new AtomicCache<>();
 
-	public KList<String> getRealSideA(ContextualChunkGenerator xg)
+	public KList<String> getRealSideA(ContextualTerrainProvider xg)
 	{
 		return sideACache.aquire(() -> processList(xg, getSideA()));
 	}
 
-	public KList<String> getRealSideB(ContextualChunkGenerator xg)
+	public KList<String> getRealSideB(ContextualTerrainProvider xg)
 	{
 		return sideBCache.aquire(() -> processList(xg, getSideB()));
 	}
 
-	public KList<String> processList(ContextualChunkGenerator xg, KList<String> s)
+	public KList<String> processList(ContextualTerrainProvider xg, KList<String> s)
 	{
 		KSet<String> r = new KSet<>();
 

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

@@ -5,7 +5,7 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 import org.bukkit.util.BlockVector;
 
-import com.volmit.iris.gen.TerrainChunkGenerator;
+import com.volmit.iris.gen.TopographicTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.B;
@@ -153,7 +153,7 @@ public class IrisDepositGenerator
 		});
 	}
 
-	public void generate(ChunkData data, RNG rng, TerrainChunkGenerator g, int cx, int cz)
+	public void generate(ChunkData data, RNG rng, TopographicTerrainProvider g, int cx, int cz)
 	{
 		for(int l = 0; l < rng.i(getMinPerChunk(), getMaxPerChunk()); l++)
 		{

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

@@ -6,9 +6,9 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.util.BlockVector;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.ContextualChunkGenerator;
+import com.volmit.iris.gen.ContextualTerrainProvider;
-import com.volmit.iris.gen.ParallelChunkGenerator;
+import com.volmit.iris.gen.ParallelTerrainProvider;
-import com.volmit.iris.gen.PostBlockChunkGenerator;
+import com.volmit.iris.gen.PostBlockTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;
@@ -310,7 +310,7 @@ public class IrisDimension extends IrisRegistrant
 	private transient AtomicCache<Double> cosr = new AtomicCache<>();
 	private transient AtomicCache<Double> rad = new AtomicCache<>();
 
-	public KList<IrisPostBlockFilter> getPostBlockProcessors(PostBlockChunkGenerator g)
+	public KList<IrisPostBlockFilter> getPostBlockProcessors(PostBlockTerrainProvider g)
 	{
 		return cacheFilters.aquire(() ->
 		{
@@ -595,7 +595,7 @@ public class IrisDimension extends IrisRegistrant
 		return cosr.aquire(() -> Math.cos(getDimensionAngle()));
 	}
 
-	public KList<IrisRegion> getAllRegions(ContextualChunkGenerator g)
+	public KList<IrisRegion> getAllRegions(ContextualTerrainProvider g)
 	{
 		KList<IrisRegion> r = new KList<>();
 
@@ -607,7 +607,7 @@ public class IrisDimension extends IrisRegistrant
 		return r;
 	}
 
-	public KList<IrisBiome> getAllBiomes(ContextualChunkGenerator g)
+	public KList<IrisBiome> getAllBiomes(ContextualTerrainProvider g)
 	{
 		KList<IrisBiome> r = new KList<>();
 
@@ -619,7 +619,7 @@ public class IrisDimension extends IrisRegistrant
 		return r;
 	}
 
-	public ChunkPosition getParallaxSize(ParallelChunkGenerator g)
+	public ChunkPosition getParallaxSize(ParallelTerrainProvider g)
 	{
 		return parallaxSize.aquire(() ->
 		{

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

@@ -8,7 +8,7 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.util.ChronoLatch;
 import com.volmit.iris.util.DependsOn;
@@ -220,7 +220,7 @@ public class IrisEffect
 		});
 	}
 
-	public void apply(Player p, IrisChunkGenerator g)
+	public void apply(Player p, IrisTerrainProvider g)
 	{
 		if(!canTick())
 		{

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.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 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(IrisChunkGenerator gen, Location at)
+	public Entity spawn(IrisTerrainProvider gen, Location at)
 	{
 		return spawn(gen, at, new RNG(at.hashCode()));
 	}
 
-	public Entity spawn(IrisChunkGenerator gen, Location at, RNG rng)
+	public Entity spawn(IrisTerrainProvider 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/IrisEntitySpawn.java

@@ -5,7 +5,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.entity.EntitySpawnEvent;
 
-import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
@@ -43,7 +43,7 @@ public class IrisEntitySpawn
 	private transient AtomicCache<RNG> rng = new AtomicCache<>();
 	private transient AtomicCache<IrisEntity> ent = new AtomicCache<>();
 
-	public Entity on(IrisChunkGenerator g, Location at, EntityType t, EntitySpawnEvent ee)
+	public Entity on(IrisTerrainProvider g, Location at, EntityType t, EntitySpawnEvent ee)
 	{
 		if(!trigger.equals(EntityType.UNKNOWN))
 		{
@@ -64,12 +64,12 @@ public class IrisEntitySpawn
 		return e;
 	}
 
-	public IrisEntity getRealEntity(IrisChunkGenerator g)
+	public IrisEntity getRealEntity(IrisTerrainProvider g)
 	{
 		return ent.aquire(() -> g.getData().getEntityLoader().load(getEntity()));
 	}
 
-	public Entity spawn(IrisChunkGenerator g, Location at)
+	public Entity spawn(IrisTerrainProvider g, Location at)
 	{
 		if(getRealEntity(g) == null)
 		{

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

@@ -1,6 +1,6 @@
 package com.volmit.iris.object;
 
-import com.volmit.iris.gen.DimensionChunkGenerator;
+import com.volmit.iris.gen.DimensionalTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
@@ -37,7 +37,7 @@ public class IrisLootReference
 
 	}
 
-	public KList<IrisLootTable> getLootTables(DimensionChunkGenerator g)
+	public KList<IrisLootTable> getLootTables(DimensionalTerrainProvider g)
 	{
 		return tt.aquire(() ->
 		{

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

@@ -1,7 +1,7 @@
 package com.volmit.iris.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.ContextualChunkGenerator;
+import com.volmit.iris.gen.ContextualTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;
@@ -140,7 +140,7 @@ public class IrisObjectPlacement
 		return getSurfaceWarp(rng).fitDouble(-(getWarp().getMultiplier() / 2D), (getWarp().getMultiplier() / 2D), x, y, z);
 	}
 
-	public IrisObject getSchematic(ContextualChunkGenerator g, RNG random)
+	public IrisObject getSchematic(ContextualTerrainProvider g, RNG random)
 	{
 		if(place.isEmpty())
 		{

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

@@ -1,7 +1,7 @@
 package com.volmit.iris.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.ContextualChunkGenerator;
+import com.volmit.iris.gen.ContextualTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.noise.CNG;
 import com.volmit.iris.util.ArrayType;
@@ -332,7 +332,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
 		return getShoreHeightGenerator().fitDouble(shoreHeightMin, shoreHeightMax, x / shoreHeightZoom, z / shoreHeightZoom);
 	}
 
-	public KList<IrisBiome> getAllBiomes(ContextualChunkGenerator g)
+	public KList<IrisBiome> getAllBiomes(ContextualTerrainProvider g)
 	{
 		KMap<String, IrisBiome> b = new KMap<>();
 		KSet<String> names = new KSet<>();
@@ -365,7 +365,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
 		return b.v();
 	}
 
-	public KList<IrisBiome> getBiomes(ContextualChunkGenerator g, InferredType type)
+	public KList<IrisBiome> getBiomes(ContextualTerrainProvider g, InferredType type)
 	{
 		if(type.equals(InferredType.LAND))
 		{
@@ -400,7 +400,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
 		return new KList<>();
 	}
 
-	public KList<IrisBiome> getRealCaveBiomes(ContextualChunkGenerator g)
+	public KList<IrisBiome> getRealCaveBiomes(ContextualTerrainProvider g)
 	{
 		return realCaveBiomes.aquire(() ->
 		{
@@ -415,7 +415,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
 		});
 	}
 
-	public KList<IrisBiome> getRealLakeBiomes(ContextualChunkGenerator g)
+	public KList<IrisBiome> getRealLakeBiomes(ContextualTerrainProvider g)
 	{
 		return realLakeBiomes.aquire(() ->
 		{
@@ -430,7 +430,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
 		});
 	}
 
-	public KList<IrisBiome> getRealRiverBiomes(ContextualChunkGenerator g)
+	public KList<IrisBiome> getRealRiverBiomes(ContextualTerrainProvider g)
 	{
 		return realRiverBiomes.aquire(() ->
 		{
@@ -445,7 +445,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
 		});
 	}
 
-	public KList<IrisBiome> getRealShoreBiomes(ContextualChunkGenerator g)
+	public KList<IrisBiome> getRealShoreBiomes(ContextualTerrainProvider g)
 	{
 		return realShoreBiomes.aquire(() ->
 		{
@@ -460,7 +460,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
 		});
 	}
 
-	public KList<IrisBiome> getRealSeaBiomes(ContextualChunkGenerator g)
+	public KList<IrisBiome> getRealSeaBiomes(ContextualTerrainProvider g)
 	{
 		return realSeaBiomes.aquire(() ->
 		{
@@ -475,7 +475,7 @@ public class IrisRegion extends IrisRegistrant implements IRare
 		});
 	}
 
-	public KList<IrisBiome> getRealLandBiomes(ContextualChunkGenerator g)
+	public KList<IrisBiome> getRealLandBiomes(ContextualTerrainProvider g)
 	{
 		return realLandBiomes.aquire(() ->
 		{

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

@@ -1,8 +1,8 @@
 package com.volmit.iris.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gen.ContextualChunkGenerator;
+import com.volmit.iris.gen.ContextualTerrainProvider;
-import com.volmit.iris.gen.ParallaxChunkGenerator;
+import com.volmit.iris.gen.ParallaxTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.noise.CellGenerator;
 import com.volmit.iris.util.ChunkPosition;
@@ -65,7 +65,7 @@ public class IrisStructurePlacement
 
 	}
 
-	public void place(ParallaxChunkGenerator g, RNG rngno, int cx, int cz)
+	public void place(ParallaxTerrainProvider g, RNG rngno, int cx, int cz)
 	{
 		try
 		{
@@ -118,7 +118,7 @@ public class IrisStructurePlacement
 		}
 	}
 
-	public void placeLayer(ParallaxChunkGenerator g, RNG rng, RNG rnp, int i, int k, int j, int s, int sh)
+	public void placeLayer(ParallaxTerrainProvider g, RNG rng, RNG rnp, int i, int k, int j, int s, int sh)
 	{
 		if(!hasStructure(g, rng, i, k, j))
 		{
@@ -156,27 +156,27 @@ public class IrisStructurePlacement
 		});
 	}
 
-	public IrisObject load(ContextualChunkGenerator g, String s)
+	public IrisObject load(ContextualTerrainProvider g, String s)
 	{
 		return g.getData().getObjectLoader().load(s);
 	}
 
-	public int gridSize(ContextualChunkGenerator g)
+	public int gridSize(ContextualTerrainProvider g)
 	{
 		return getStructure(g).getGridSize();
 	}
 
-	public int gridHeight(ContextualChunkGenerator g)
+	public int gridHeight(ContextualTerrainProvider g)
 	{
 		return getStructure(g).getGridHeight();
 	}
 
-	public IrisStructure getStructure(ContextualChunkGenerator g)
+	public IrisStructure getStructure(ContextualTerrainProvider g)
 	{
 		return structure.aquire(() -> (g == null ? Iris.globaldata : g.getData()).getStructureLoader().load(getTileset()));
 	}
 
-	public boolean hasStructure(ParallaxChunkGenerator g, RNG random, double x, double y, double z)
+	public boolean hasStructure(ParallaxTerrainProvider g, RNG random, double x, double y, double z)
 	{
 		if(g.getGlCarve().isCarved((int) x, (int) y, (int) z))
 		{
@@ -191,7 +191,7 @@ public class IrisStructurePlacement
 		return false;
 	}
 
-	public CellGenerator getChanceGenerator(ParallaxChunkGenerator g, RNG random)
+	public CellGenerator getChanceGenerator(ParallaxTerrainProvider g, RNG random)
 	{
 		return chanceCell.aquire(() ->
 		{

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

@@ -1,6 +1,6 @@
 package com.volmit.iris.object;
 
-import com.volmit.iris.gen.ParallaxChunkGenerator;
+import com.volmit.iris.gen.ParallaxTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
@@ -107,7 +107,7 @@ public class IrisTextPlacement
 		return m;
 	}
 
-	public void place(ParallaxChunkGenerator g, RNG rng, int x, int z)
+	public void place(ParallaxTerrainProvider g, RNG rng, int x, int z)
 	{
 		int tr = getConfig().getTriesForChunk(rng);
 

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

@@ -4,7 +4,7 @@ import java.awt.Canvas;
 import java.awt.Font;
 import java.awt.FontMetrics;
 
-import com.volmit.iris.gen.ParallaxChunkGenerator;
+import com.volmit.iris.gen.ParallaxTerrainProvider;
 import com.volmit.iris.gen.atomics.AtomicCache;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
@@ -60,7 +60,7 @@ public class IrisTextRenderer
 
 	}
 
-	public KList<IrisObject> getObjects(ParallaxChunkGenerator g, RNG rng)
+	public KList<IrisObject> getObjects(ParallaxTerrainProvider g, RNG rng)
 	{
 		return objects.aquire(() ->
 		{
@@ -138,7 +138,7 @@ public class IrisTextRenderer
 		});
 	}
 
-	public void place(ParallaxChunkGenerator g, RNG rng, IrisObjectPlacement config, int xb, int zb)
+	public void place(ParallaxTerrainProvider g, RNG rng, IrisObjectPlacement config, int xb, int zb)
 	{
 		getObjects(g, rng).get(rng.nextInt(getObjects(g, rng).size())).place(xb, zb, g, config, rng);
 	}

src/main/java/com/volmit/iris/util/GenLayer.java

@@ -1,13 +1,13 @@
 package com.volmit.iris.util;
 
-import com.volmit.iris.gen.DimensionChunkGenerator;
+import com.volmit.iris.gen.DimensionalTerrainProvider;
 
 public abstract class GenLayer
 {
 	protected final RNG rng;
-	protected final DimensionChunkGenerator iris;
+	protected final DimensionalTerrainProvider iris;
 
-	public GenLayer(DimensionChunkGenerator iris, RNG rng)
+	public GenLayer(DimensionalTerrainProvider iris, RNG rng)
 	{
 		this.iris = iris;
 		this.rng = rng;

src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java

@@ -7,7 +7,7 @@ import org.bukkit.block.data.Waterlogged;
 import org.bukkit.block.data.type.Slab;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 
-import com.volmit.iris.gen.PostBlockChunkGenerator;
+import com.volmit.iris.gen.PostBlockTerrainProvider;
 import com.volmit.iris.gen.post.Post;
 
 import lombok.Data;
@@ -15,13 +15,13 @@ import lombok.Data;
 @Data
 public abstract class IrisPostBlockFilter implements IPostBlockAccess
 {
-	public PostBlockChunkGenerator gen;
+	public PostBlockTerrainProvider gen;
 	private int phase;
 	private String key;
 	private KList<Runnable> queue = new KList<>();
 
 	@DontObfuscate
-	public IrisPostBlockFilter(PostBlockChunkGenerator gen, int phase)
+	public IrisPostBlockFilter(PostBlockTerrainProvider gen, int phase)
 	{
 		this.gen = gen;
 		this.phase = phase;
@@ -30,7 +30,7 @@ public abstract class IrisPostBlockFilter implements IPostBlockAccess
 	}
 
 	@DontObfuscate
-	public IrisPostBlockFilter(PostBlockChunkGenerator gen)
+	public IrisPostBlockFilter(PostBlockTerrainProvider gen)
 	{
 		this(gen, 0);
 	}

src/main/java/com/volmit/iris/util/WorldGenLayer.java

@@ -3,7 +3,7 @@ package com.volmit.iris.util;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 
-import com.volmit.iris.gen.TerrainChunkGenerator;
+import com.volmit.iris.gen.TopographicTerrainProvider;
 
 public abstract class WorldGenLayer
 {
@@ -12,5 +12,5 @@ public abstract class WorldGenLayer
 
 	}
 
-	public abstract void gen(TerrainChunkGenerator g, Chunk c, int x, int z, World w, RNG r);
+	public abstract void gen(TopographicTerrainProvider g, Chunk c, int x, int z, World w, RNG r);
 }