From a753351137c8fcec585eac16fe2b67438bf01fc1 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Thu, 22 Jul 2021 14:19:04 -0700
Subject: [PATCH] Move BukkitChunkData out of BukkitChunkGenerator

---
 .../bukkit/generator/BukkitChunkData.java     | 38 +++++++++++++++++++
 .../generator/BukkitChunkGenerator.java       | 30 ---------------
 .../BukkitChunkGeneratorWrapper.java          |  2 +-
 3 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkData.java

diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkData.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkData.java
new file mode 100644
index 000000000..8dbfceb87
--- /dev/null
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkData.java
@@ -0,0 +1,38 @@
+package com.dfsek.terra.bukkit.generator;
+
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.world.generator.ChunkData;
+import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
+import org.bukkit.generator.ChunkGenerator;
+import org.jetbrains.annotations.NotNull;
+
+public class BukkitChunkData implements ChunkData {
+
+    private final ChunkGenerator.ChunkData delegate;
+
+    public BukkitChunkData(ChunkGenerator.ChunkData delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public ChunkGenerator.ChunkData getHandle() {
+        return delegate;
+    }
+
+    @Override
+    public int getMaxHeight() {
+        return delegate.getMaxHeight();
+    }
+
+
+    @Override
+    public void setBlock(int x, int y, int z, @NotNull BlockState blockState) {
+        delegate.setBlock(x, y, z, ((BukkitBlockState) blockState).getHandle());
+    }
+
+
+    @Override
+    public @NotNull BlockState getBlock(int x, int y, int z) {
+        return BukkitBlockState.newInstance(delegate.getBlockData(x, y, z));
+    }
+}
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
index c0e5ed4ef..a040efad8 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
@@ -18,34 +18,4 @@ public class BukkitChunkGenerator implements com.dfsek.terra.api.world.generator
         return delegate;
     }
 
-    public static class BukkitChunkData implements ChunkData {
-
-        private final ChunkGenerator.ChunkData delegate;
-
-        public BukkitChunkData(ChunkGenerator.ChunkData delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public ChunkGenerator.ChunkData getHandle() {
-            return delegate;
-        }
-
-        @Override
-        public int getMaxHeight() {
-            return delegate.getMaxHeight();
-        }
-
-
-        @Override
-        public void setBlock(int x, int y, int z, @NotNull BlockState blockState) {
-            delegate.setBlock(x, y, z, ((BukkitBlockState) blockState).getHandle());
-        }
-
-
-        @Override
-        public @NotNull BlockState getBlock(int x, int y, int z) {
-            return BukkitBlockState.newInstance(delegate.getBlockData(x, y, z));
-        }
-    }
 }
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
index 5276a47a9..1b56b2cae 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
@@ -72,7 +72,7 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener
         com.dfsek.terra.api.world.World bukkitWorld = BukkitAdapter.adapt(world);
         if(needsLoad) load(bukkitWorld); // Load population data for world.
         delegate.generateBiomes(bukkitWorld, random, x, z, new BukkitBiomeGrid(biome));
-        return (ChunkData) delegate.generateChunkData(bukkitWorld, random, x, z, new BukkitChunkGenerator.BukkitChunkData(createChunkData(world))).getHandle();
+        return (ChunkData) delegate.generateChunkData(bukkitWorld, random, x, z, new BukkitChunkData(createChunkData(world))).getHandle();
     }
 
     @Override