refactor

2026-02-16 02:20:57 +00:00 · 2021-01-25 19:34:29 -07:00
parent 89f52a22c8
commit 1d6cdf9eaa
181 changed files with 466 additions and 662 deletions
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java
@@ -1,6 +1,8 @@
 package com.dfsek.terra.bukkit;

+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.entity.Entity;
+import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitEntity implements Entity {
    private final org.bukkit.entity.Entity entity;
@@ -13,4 +15,14 @@ public class BukkitEntity implements Entity {
    public org.bukkit.entity.Entity getHandle() {
        return entity;
    }
+
+    @Override
+    public Location getLocation() {
+        return BukkitAdapter.adapt(entity.getLocation());
+    }
+
+    @Override
+    public void sendMessage(String message) {
+        entity.sendMessage(message);
+    }
 }
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit;

-import com.dfsek.terra.api.Player;
 import com.dfsek.terra.api.math.vector.Location;
+import com.dfsek.terra.api.platform.Player;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitPlayer implements Player {
@@ -21,4 +21,9 @@ public class BukkitPlayer implements Player {
        org.bukkit.Location bukkit = delegate.getLocation();
        return new Location(BukkitAdapter.adapt(bukkit.getWorld()), bukkit.getX(), bukkit.getY(), bukkit.getZ());
    }
+
+    @Override
+    public void sendMessage(String message) {
+        delegate.sendMessage(message);
+    }
 }
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -1,10 +1,8 @@
 package com.dfsek.terra.bukkit;

 import com.dfsek.tectonic.loading.TypeRegistry;
-import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.GenericLoaders;
+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.api.language.Language;
-import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
@@ -23,12 +21,14 @@ import com.dfsek.terra.bukkit.util.PaperUtil;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.BukkitBiome;
 import com.dfsek.terra.bukkit.world.BukkitTree;
-import com.dfsek.terra.config.base.ConfigPack;
-import com.dfsek.terra.config.base.PluginConfig;
+import com.dfsek.terra.config.GenericLoaders;
+import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.LangUtil;
-import com.dfsek.terra.debug.Debug;
-import com.dfsek.terra.generation.MasterChunkGenerator;
+import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.debug.DebugLogger;
 import com.dfsek.terra.registry.ConfigRegistry;
+import com.dfsek.terra.world.TerraWorld;
+import com.dfsek.terra.world.generation.MasterChunkGenerator;
 import io.papermc.lib.PaperLib;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
@@ -54,6 +54,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
    private final ItemHandle itemHandle = new BukkitItemHandle();
    private WorldHandle handle = new BukkitWorldHandle();
    private final GenericLoaders genericLoaders = new GenericLoaders(this);
+    private DebugLogger debugLogger;

    public static final Version BUKKIT_VERSION;

@@ -105,6 +106,11 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
        }
    }

