From ec39d7146c9ca7e8acdf8b0cc34eb99199f25a9b Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Wed, 11 Nov 2020 00:30:39 -0500
Subject: [PATCH] Fixes

---
 .../volmit/iris/generator/IrisEngineCompound.java |  3 +++
 .../scaffold/engine/EngineCompositeGenerator.java | 15 +++------------
 .../iris/scaffold/engine/EngineCompound.java      |  2 ++
 .../volmit/iris/scaffold/engine/IrisAccess.java   |  2 --
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java b/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java
index 5e520d32e..b361decae 100644
--- a/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java
+++ b/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java
@@ -42,6 +42,9 @@ public class IrisEngineCompound implements EngineCompound {
     @Getter
     private final IrisDimension rootDimension;
 
+    @Getter
+    private int threadCount;
+
     public IrisEngineCompound(World world, IrisDimension rootDimension, IrisDataManager data, int maximumThreads)
     {
         this.rootDimension = rootDimension;
diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
index e93930eba..53c91fc89 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
@@ -7,7 +7,6 @@ import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.object.IrisBiome;
 import com.volmit.iris.object.IrisDimension;
 import com.volmit.iris.scaffold.hunk.Hunk;
-import com.volmit.iris.util.Form;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.M;
 import org.bukkit.Bukkit;
@@ -137,18 +136,17 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
     @Override
     public ChunkData generateChunkData(@NotNull World world, @NotNull Random ignored, int x, int z, @NotNull BiomeGrid biome) {
         TerrainChunk tc = TerrainChunk.create(world, biome);
-        generateChunkRawData(world, ignored, x, z, tc);
+        generateChunkRawData(world, x, z, tc);
         return tc.getRaw();
     }
 
-    public void generateChunkRawData(World world, Random ignored, int x, int z, TerrainChunk tc)
+    public void generateChunkRawData(World world, int x, int z, TerrainChunk tc)
     {
         initialize(world);
         Hunk<BlockData> blocks = Hunk.view((ChunkData) tc);
         Hunk<Biome> biomes = Hunk.view((BiomeGrid) tc);
         long m = M.ms();
         compound.generate(x * 16, z * 16, blocks, biomes);
-        System.out.println("Generated " + x + "," + z + " in " + Form.duration(M.ms() - m, 0));
         generated++;
     }
 
@@ -251,16 +249,9 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
         return getEngineAccess(y).getHeight(x, z);
     }
 
-    @Override
-    public IrisBiome getAbsoluteBiome(int x, int y, int z) {
-        // TODO: REMOVE GET BIOME OR THIS ONE
-        return getEngineAccess(y).getBiome(x, y-getComposite().getEngineForHeight(y).getMinHeight(), z);
-    }
-
     @Override
     public int getThreadCount() {
-        // TODO: NOT CORRECT
-        return Iris.getThreadCount();
+        return getComposite().getThreadCount();
     }
 
     @Override
diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java
index daf17289d..58d074490 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java
@@ -89,4 +89,6 @@ public interface EngineCompound extends Listener
     }
 
     public boolean isFailing();
+
+    public int getThreadCount();
 }
diff --git a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java
index 0b5f352c9..5bc67717a 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java
@@ -30,8 +30,6 @@ public interface IrisAccess extends Hotloadable, DataProvider {
 
     public int getHeight(int x, int y, int z);
 
-    public IrisBiome getAbsoluteBiome(int x, int y, int z);
-
     public int getThreadCount();
 
     public void changeThreadCount(int m);