diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/generator/GeneratorWrapper.java b/common/src/main/java/com/dfsek/terra/api/platform/world/generator/GeneratorWrapper.java
new file mode 100644
index 000000000..127f9e5bf
--- /dev/null
+++ b/common/src/main/java/com/dfsek/terra/api/platform/world/generator/GeneratorWrapper.java
@@ -0,0 +1,9 @@
+package com.dfsek.terra.api.platform.world.generator;
+
+import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
+
+public interface GeneratorWrapper extends Handle {
+    @Override
+    TerraChunkGenerator getHandle();
+}
diff --git a/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java b/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java
index d55d813ff..a71cb0867 100644
--- a/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java
+++ b/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java
@@ -7,6 +7,7 @@ import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
+import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
 
 import java.io.File;
 import java.util.UUID;
@@ -24,12 +25,12 @@ public class DummyWorld implements World {
 
     @Override
     public int getMaxHeight() {
-        return 155;
+        return 255;
     }
 
     @Override
     public ChunkGenerator getGenerator() {
-        return () -> (ChunkGenerator) () -> null;
+        return () -> (GeneratorWrapper) () -> null;
     }
 
     @Override
diff --git a/common/src/main/java/com/dfsek/terra/world/TerraWorld.java b/common/src/main/java/com/dfsek/terra/world/TerraWorld.java
index cfec49efe..d173d12f2 100644
--- a/common/src/main/java/com/dfsek/terra/world/TerraWorld.java
+++ b/common/src/main/java/com/dfsek/terra/world/TerraWorld.java
@@ -6,7 +6,7 @@ import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
+import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
@@ -37,16 +37,16 @@ public class TerraWorld {
         safe = true;
     }
 
-    public TerraChunkGenerator getGenerator() {
-        return (TerraChunkGenerator) ((ChunkGenerator) world.getGenerator().getHandle()).getHandle();
+    public static boolean isTerraWorld(World w) {
+        return w.getGenerator().getHandle() instanceof GeneratorWrapper;
     }
 
     public World getWorld() {
         return world;
     }
 
-    public static boolean isTerraWorld(World w) {
-        return w.getGenerator().getHandle() instanceof ChunkGenerator;
+    public TerraChunkGenerator getGenerator() {
+        return ((GeneratorWrapper) world.getGenerator().getHandle()).getHandle();
     }
 
     public BiomeProvider getBiomeProvider() {
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 278583560..092b486f2 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
@@ -2,6 +2,7 @@ package com.dfsek.terra.bukkit.generator;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
+import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.bukkit.population.PopulationManager;
@@ -29,7 +30,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.stream.Collectors;
 
-public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements com.dfsek.terra.api.platform.world.generator.ChunkGenerator {
+public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements GeneratorWrapper {
 
     private static final Map<com.dfsek.terra.api.platform.world.World, PopulationManager> popMap = new HashMap<>();
 
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java
index dad4cba8f..b1d769cef 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java
@@ -1,6 +1,8 @@
 package com.dfsek.terra.fabric.world.generator;
 
+import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.world.TerraBiomeSource;
@@ -30,7 +32,7 @@ import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.chunk.StructuresConfig;
 import net.minecraft.world.gen.chunk.VerticalBlockSample;
 
-public class FabricChunkGeneratorWrapper extends ChunkGenerator implements com.dfsek.terra.api.platform.world.generator.ChunkGenerator {
+public class FabricChunkGeneratorWrapper extends ChunkGenerator implements GeneratorWrapper {
     private final long seed;
     private final DefaultChunkGenerator3D delegate;
     private final TerraBiomeSource biomeSource;
@@ -85,10 +87,6 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements com.d
         this.seed = seed;
     }
 
-    @Override
-    public DefaultChunkGenerator3D getHandle() {
-        return delegate;
-    }
 
     @Override
     protected Codec<? extends ChunkGenerator> getCodec() {
@@ -149,4 +147,9 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements com.d
 
         return new VerticalBlockSample(array);
     }
+
+    @Override
+    public TerraChunkGenerator getHandle() {
+        return delegate;
+    }
 }