From 9ef1c1935d3877c4680f2a34dc0727e3574266ed Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Thu, 22 Oct 2020 11:17:40 -0400
Subject: [PATCH] Drop sky providers

---
 .../iris/gen/ContextualTerrainProvider.java   |  2 +-
 .../volmit/iris/gen/IrisTerrainProvider.java  |  2 +-
 .../volmit/iris/gen/SkyTerrainProvider.java   | 21 -------------------
 .../iris/gen/atomics/AtomicMulticache.java    |  4 ++--
 4 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 src/main/java/com/volmit/iris/gen/SkyTerrainProvider.java

diff --git a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
index 566f97e78..86231b26c 100644
--- a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
+++ b/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java
@@ -89,7 +89,7 @@ public abstract class ContextualTerrainProvider implements TerrainProvider, List
 		tickLatch = new ChronoLatch(650);
 		perSecond = new ChronoLatch(1000);
 		hlast = M.ms();
-		cache = new AtomicMulticache((SkyTerrainProvider) this);
+		cache = new AtomicMulticache((IrisTerrainProvider) this);
 		CNG.creates = 0;
 		generated = 0;
 		ticks = 0;
diff --git a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java
index 3833a31ca..ea6e93250 100644
--- a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java
+++ b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java
@@ -51,7 +51,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class IrisTerrainProvider extends SkyTerrainProvider implements IrisContext
+public class IrisTerrainProvider extends PostBlockTerrainProvider implements IrisContext
 {
 	private IrisBiome hb = null;
 	private IrisRegion hr = null;
diff --git a/src/main/java/com/volmit/iris/gen/SkyTerrainProvider.java b/src/main/java/com/volmit/iris/gen/SkyTerrainProvider.java
deleted file mode 100644
index fb90ad54a..000000000
--- a/src/main/java/com/volmit/iris/gen/SkyTerrainProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.volmit.iris.gen;
-
-import com.volmit.iris.gen.scaffold.GeneratedChunk;
-import com.volmit.iris.gen.scaffold.TerrainChunk;
-import com.volmit.iris.gen.scaffold.TerrainTarget;
-import com.volmit.iris.util.RNG;
-
-public abstract class SkyTerrainProvider extends PostBlockTerrainProvider
-{
-	public SkyTerrainProvider(TerrainTarget t, String dimensionName, int threads)
-	{
-		super(t, dimensionName, threads);
-	}
-
-	@Override
-	protected GeneratedChunk onGenerate(RNG random, int x, int z, TerrainChunk terrain)
-	{
-		GeneratedChunk gc = super.onGenerate(random, x, z, terrain);
-		return gc;
-	}
-}
diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicMulticache.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicMulticache.java
index ef7b05af0..90bf27ffe 100644
--- a/src/main/java/com/volmit/iris/gen/atomics/AtomicMulticache.java
+++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicMulticache.java
@@ -3,7 +3,7 @@ package com.volmit.iris.gen.atomics;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gen.SkyTerrainProvider;
+import com.volmit.iris.gen.IrisTerrainProvider;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisRegion;
 import com.volmit.iris.util.ChunkPosition;
@@ -18,7 +18,7 @@ public class AtomicMulticache
 	private final LoadingCache<ChunkPosition, IrisBiome> rawBiome;
 	private final LoadingCache<ChunkPosition, IrisRegion> region;
 
-	public AtomicMulticache(SkyTerrainProvider gen)
+	public AtomicMulticache(IrisTerrainProvider gen)
 	{
 		height = Caffeine.newBuilder().maximumSize(getLimit()).build((c) -> gen.getNoiseHeight(c.getX(), c.getZ()) + gen.getFluidHeight());
 		carvedHeight = Caffeine.newBuilder().maximumSize(getLimit()).build((c) ->