more refactors, create platform module

common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java

@@ -40,9 +40,9 @@ public class GridSpawn {
                 zones.add(getChunkSpawn(xi, zi, seed));
             }
         }
-        Vector3Impl shortest = zones.get(0);
+        Vector3 shortest = zones.get(0);
         Vector3 compare = new Vector3Impl(x, 0, z);
-        for(Vector3Impl v : zones) {
+        for(Vector3 v : zones) {
             if(compare.distanceSquared(shortest) > compare.distanceSquared(v)) shortest = v.clone();
         }
         return shortest;

common/implementation/src/main/java/com/dfsek/terra/api/util/world/PaletteUtil.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.util.world;
 
 import com.dfsek.terra.api.util.MathUtil;
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.generator.Palette;
 import com.dfsek.terra.api.world.palette.slant.SlantHolder;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.world.generation.math.samplers.Sampler;

common/implementation/src/main/java/com/dfsek/terra/api/world/generation/Chunkified.java

@@ -1,7 +0,0 @@
-package com.dfsek.terra.api.world.generation;
-
-/**
- * Marker interface that marks a feature as "chunkified" (only modifying one chunk at a time)
- */
-public interface Chunkified {
-}

common/implementation/src/main/java/com/dfsek/terra/api/world/generation/TerraBlockPopulator.java

@@ -1,8 +0,0 @@
-package com.dfsek.terra.api.world.generation;
-
-import com.dfsek.terra.api.world.Chunk;
-import com.dfsek.terra.api.world.World;
-
-public interface TerraBlockPopulator {
-    void populate(World world, Chunk chunk);
-}

common/implementation/src/main/java/com/dfsek/terra/api/world/generation/TerraChunkGenerator.java

@@ -1,37 +0,0 @@
-package com.dfsek.terra.api.world.generation;
-
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.world.BiomeGrid;
-import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.world.generator.ChunkData;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.config.pack.ConfigPackImpl;
-import com.dfsek.terra.world.generation.math.samplers.Sampler;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-import java.util.Random;
-
-public interface TerraChunkGenerator {
-    ChunkData generateChunkData(@NotNull World world, Random random, int x, int z, ChunkData original);
-
-    void generateBiomes(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome);
-
-    boolean isParallelCapable();
-
-    boolean shouldGenerateCaves();
-
-    boolean shouldGenerateDecorations();
-
-    boolean shouldGenerateMobs();
-
-    boolean shouldGenerateStructures();
-
-    ConfigPackImpl getConfigPack();
-
-    TerraPlugin getMain();
-
-    Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth);
-
-    List<TerraBlockPopulator> getPopulators();
-}

common/implementation/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java

@@ -5,7 +5,7 @@ import com.dfsek.terra.api.block.BlockData;
 
 import java.util.List;
 
