1 files changed, 47 insertions, 30 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus_Secondary.java b/src/Java/gtPlusPlus/GTplusplus_Secondary.java
index 670f6d0fc8..329d3fdb1d 100644
--- a/src/Java/gtPlusPlus/GTplusplus_Secondary.java
+++ b/src/Java/gtPlusPlus/GTplusplus_Secondary.java
@@ -1,10 +1,9 @@
 package gtPlusPlus;
 
 import java.io.File;
-import java.util.Random;
 
 import cofh.mod.ChildMod;
-import cpw.mods.fml.common.*;
+import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.CustomProperty;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.*;
@@ -15,11 +14,9 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import gtPlusPlus.core.world.darkworld.biome.Biome_DarkWorld;
 import gtPlusPlus.core.world.darkworld.block.DarkWorldContentLoader;
+import gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_GT_Base;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.config.Configuration;
 
@@ -29,28 +26,16 @@ name = "GT++ Dark World",
 version = CORE.VERSION,
 dependencies = "after:Miscutils;after:Gregtech",
 customProperties = @CustomProperty(k = "cofhversion", v = "true")))
-public class GTplusplus_Secondary implements IFuelHandler, IWorldGenerator{
+public class GTplusplus_Secondary {
 
 	public static final String MODID2 = "GT++ Dark World";
 	public static final String VERSION2 = "0.1";
 
 	// Dark World Handler
-	Biome_DarkWorld DarkWorld_Biome;
-	Dimension_DarkWorld DarkWorld_Dimension;
+	protected static volatile Biome_DarkWorld DarkWorld_Biome;
+	protected static volatile Dimension_DarkWorld DarkWorld_Dimension;
 	public static int globalDarkWorldPortalSpawnTimer = 0;
 
-	@EventHandler
-	public void load(final FMLInitializationEvent e) {
-		Logger.INFO("Begin resource allocation for " + MODID2 + " V" + VERSION2);
-
-		//Load Dark World and Biome
-		GameRegistry.registerFuelHandler(this);
-		GameRegistry.registerWorldGenerator(this, 1);
-		DarkWorld_Biome.load();
-		DarkWorld_Dimension.load();
-
-	}
-
 	// Pre-Init
 	@Mod.EventHandler
 	public void preInit(final FMLPreInitializationEvent event) {
@@ -59,50 +44,74 @@ public class GTplusplus_Secondary implements IFuelHandler, IWorldGenerator{
 		//Setup
 		setVars();
 		
-		DarkWorld_Biome = new Biome_DarkWorld();
+		setDarkBiome(new Biome_DarkWorld());
 		DarkWorld_Dimension = new Dimension_DarkWorld();
 		
 		// Load Dark World
-		DarkWorld_Biome.instance = GTplusplus.instance;
+		getDarkBiome().instance = GTplusplus.instance;
 		DarkWorld_Dimension.instance = GTplusplus.instance;
-		DarkWorld_Biome.preInit(event);
+		getDarkBiome().preInit(event);
 		DarkWorld_Dimension.preInit(event);
 		
 		//Load/Set Custom Ore Gen
 		HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
 		
 	}
+
+	@EventHandler
+	public void load(final FMLInitializationEvent e) {
+		Logger.INFO("Begin resource allocation for " + MODID2 + " V" + VERSION2);
+
+		//Load Dark World and Biome
+		//GameRegistry.registerFuelHandler(this);
+		GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), 50);
+		getDarkBiome().load();
+		DarkWorld_Dimension.load();
+
+	}
 	
 	void setVars(){
 		if (DimensionManager.isDimensionRegistered(Dimension_DarkWorld.DIMID)){
 			Dimension_DarkWorld.DIMID = DimensionManager.getNextFreeDimId();
 		}
+		
+		/*
+		 * Set World Generation Values
+		 */
+		
+		WorldGen_GT_Base.oreveinPercentage = 75;
+		WorldGen_GT_Base.oreveinAttempts = 64;
+		WorldGen_GT_Base.oreveinMaxPlacementAttempts = 8;	
+		if (CORE.DEBUG || CORE.DEVENV){
+			WorldGen_GT_Base.debugWorldGen = true;
+		}
+		
 		DarkWorldContentLoader.run();
 	}
 
 	@EventHandler
 	public void serverLoad(FMLServerStartingEvent event) {
-		DarkWorld_Biome.serverLoad(event);
+		getDarkBiome().serverLoad(event);
 		DarkWorld_Dimension.serverLoad(event);
 	}
 
-	@Override
+	/*@Override
 	public int getBurnTime(ItemStack fuel) {
 		if (DarkWorld_Biome.addFuel(fuel) != 0)
 			return DarkWorld_Biome.addFuel(fuel);
 		if (DarkWorld_Dimension.addFuel(fuel) != 0)
 			return DarkWorld_Dimension.addFuel(fuel);
 		return 0;
-	}
+	}*/
 
-	@Override
+	/*@Override
 	public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) {
 		chunkX = chunkX * 16;
 		chunkZ = chunkZ * 16;		
 
-		/*if (world.provider.dimensionId == Dimension_DarkWorld.DIMID) {
+		if (world.provider.dimensionId == Dimension_DarkWorld.DIMID) {
 			DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ);
-		}*/
+		}
 		
 		//What does this even do?
 		if (world.provider.dimensionId == -1) {
@@ -112,11 +121,19 @@ public class GTplusplus_Secondary implements IFuelHandler, IWorldGenerator{
 			DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ);
 		}
 
-	}
+	}*/
 
 	@EventHandler
 	public static void postInit(final FMLPostInitializationEvent e) {
 		Logger.INFO("Finished loading Dark World plugin for GT++.");
 	}
 
+	public static synchronized Biome_DarkWorld getDarkBiome() {
+		return DarkWorld_Biome;
+	}
+
+	public static synchronized void setDarkBiome(Biome_DarkWorld darkWorld_Biome) {
+		DarkWorld_Biome = darkWorld_Biome;
+	}
+
 }