Revert "Add populators at a later stage. Fixes #325."

This reverts commit 1277029.

Author: rutgerkok

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/TCPlugin.java

@@ -4,12 +4,10 @@
 import com.khorn.terraincontrol.bukkit.commands.TCCommandExecutor;
 import com.khorn.terraincontrol.bukkit.events.TCListener;
 import com.khorn.terraincontrol.bukkit.generator.BukkitVanillaBiomeGenerator;
-import com.khorn.terraincontrol.bukkit.generator.TCBlockPopulator;
 import com.khorn.terraincontrol.bukkit.generator.TCChunkGenerator;
 import com.khorn.terraincontrol.bukkit.generator.structures.RareBuildingStart;
 import com.khorn.terraincontrol.bukkit.generator.structures.VillageStart;
 import com.khorn.terraincontrol.bukkit.metrics.BukkitMetricsHelper;
-import com.khorn.terraincontrol.configuration.WorldConfig.TerrainMode;
 import com.khorn.terraincontrol.configuration.WorldSettings;
 import com.khorn.terraincontrol.configuration.standard.PluginStandardValues;
 import com.khorn.terraincontrol.generator.biome.VanillaBiomeGenerator;
@@ -121,7 +119,7 @@ public ChunkGenerator getDefaultWorldGenerator(String worldName, String id)
         if (worldName.isEmpty())
         {
             TerrainControl.log(LogMarker.DEBUG, "Ignoring empty world name. Is some generator plugin checking if \"TerrainControl\" is a valid world name?");
-            return new TCChunkGenerator();
+            return new TCChunkGenerator(this);
         }
 
         // Check if not already enabled
@@ -158,7 +156,7 @@ public ChunkGenerator getDefaultWorldGenerator(String worldName, String id)
             case TerrainTest:
             case OldGenerator:
             case NotGenerate:
-                generator = new TCChunkGenerator();
+                generator = new TCChunkGenerator(this);
                 break;
             case Default:
                 break;
@@ -190,22 +188,12 @@ public void onWorldInit(World world)
             // Enable and register the world
             bukkitWorld.enable(world);
             this.worlds.put(world.getName(), bukkitWorld);
-            addPopulator(world, bukkitWorld);
 
             // Show message
             TerrainControl.log(LogMarker.INFO, "World {} is now enabled!", (Object) bukkitWorld.getName());
         }
     }
 
-    private void addPopulator(World world, BukkitWorld bukkitWorld)
-    {
-        TerrainMode terrainMode = bukkitWorld.getConfigs().getWorldConfig().ModeTerrain;
-        if (terrainMode != TerrainMode.TerrainTest && terrainMode != TerrainMode.NotGenerate)
-        {
-            world.getPopulators().add(new TCBlockPopulator(bukkitWorld));
-        }
-    }
-
     public void onWorldUnload(World world)
     {
         if (this.notInitedWorlds.containsKey(world.getName()))

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/generator/TCChunkGenerator.java

@@ -1,21 +1,45 @@
 package com.khorn.terraincontrol.bukkit.generator;
 
-import com.google.common.base.Preconditions;
 import com.khorn.terraincontrol.bukkit.BukkitWorld;
+import com.khorn.terraincontrol.bukkit.TCPlugin;
 import com.khorn.terraincontrol.configuration.WorldConfig;
 import com.khorn.terraincontrol.generator.ChunkProviderTC;
 import com.khorn.terraincontrol.util.ChunkCoordinate;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
 public class TCChunkGenerator extends ChunkGenerator
 {
     private ChunkProviderTC chunkProviderTC;
+    private ArrayList<BlockPopulator> BlockPopulator = new ArrayList<BlockPopulator>();
     private boolean NotGenerate = false;
-    private boolean initialized = false;
+    private TCPlugin plugin;
+
+    public TCChunkGenerator(TCPlugin _plugin)
+    {
+        this.plugin = _plugin;
+    }
+
+    /**
+     * Initializes the world if it hasn't already been initialized.
+     * 
+     * @param world
+     *            The world of this generator.
+     */
+    private void makeSureWorldIsInitialized(World world)
+    {
+        if (this.chunkProviderTC == null)
+        {
+            // Not yet initialized, do it now
+            this.plugin.onWorldInit(world);
+        }
+    }
 
     /**
      * Called whenever a BukkitWorld instance becomes available.
@@ -25,28 +49,39 @@ public class TCChunkGenerator extends ChunkGenerator
      */
     public void onInitialize(BukkitWorld _world)
     {
-        Preconditions.checkState(!this.initialized, "Already initialized");
-
         this.chunkProviderTC = new ChunkProviderTC(_world.getConfigs(), _world);
 
         WorldConfig.TerrainMode mode = _world.getConfigs().getWorldConfig().ModeTerrain;
 
+        if (mode == WorldConfig.TerrainMode.Normal || mode == WorldConfig.TerrainMode.OldGenerator)
+            this.BlockPopulator.add(new TCBlockPopulator(_world));
+
         if (mode == WorldConfig.TerrainMode.NotGenerate)
             this.NotGenerate = true;
+    }
+
+    @Override
+    public List<BlockPopulator> getDefaultPopulators(World world)
+    {
+        makeSureWorldIsInitialized(world);
 
-        this.initialized = true;
+        return this.BlockPopulator;
     }
 
     @Override
     public boolean canSpawn(World world, int x, int z)
     {
+        makeSureWorldIsInitialized(world);
+
         Material material = world.getHighestBlockAt(x, z).getType();
         return material.isSolid();
     }
 
     @Override
     public short[][] generateExtBlockSections(World world, Random random, int chunkX, int chunkZ, BiomeGrid biomes)
     {
+        makeSureWorldIsInitialized(world);
+
         if (this.NotGenerate)
             return new short[16][];
         ChunkCoordinate chunkCoord = ChunkCoordinate.fromChunkCoords(chunkX, chunkZ);