-public class NoisePalette extends Palette {
+public class NoisePalette extends PaletteImpl {
     private final NoiseSampler sampler;
     private final boolean is2D;
 

common/implementation/src/main/java/com/dfsek/terra/api/world/palette/PaletteImpl.java

@@ -3,7 +3,9 @@ package com.dfsek.terra.api.world.palette;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
+import com.dfsek.terra.api.world.generator.Palette;
 
 import java.util.List;
 import java.util.Random;
@@ -12,39 +14,34 @@ import java.util.Random;
  * A class representation of a "slice" of the world.
  * Used to get a section of blocks, based on the depth at which they are found.
  */
-public abstract class Palette {
+public abstract class PaletteImpl implements com.dfsek.terra.api.world.generator.Palette {
     private final List<PaletteLayer> pallet = new GlueList<>();
 
     /**
      * Constructs a blank palette.
      */
-    public Palette() {
+    public PaletteImpl() {
 
     }
 
-    public com.dfsek.terra.api.world.palette.Palette add(BlockData m, int layers, NoiseSampler sampler) {
+    @Override
+    public Palette add(BlockData m, int layers, NoiseSampler sampler) {
         for(int i = 0; i < layers; i++) {
             pallet.add(new PaletteLayer(m, sampler));
         }
         return this;
     }
 
-    public com.dfsek.terra.api.world.palette.Palette add(ProbabilityCollectionImpl<BlockData> m, int layers, NoiseSampler sampler) {
+    @Override
+    public Palette add(ProbabilityCollection<BlockData> m, int layers, NoiseSampler sampler) {
         for(int i = 0; i < layers; i++) {
             pallet.add(new PaletteLayer(m, sampler));
         }
         return this;
     }
 
-    /**
-     * Fetches a material from the palette, at a given layer.
-     *
-     * @param layer - The layer at which to fetch the material.
-     * @return BlockData - The material fetched.
-     */
-    public abstract BlockData get(int layer, double x, double y, double z);
-
 
+    @Override
     public int getSize() {
         return pallet.size();
     }
@@ -58,7 +55,7 @@ public abstract class Palette {
      */
     public static class PaletteLayer {
         private final boolean col; // Is layer using a collection?
-        private ProbabilityCollectionImpl<BlockData> collection;
+        private ProbabilityCollection<BlockData> collection;
         private final NoiseSampler sampler;
         private BlockData m;
 
@@ -68,7 +65,7 @@ public abstract class Palette {
          * @param type    The collection of materials to choose from.
          * @param sampler Noise sampler to use
          */
-        public PaletteLayer(ProbabilityCollectionImpl<BlockData> type, NoiseSampler sampler) {
+        public PaletteLayer(ProbabilityCollection<BlockData> type, NoiseSampler sampler) {
             this.sampler = sampler;
             this.col = true;
             this.collection = type;
@@ -106,8 +103,21 @@ public abstract class Palette {
             return m;
         }
 
-        public ProbabilityCollectionImpl<BlockData> getCollection() {
+        public ProbabilityCollection<BlockData> getCollection() {
             return collection;
         }
     }
+
+    public static class Singleton extends PaletteImpl {
+        private final BlockData item;
+
+        public Singleton(BlockData item) {
+            this.item = item;
+        }
+
+        @Override
+        public BlockData get(int layer, double x, double y, double z) {
+            return item;
+        }
+    }
 }

common/implementation/src/main/java/com/dfsek/terra/api/world/palette/SinglePalette.java

@@ -1,16 +0,0 @@
-package com.dfsek.terra.api.world.palette;
-
-import com.dfsek.terra.api.block.BlockData;
-
-public class SinglePalette extends Palette {
-    private final BlockData item;
-
-    public SinglePalette(BlockData item) {
-        this.item = item;
-    }
-
-    @Override
-    public BlockData get(int layer, double x, double y, double z) {
-        return item;
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.palette.holder;
 
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.generator.Palette;
 
 public class PaletteHolder {
     private final Palette[] palettes;

common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolderBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.palette.holder;
 
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.generator.Palette;
 import net.jafama.FastMath;
 
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/world/palette/slant/SlantHolder.java

@@ -1,6 +1,5 @@
 package com.dfsek.terra.api.world.palette.slant;
 
-import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.holder.PaletteHolder;
 
 import java.util.TreeMap;

common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java

@@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
 import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.api.world.palette.NoisePalette;
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.palette.PaletteImpl;
 import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;
 import com.dfsek.terra.config.templates.FloraTemplate;
 import com.dfsek.terra.world.population.items.flora.TerraFlora;
@@ -12,7 +12,7 @@ import com.dfsek.terra.world.population.items.flora.TerraFlora;
 public class FloraFactory implements ConfigFactory<FloraTemplate, Flora> {
     @Override
     public TerraFlora build(FloraTemplate config, TerraPlugin main) {
-        Palette palette = new NoisePalette(new WhiteNoiseSampler(2403), false);
+        PaletteImpl palette = new NoisePalette(new WhiteNoiseSampler(2403), false);
         for(PaletteLayerHolder layer : config.getFloraPalette()) {
             palette.add(layer.getLayer(), layer.getSize(), layer.getSampler());
         }

common/implementation/src/main/java/com/dfsek/terra/config/factories/PaletteFactory.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.config.factories;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.world.generator.Palette;
 import com.dfsek.terra.api.world.palette.NoisePalette;
-import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;
 import com.dfsek.terra.config.templates.PaletteTemplate;
 

common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java

@@ -3,7 +3,8 @@ package com.dfsek.terra.config.loaders.palette;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.palette.PaletteImpl;
 import com.dfsek.terra.api.world.palette.holder.PaletteHolder;
 import com.dfsek.terra.api.world.palette.holder.PaletteHolderBuilder;
 
@@ -19,7 +20,7 @@ public class PaletteHolderLoader implements TypeLoader<PaletteHolder> {
         PaletteHolderBuilder builder = new PaletteHolderBuilder();
         for(Map<String, Integer> layer : palette) {
             for(Map.Entry<String, Integer> entry : layer.entrySet()) {
-                builder.add(entry.getValue(), (Palette) configLoader.loadType(Palette.class, entry.getKey()));
+                builder.add(entry.getValue(), (Palette) configLoader.loadType(PaletteImpl.class, entry.getKey()));
             }
         }
         return builder.build();

common/implementation/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java

@@ -19,8 +19,8 @@ import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
-import com.dfsek.terra.api.world.palette.Palette;
-import com.dfsek.terra.api.world.palette.SinglePalette;
+import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.palette.PaletteImpl;
 import com.dfsek.terra.api.world.palette.holder.PaletteHolder;
 import com.dfsek.terra.api.world.palette.slant.SlantHolder;
 import com.dfsek.terra.carving.UserDefinedCarver;
@@ -256,7 +256,7 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
                 return 2;
             }
         };
-        oceanPalette = new SinglePalette(main.getWorldHandle().createBlockData("minecraft:water"));
+        oceanPalette = new PaletteImpl.Singleton(main.getWorldHandle().createBlockData("minecraft:water"));
     }
 
     public Map<BlockType, Palette> getSlabPalettes() {

common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java

@@ -7,7 +7,7 @@ import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.world.Flora;
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.palette.PaletteImpl;
 import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.builder.BiomeBuilder;
 import com.dfsek.terra.config.factories.BiomeFactory;
@@ -42,7 +42,7 @@ public class ConfigTypeRegistry extends OpenRegistryImpl<ConfigType<?, ?>> {
     public ConfigTypeRegistry(ConfigPackImpl pack, TerraPlugin main, BiConsumer<String, ConfigType<?, ?>> callback) {
         super(new LinkedHashMap<>()); // Ordered
         this.callback = callback;
-        add("PALETTE", new ConfigBuilder<>(new PaletteFactory(), PaletteTemplate::new, Palette.class, () -> new PaletteRegistry(main)));
+        add("PALETTE", new ConfigBuilder<>(new PaletteFactory(), PaletteTemplate::new, PaletteImpl.class, () -> new PaletteRegistry(main)));
         add("ORE", new ConfigBuilder<>(new OreFactory(), OreTemplate::new, Ore.class, OreRegistry::new));
         add("FLORA", new ConfigBuilder<>(new FloraFactory(), FloraTemplate::new, Flora.class, () -> new FloraRegistry(main)));
         add("CARVER", new ConfigBuilder<>(new CarverFactory(pack), CarverTemplate::new, UserDefinedCarver.class, CarverRegistry::new));

common/implementation/src/main/java/com/dfsek/terra/registry/config/PaletteRegistry.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.registry.config;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.world.palette.Palette;
-import com.dfsek.terra.api.world.palette.SinglePalette;
+import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.palette.PaletteImpl;
 import com.dfsek.terra.registry.OpenRegistryImpl;
 
 public class PaletteRegistry extends OpenRegistryImpl<Palette> {
@@ -15,7 +15,7 @@ public class PaletteRegistry extends OpenRegistryImpl<Palette> {
     @Override
     public Palette get(String identifier) {
         if(identifier.startsWith("BLOCK:"))
-            return new SinglePalette(main.getWorldHandle().createBlockData(identifier.substring(6))); // Return single palette for BLOCK: shortcut.
+            return new PaletteImpl.Singleton(main.getWorldHandle().createBlockData(identifier.substring(6))); // Return single palette for BLOCK: shortcut.
         return super.get(identifier);
     }
 }

common/implementation/src/main/java/com/dfsek/terra/world/TerraWorld.java

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.generator.Palette;
 import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.config.pack.WorldConfig;
 import com.dfsek.terra.world.generation.math.samplers.Sampler;

common/implementation/src/main/java/com/dfsek/terra/world/generation/WorldGenerator.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.world.generation;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.world.biome.Generator;
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.generator.Palette;
 import com.dfsek.terra.api.world.palette.holder.PaletteHolder;
 import com.dfsek.terra.api.world.palette.slant.SlantHolder;
 

common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java

@@ -10,9 +10,9 @@ import com.dfsek.terra.api.util.world.PaletteUtil;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
-import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.generator.TerraBlockPopulator;
+import com.dfsek.terra.api.world.generator.TerraChunkGenerator;
 import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.api.profiler.ProfileFrame;

common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java

@@ -3,6 +3,7 @@ package com.dfsek.terra.world.generation.generators;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.world.generator.Palette;
 import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.block.BlockData;
@@ -19,10 +20,9 @@ import com.dfsek.terra.api.util.world.PaletteUtil;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
-import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
-import com.dfsek.terra.api.world.palette.Palette;
-import com.dfsek.terra.api.world.palette.SinglePalette;
+import com.dfsek.terra.api.world.generator.TerraBlockPopulator;
+import com.dfsek.terra.api.world.generator.TerraChunkGenerator;
+import com.dfsek.terra.api.world.palette.PaletteImpl;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.Carver;
@@ -46,7 +46,7 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
     private final ConfigPackImpl configPack;
     private final TerraPlugin main;
     private final BlockType water;
-    private final SinglePalette blank;
+    private final PaletteImpl.Singleton blank;
     private final List<TerraBlockPopulator> blockPopulators = new ArrayList<>();
 
     private final Carver carver;
@@ -63,7 +63,7 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
 
         carver = new NoiseCarver(new ConstantRange(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main);
         water = main.getWorldHandle().createBlockData("minecraft:water").getBlockType();
-        blank = new SinglePalette(main.getWorldHandle().createBlockData("minecraft:air"));
+        blank = new PaletteImpl.Singleton(main.getWorldHandle().createBlockData("minecraft:air"));
     }
 
     @Override

common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java

@@ -9,8 +9,8 @@ import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.util.world.PopulationUtil;
-import com.dfsek.terra.api.world.generation.Chunkified;
-import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
+import com.dfsek.terra.api.world.generator.Chunkified;
+import com.dfsek.terra.api.world.generator.TerraBlockPopulator;
 import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.pack.WorldConfig;
 import com.dfsek.terra.config.templates.CarverTemplate;

common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.util.world.PopulationUtil;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
+import com.dfsek.terra.api.world.generator.TerraBlockPopulator;
 import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.flora.FloraLayer;

common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
-import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
+import com.dfsek.terra.api.world.generator.TerraBlockPopulator;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;

common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java

@@ -9,8 +9,8 @@ import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.generation.Chunkified;
-import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
+import com.dfsek.terra.api.world.generator.Chunkified;
+import com.dfsek.terra.api.world.generator.TerraBlockPopulator;
 import com.dfsek.terra.config.pack.WorldConfig;
 import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;

common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java

@@ -7,7 +7,7 @@ import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.util.world.PopulationUtil;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
+import com.dfsek.terra.api.world.generator.TerraBlockPopulator;
 import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.tree.TreeLayer;

common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java

@@ -15,7 +15,7 @@ import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.Flora;
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.generator.Palette;
 import net.jafama.FastMath;
 
 import java.util.ArrayList;