refactor API

platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java

@@ -3,8 +3,8 @@ package com.dfsek.terra.platform;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
 import net.querz.mca.Chunk;
 import net.querz.nbt.tag.CompoundTag;
 import org.jetbrains.annotations.NotNull;

platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java

@@ -4,12 +4,11 @@ import com.dfsek.terra.DirectUtils;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.generator.ChunkGenerator;
+import com.dfsek.terra.api.platform.entity.Entity;
+import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.entity.Entity;
-import com.dfsek.terra.api.platform.world.entity.EntityType;
+import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
 import net.jafama.FastMath;
 import net.querz.mca.MCAFile;
 import net.querz.mca.MCAUtil;
@@ -88,11 +87,6 @@ public class DirectWorld implements World {
         return getBlockAt(l.getBlockX(), l.getBlockY(), l.getBlockZ());
     }
 
-    @Override
-    public boolean generateTree(Location l, Tree vanillaTreeType) {
-        return false;
-    }
-
     @Override
     public Entity spawnEntity(Location location, EntityType entityType) {
         return null;

platforms/region/src/main/java/com/dfsek/terra/platform/GenWrapper.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.platform;
 
-import com.dfsek.terra.api.platform.generator.BlockPopulator;
-import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.BiomeGrid;
 import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.platform.world.generator.BlockPopulator;
+import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.generation.MasterChunkGenerator;
 import org.jetbrains.annotations.NotNull;

platforms/region/src/main/java/com/dfsek/terra/platform/RawTree.java

@@ -2,18 +2,13 @@ package com.dfsek.terra.platform;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.api.platform.world.Tree;
+import com.dfsek.terra.api.world.tree.Tree;
 
 import java.util.Collections;
 import java.util.Random;
 import java.util.Set;
 
 public class RawTree implements Tree { // TODO: implement
-    @Override
-    public Object getHandle() {
-        return null;
-    }
-
     @Override
     public boolean plant(Location l, Random r) {
         return false;

platforms/region/src/main/java/com/dfsek/terra/platform/RawWorldHandle.java

@@ -3,9 +3,8 @@ package com.dfsek.terra.platform;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.api.platform.world.Tree;
-import com.dfsek.terra.api.platform.world.entity.EntityType;
 
 public class RawWorldHandle implements WorldHandle {
     @Override
@@ -33,11 +32,6 @@ public class RawWorldHandle implements WorldHandle {
         return new Data(data);
     }
 
-    @Override
-    public Tree getTree(String id) {
-        return new RawTree();
-    }
-
     @Override
     public EntityType getEntity(String id) {
         return null;

platforms/region/src/main/java/com/dfsek/terra/region/Generator.java

@@ -6,7 +6,6 @@ import com.dfsek.terra.generation.math.SamplerCache;
 import com.dfsek.terra.platform.DirectChunkData;
 import com.dfsek.terra.platform.DirectWorld;
 import com.dfsek.terra.platform.GenWrapper;
-import com.dfsek.terra.population.CavePopulator;
 import com.dfsek.terra.population.FloraPopulator;
 import com.dfsek.terra.population.OrePopulator;
 import com.dfsek.terra.population.StructurePopulator;
@@ -24,7 +23,6 @@ public class Generator {
     StructurePopulator structurePopulator;
     TreePopulator treePopulator;
     OrePopulator orePopulator;
-    CavePopulator cavePopulator;
     MasterChunkGenerator generator;
 
     public Generator(long seed, StandalonePlugin plugin) {
@@ -33,7 +31,6 @@ public class Generator {
         structurePopulator = new StructurePopulator(plugin);
         treePopulator = new TreePopulator(plugin);
         orePopulator = new OrePopulator(plugin);
-        cavePopulator = new CavePopulator(plugin);
         generator = new MasterChunkGenerator(plugin.getRegistry().get("DEFAULT"), plugin, new SamplerCache(plugin));
         this.seed = seed;
     }
@@ -55,7 +52,6 @@ public class Generator {
                 DirectChunkData chunkData = (DirectChunkData) world.getChunkAt(cx, cz);
                 generator.generateChunkData(world, null, cx, cz, chunkData);
 
-                cavePopulator.populate(world, chunkData);
                 structurePopulator.populate(world, chunkData);
                 orePopulator.populate(world, chunkData);
                 floraPopulator.populate(world, chunkData);