+    @Override
+    public DebugLogger getDebugLogger() {
+        return debugLogger;
+    }
+
    @Override
    public void onDisable() {
        BukkitChunkGeneratorWrapper.saveAll();
@@ -112,7 +118,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {

    @Override
    public void onEnable() {
-        Debug.setLogger(getLogger()); // Set debug logger.
+        debugLogger = new DebugLogger(getLogger());

        getLogger().info("Running on version " + BUKKIT_VERSION);
        if(BUKKIT_VERSION.equals(Version.UNKNOWN)) {
@@ -126,7 +132,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {

        config.load(this); // Load master config.yml
        LangUtil.load(config.getLanguage(), this); // Load language.
-        Debug.setDebug(isDebug());
+        debugLogger.setDebug(isDebug());

        registry.loadAll(this); // Load all config packs.

--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/Command.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/Command.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.command;

-import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/PacksCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/PacksCommand.java
@@ -2,8 +2,8 @@ package com.dfsek.terra.bukkit.command.command;

 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.command.Command;
-import com.dfsek.terra.config.base.ConfigPackTemplate;
 import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.config.pack.ConfigPackTemplate;
 import com.dfsek.terra.registry.ConfigRegistry;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.command.command;

-import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.command.Command;
 import com.dfsek.terra.bukkit.command.command.biome.BiomeCommand;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeInfoCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeInfoCommand.java
@@ -1,14 +1,14 @@
 package com.dfsek.terra.bukkit.command.command.biome;

-import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.biome.UserDefinedBiome;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.command.WorldCommand;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.population.items.TerraStructure;
+import com.dfsek.terra.world.TerraWorld;
+import com.dfsek.terra.world.population.items.TerraStructure;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeLocateCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeLocateCommand.java
@@ -1,13 +1,13 @@
 package com.dfsek.terra.bukkit.command.command.biome;

-import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.math.vector.Vector3;
-import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.async.AsyncBiomeFinder;
+import com.dfsek.terra.biome.TerraBiome;
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;
 import com.dfsek.terra.bukkit.command.WorldCommand;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.world.TerraWorld;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ClickEvent;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java
@@ -4,7 +4,6 @@ import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.math.voxel.DeformedSphere;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
-import com.dfsek.terra.bukkit.BukkitPlayer;
 import com.dfsek.terra.bukkit.command.PlayerCommand;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.config.lang.LangUtil;
@@ -48,7 +47,7 @@ public class DeformedSphereCommand extends PlayerCommand {
        FastNoiseLite n = new FastNoiseLite((int) sender.getWorld().getSeed());
        n.setNoiseType(FastNoiseLite.NoiseType.OpenSimplex2);
        n.setFrequency(freq);
-        DeformedSphere sphere = new DeformedSphere(new BukkitPlayer(sender).getLocation().toVector(), radius, deform, n);
+        DeformedSphere sphere = new DeformedSphere(BukkitAdapter.adapt(sender).getLocation().toVector(), radius, deform, n);
        for(Vector3 v : sphere.getGeometry()) {
            v.toLocation(BukkitAdapter.adapt(sender.getWorld())).getBlock().setBlockData(getMain().getWorldHandle().createBlockData("minecraft:stone"), false);
        }
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/LocateCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/LocateCommand.java
@@ -1,13 +1,13 @@
 package com.dfsek.terra.bukkit.command.command.structure;

-import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.async.AsyncStructureFinder;
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;
 import com.dfsek.terra.bukkit.command.WorldCommand;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.config.lang.LangUtil;
-import com.dfsek.terra.population.items.TerraStructure;
+import com.dfsek.terra.world.TerraWorld;
+import com.dfsek.terra.world.population.items.TerraStructure;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ClickEvent;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadCommand.java
@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.command.command.structure.load;

-import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.bukkit.command.DebugCommand;
 import com.dfsek.terra.bukkit.command.PlayerCommand;
+import com.dfsek.terra.world.TerraWorld;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java
@@ -1,6 +1,5 @@
 package com.dfsek.terra.bukkit.command.command.structure.load;

-import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.structures.structure.Rotation;
@@ -9,6 +8,7 @@ import com.dfsek.terra.bukkit.command.DebugCommand;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.BukkitChunk;
 import com.dfsek.terra.util.PopulationUtil;
+import com.dfsek.terra.world.TerraWorld;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
--- 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
@@ -1,19 +1,18 @@
 package com.dfsek.terra.bukkit.generator;

-import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.core.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.TerraChunkGenerator;
-import com.dfsek.terra.api.world.generation.population.PopulationManager;
+import com.dfsek.terra.bukkit.population.PopulationManager;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.BukkitBiomeGrid;
 import com.dfsek.terra.config.lang.LangUtil;
-import com.dfsek.terra.debug.Debug;
-import com.dfsek.terra.population.FloraPopulator;
-import com.dfsek.terra.population.OrePopulator;
-import com.dfsek.terra.population.StructurePopulator;
-import com.dfsek.terra.population.TreePopulator;
+import com.dfsek.terra.world.TerraWorld;
+import com.dfsek.terra.world.population.FloraPopulator;
+import com.dfsek.terra.world.population.OrePopulator;
+import com.dfsek.terra.world.population.StructurePopulator;
+import com.dfsek.terra.world.population.TreePopulator;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
@@ -55,7 +54,6 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener
        for(Map.Entry<com.dfsek.terra.api.platform.world.World, PopulationManager> e : popMap.entrySet()) {
            try {
                e.getValue().saveBlocks(e.getKey());
-                Debug.info("Saved data for world " + e.getKey().getName());
            } catch(IOException ioException) {
                ioException.printStackTrace();
            }
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java
@@ -1,16 +1,16 @@
 package com.dfsek.terra.bukkit.listeners;

-import com.dfsek.terra.TerraWorld;
+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.tree.Tree;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.config.base.ConfigPack;
+import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.registry.TreeRegistry;
+import com.dfsek.terra.world.TerraWorld;
 import org.bukkit.Material;
 import org.bukkit.TreeType;
 import org.bukkit.block.Block;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java
@@ -1,11 +1,10 @@
 package com.dfsek.terra.bukkit.listeners;

-import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.async.AsyncStructureFinder;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.debug.Debug;
-import com.dfsek.terra.population.items.TerraStructure;
+import com.dfsek.terra.world.TerraWorld;
+import com.dfsek.terra.world.population.items.TerraStructure;
 import io.papermc.paper.event.world.StructureLocateEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -25,14 +24,14 @@ public class PaperListener implements Listener {
        if(!TerraWorld.isTerraWorld(BukkitAdapter.adapt(e.getWorld()))) return;
        e.setResult(null); // Assume no result.
        String name = "minecraft:" + e.getType().getName();
-        Debug.info("Overriding structure location for \"" + name + "\"");
+        main.getDebugLogger().info("Overriding structure location for \"" + name + "\"");
        TerraWorld tw = main.getWorld(BukkitAdapter.adapt(e.getWorld()));
        TerraStructure config = tw.getConfig().getStructure(tw.getConfig().getTemplate().getLocatable().get(name));
        if(config != null) {
            AsyncStructureFinder finder = new AsyncStructureFinder(tw.getBiomeProvider(), config, BukkitAdapter.adapt(e.getOrigin()), 0, 500, location -> {
                if(location != null)
                    e.setResult(BukkitAdapter.adapt(location.toLocation(BukkitAdapter.adapt(e.getWorld()))));
-                Debug.info("Location: " + location);
+                main.getDebugLogger().info("Location: " + location);
            }, main);
            finder.run(); // Do this synchronously.
        } else {
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java
@@ -1,11 +1,10 @@
 package com.dfsek.terra.bukkit.listeners;

-import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.async.AsyncStructureFinder;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.debug.Debug;
-import com.dfsek.terra.population.items.TerraStructure;
+import com.dfsek.terra.world.TerraWorld;
+import com.dfsek.terra.world.population.items.TerraStructure;
 import org.bukkit.entity.EnderSignal;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -34,17 +33,17 @@ public class SpigotListener implements Listener {
    public void onEnderEye(EntitySpawnEvent e) {
        Entity entity = e.getEntity();
        if(e.getEntityType().equals(EntityType.ENDER_SIGNAL)) {
-            Debug.info("Detected Ender Signal...");
+            main.getDebugLogger().info("Detected Ender Signal...");
            if(!TerraWorld.isTerraWorld(BukkitAdapter.adapt(e.getEntity().getWorld()))) return;
            TerraWorld tw = main.getWorld(BukkitAdapter.adapt(e.getEntity().getWorld()));
            EnderSignal signal = (EnderSignal) entity;
            TerraStructure config = tw.getConfig().getStructure(tw.getConfig().getTemplate().getLocatable().get("STRONGHOLD"));
            if(config != null) {
-                Debug.info("Overriding Ender Signal...");
+                main.getDebugLogger().info("Overriding Ender Signal...");
                AsyncStructureFinder finder = new AsyncStructureFinder(tw.getBiomeProvider(), config, BukkitAdapter.adapt(e.getLocation()), 0, 500, location -> {
                    if(location != null)
                        signal.setTargetLocation(BukkitAdapter.adapt(location.toLocation(BukkitAdapter.adapt(signal.getWorld()))));
-                    Debug.info("Location: " + location);
+                    main.getDebugLogger().info("Location: " + location);
                }, main);
                finder.run(); // Do this synchronously so eye doesn't change direction several ticks after spawning.
            } else
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/ChunkCoordinate.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/ChunkCoordinate.java
@@ -0,0 +1,50 @@
+package com.dfsek.terra.bukkit.population;
+
+
+import com.dfsek.terra.api.platform.world.Chunk;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+public class ChunkCoordinate implements Serializable {
+    public static final long serialVersionUID = 7102462856296750285L;
+    private final int x;
+    private final int z;
+    private final UUID worldID;
+
+    public ChunkCoordinate(int x, int z, UUID worldID) {
+        this.x = x;
+        this.z = z;
+        this.worldID = worldID;
+    }
+
+    public ChunkCoordinate(Chunk c) {
+        this.x = c.getX();
+        this.z = c.getZ();
+        this.worldID = c.getWorld().getUID();
+    }
+
+    public UUID getWorldID() {
+        return worldID;
+    }
+
+    public int getX() {
+        return x;
+    }
+
+    public int getZ() {
+        return z;
+    }
+
+    @Override
+    public int hashCode() {
+        return x * 31 + z;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if(!(obj instanceof ChunkCoordinate)) return false;
+        ChunkCoordinate other = (ChunkCoordinate) obj;
+        return other.getX() == x && other.getZ() == z;
+    }
+}
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/Gaea.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/Gaea.java
@@ -0,0 +1,20 @@
+package com.dfsek.terra.bukkit.population;
+
+
+import com.dfsek.terra.api.platform.world.World;
+
+import java.io.File;
+
+public class Gaea {
+    private static boolean debug;
+
+    public static File getGaeaFolder(World w) {
+        File f = new File(w.getWorldFolder(), "gaea");
+        f.mkdirs();
+        return f;
+    }
+
+    public static boolean isDebug() {
+        return debug;
+    }
+}
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java
@@ -0,0 +1,95 @@
+package com.dfsek.terra.bukkit.population;
+
+import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.platform.world.Chunk;
+import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
+import com.dfsek.terra.profiler.ProfileFuture;
+import com.dfsek.terra.profiler.WorldProfiler;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * Cursed management class for the horrors of Bukkit population
+ */
+public class PopulationManager implements TerraBlockPopulator {
+    private final List<TerraBlockPopulator> attachedPopulators = new GlueList<>();
+    private final HashSet<ChunkCoordinate> needsPop = new HashSet<>();
+    private final TerraPlugin main;
+    private WorldProfiler profiler;
+
+    public PopulationManager(TerraPlugin main) {
+        this.main = main;
+    }
+
+    public void attach(TerraBlockPopulator populator) {
+        this.attachedPopulators.add(populator);
+    }
+
+    @Override
+    @SuppressWarnings("try")
+    public void populate(@NotNull World world, @NotNull Chunk chunk) {
+        try(ProfileFuture ignored = measure()) {
+            needsPop.add(new ChunkCoordinate(chunk));
+            int x = chunk.getX();
+            int z = chunk.getZ();
+            if(main.isEnabled()) {
+                for(int xi = -1; xi <= 1; xi++) {
+                    for(int zi = -1; zi <= 1; zi++) {
+                        if(xi == 0 && zi == 0) continue;
+                        if(world.isChunkGenerated(xi + x, zi + z)) checkNeighbors(xi + x, zi + z, world);
+                    }
+                }
+            }
+        }
+    }
+
+    private ProfileFuture measure() {
+        if(profiler != null) return profiler.measure("PopulationManagerTime");
+        return null;
+    }
+
+    public void attachProfiler(WorldProfiler p) {
+        this.profiler = p;
+    }
+
+    @SuppressWarnings("unchecked")
+    public synchronized void saveBlocks(World w) throws IOException {
+        File f = new File(Gaea.getGaeaFolder(w), "chunks.bin");
+        f.createNewFile();
+        SerializationUtil.toFile((HashSet<ChunkCoordinate>) needsPop.clone(), f);
+    }
+
+    @SuppressWarnings("unchecked")
+    public synchronized void loadBlocks(World w) throws IOException, ClassNotFoundException {
+        File f = new File(Gaea.getGaeaFolder(w), "chunks.bin");
+        needsPop.addAll((HashSet<ChunkCoordinate>) SerializationUtil.fromFile(f));
+    }
+
+
+    // Synchronize to prevent chunks from being queued for population multiple times.
+    public synchronized void checkNeighbors(int x, int z, World w) {
+        ChunkCoordinate c = new ChunkCoordinate(x, z, w.getUID());
+        if(w.isChunkGenerated(x + 1, z)
+                && w.isChunkGenerated(x - 1, z)
+                && w.isChunkGenerated(x, z + 1)
+                && w.isChunkGenerated(x, z - 1) && needsPop.contains(c)) {
+            Random random = new FastRandom(w.getSeed());
+            long xRand = (random.nextLong() / 2L << 1L) + 1L;
+            long zRand = (random.nextLong() / 2L << 1L) + 1L;
+            random.setSeed((long) x * xRand + (long) z * zRand ^ w.getSeed());
+            Chunk currentChunk = w.getChunkAt(x, z);
+            for(TerraBlockPopulator r : attachedPopulators) {
+                r.populate(w, currentChunk);
+            }
+            needsPop.remove(c);
+        }
+    }
+}
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/SerializationUtil.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/SerializationUtil.java
@@ -0,0 +1,70 @@
+package com.dfsek.terra.bukkit.population;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+
+public class SerializationUtil {
+    public static Object fromFile(File f) throws IOException, ClassNotFoundException {
+        ObjectInputStream ois = new MovedObjectInputStream(new FileInputStream(f), "com.dfsek.terra.api.world.generation.population", "com.dfsek.terra.bukkit.population"); // Backwards compat with old Gaea location
+        Object o = ois.readObject();
+        ois.close();
+        return o;
+    }
+
+    public static void toFile(Serializable o, File f) throws IOException {
+        ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(f));
+        oos.writeObject(o);
+        oos.close();
+    }
+
+    public static class MovedObjectInputStream extends ObjectInputStream {
+        private final String oldNameSpace;
+        private final String newNameSpace;
+
+        public MovedObjectInputStream(InputStream in, String oldNameSpace, String newNameSpace) throws IOException {
+            super(in);
+            this.oldNameSpace = oldNameSpace;
+            this.newNameSpace = newNameSpace;
+        }
+
+        @Override
+        protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException {
+            ObjectStreamClass result = super.readClassDescriptor();
+            try {
+                if(result.getName().contains(oldNameSpace)) {
+                    String newClassName = result.getName().replace(oldNameSpace, newNameSpace);
+                    Class localClass = Class.forName(newClassName);
+
+                    Field nameField = ObjectStreamClass.class.getDeclaredField("name");
+                    nameField.setAccessible(true);
+                    nameField.set(result, newClassName);
+
+                    ObjectStreamClass localClassDescriptor = ObjectStreamClass.lookup(localClass);
+                    Field suidField = ObjectStreamClass.class.getDeclaredField("suid");
+                    suidField.setAccessible(true);
+                    suidField.set(result, localClassDescriptor.getSerialVersionUID());
+                }
+            } catch(Exception e) {
+                throw new IOException("Exception when trying to replace namespace", e);
+            }
+            return result;
+        }
+
+        @Override
+        protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+            if(desc.getName().contains(oldNameSpace)) {
+                String newClassName = desc.getName().replace(oldNameSpace, newNameSpace);
+                return Class.forName(newClassName);
+            }
+            return super.resolveClass(desc);
+        }
+    }
+}
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
@@ -17,10 +17,12 @@ import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
+import com.dfsek.terra.bukkit.BukkitPlayer;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
 import com.dfsek.terra.bukkit.world.inventory.meta.BukkitEnchantment;
 import org.bukkit.Location;
 import org.bukkit.TreeType;
+import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;

 /**
@@ -374,4 +376,12 @@ public final class BukkitAdapter {
    public static org.bukkit.enchantments.Enchantment adapt(Enchantment enchantment) {
        return ((BukkitEnchantment) enchantment).getHandle();
    }
+
+    public static Player adapt(com.dfsek.terra.api.platform.Player player) {
+        return ((BukkitPlayer) player).getHandle();
+    }
+
+    public static com.dfsek.terra.api.platform.Player adapt(Player player) {
+        return new BukkitPlayer(player);
+    }
 }
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world;

+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.world.tree.Tree;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
@@ -1,10 +1,8 @@
 package com.dfsek.terra.fabric;

 import com.dfsek.tectonic.loading.TypeRegistry;
-import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.GenericLoaders;
+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.api.language.Language;
-import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
@@ -13,10 +11,12 @@ import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.NotNullValidator;
 import com.dfsek.terra.api.transform.Transformer;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.config.base.ConfigPack;
-import com.dfsek.terra.config.base.PluginConfig;
+import com.dfsek.terra.biome.TerraBiome;
+import com.dfsek.terra.config.GenericLoaders;
+import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.debug.DebugLogger;
 import com.dfsek.terra.fabric.inventory.FabricItemHandle;
 import com.dfsek.terra.fabric.mixin.GeneratorTypeAccessor;
 import com.dfsek.terra.fabric.world.FabricBiome;
@@ -25,6 +25,7 @@ import com.dfsek.terra.fabric.world.TerraBiomeSource;
 import com.dfsek.terra.fabric.world.features.PopulatorFeature;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGeneratorWrapper;
 import com.dfsek.terra.registry.ConfigRegistry;
+import com.dfsek.terra.world.TerraWorld;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
@@ -76,6 +77,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {

    private final GenericLoaders genericLoaders = new GenericLoaders(this);
    private final Logger logger = Logger.getLogger("Terra");
+    private final DebugLogger debugLogger = new DebugLogger(logger);
    private final ItemHandle itemHandle = new FabricItemHandle();
    private final WorldHandle worldHandle = new FabricWorldHandle();
    private final ConfigRegistry registry = new ConfigRegistry();
@@ -181,6 +183,11 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
        return "Fabric";
    }

+    @Override
+    public DebugLogger getDebugLogger() {
+        return debugLogger;
+    }
+
    Transformer<String, Biome> biomeFixer = new Transformer.Builder<String, Biome>()
            .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse(id)), new NotNullValidator<>())
            .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse("minecraft:" + id.toLowerCase())), new NotNullValidator<>()).build();
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/TerraBiomeSource.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/TerraBiomeSource.java
@@ -2,7 +2,7 @@ package com.dfsek.terra.fabric.world;

 import com.dfsek.terra.biome.BiomeProvider;
 import com.dfsek.terra.biome.UserDefinedBiome;
-import com.dfsek.terra.config.base.ConfigPack;
+import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
--- 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
@@ -2,15 +2,15 @@ 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.config.base.ConfigPack;
+import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.world.TerraBiomeSource;
 import com.dfsek.terra.fabric.world.handles.world.FabricSeededWorldAccess;
-import com.dfsek.terra.generation.MasterChunkGenerator;
-import com.dfsek.terra.population.FloraPopulator;
-import com.dfsek.terra.population.OrePopulator;
-import com.dfsek.terra.population.StructurePopulator;
-import com.dfsek.terra.population.TreePopulator;
+import com.dfsek.terra.world.generation.MasterChunkGenerator;
+import com.dfsek.terra.world.population.FloraPopulator;
+import com.dfsek.terra.world.population.OrePopulator;
+import com.dfsek.terra.world.population.StructurePopulator;
+import com.dfsek.terra.world.population.TreePopulator;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.block.BlockState;
--- a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
@@ -1,20 +1,22 @@
 package com.dfsek.terra;

 import com.dfsek.tectonic.loading.TypeRegistry;
-import com.dfsek.terra.api.GenericLoaders;
+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.api.language.Language;
-import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Biome;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.config.base.PluginConfig;
+import com.dfsek.terra.config.GenericLoaders;
+import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.debug.DebugLogger;
 import com.dfsek.terra.platform.RawBiome;
 import com.dfsek.terra.platform.RawWorldHandle;
 import com.dfsek.terra.registry.ConfigRegistry;
+import com.dfsek.terra.world.TerraWorld;

 import java.io.File;
 import java.io.IOException;
@@ -94,6 +96,11 @@ public class StandalonePlugin implements TerraPlugin {
        return "Standalone";
    }

+    @Override
+    public DebugLogger getDebugLogger() {
+        return new DebugLogger(Logger.getLogger("Terra"));
+    }
+
    @Override
    public void register(TypeRegistry registry) {
        registry
--- a/platforms/region/src/main/java/com/dfsek/terra/platform/GenWrapper.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/GenWrapper.java
@@ -5,7 +5,7 @@ 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 com.dfsek.terra.world.generation.MasterChunkGenerator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

--- a/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java
@@ -1,15 +1,15 @@
 package com.dfsek.terra.region;

 import com.dfsek.terra.StandalonePlugin;
-import com.dfsek.terra.generation.MasterChunkGenerator;
-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.FloraPopulator;
-import com.dfsek.terra.population.OrePopulator;
-import com.dfsek.terra.population.StructurePopulator;
-import com.dfsek.terra.population.TreePopulator;
+import com.dfsek.terra.world.generation.MasterChunkGenerator;
+import com.dfsek.terra.world.generation.math.SamplerCache;
+import com.dfsek.terra.world.population.FloraPopulator;
+import com.dfsek.terra.world.population.OrePopulator;
+import com.dfsek.terra.world.population.StructurePopulator;
+import com.dfsek.terra.world.population.TreePopulator;
 import net.querz.mca.MCAFile;
 import net.querz.mca.MCAUtil;