package net.shadowfacts.enfusion;

import net.shadowfacts.enfusion.block.EBlocks;
import net.shadowfacts.enfusion.client.gui.ECreativeTabs;
import net.shadowfacts.enfusion.config.Configurator;
import net.shadowfacts.enfusion.item.EItems;
import net.shadowfacts.enfusion.recipes.ERecipes;
import net.shadowfacts.enfusion.world.generation.OreGenerator;
import net.shadowfacts.shadowcore.Log;
import net.shadowfacts.shadowcore.command.CommandHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.registry.GameRegistry;

@Mod(modid=EnFusion.modId, name=EnFusion.displayName, version=EnFusion.version)
public class EnFusion {
	// Mod info
	public static final String modId = "enfusion";
	public static final String displayName = "EnFusion";
	public static final String version = "0.0.1";
	public static final String clientProxyString = "net.shadowfacts.enfusion.client.ClientProxy";
	public static final String serverProxyString = "net.shadowfacts.enfusion.CommonProxy";
	
	
	@Instance(value=EnFusion.modId)
	public static EnFusion instance;

	@SidedProxy(clientSide=EnFusion.clientProxyString, serverSide=EnFusion.serverProxyString)
	public static CommonProxy proxy;
	
	// Logger
	public static final Log log = new Log(modId);
	
	
	// Custom Creative Tab
	public static ECreativeTabs zTab = new ECreativeTabs();
	
	
	
	// Ore Generation
	OreGenerator oreGenerator = new OreGenerator();
	
	@EventHandler
	public void preInit(FMLPreInitializationEvent event) {
		// Config
		Configurator.loadConfig(event);
		
		
		EBlocks.preInit(); // Blocks
		EItems.preInit(); // Items
		ERecipes.registerRecipes(); // Recipes
		
		ERecipes.registerOreDictThings(); // OreDict
		
		// Ore Generator
		GameRegistry.registerWorldGenerator(oreGenerator, 3);
	}

	@EventHandler
	public void load(FMLInitializationEvent event) {
		proxy.registerTileEntities();
		
		EBlocks.load();
		EItems.load();
	}

	@EventHandler
	public void postInit(FMLPostInitializationEvent event) {
		EBlocks.postInit();
		EItems.postInit();
		
		proxy.registerEntities();
		proxy.registerRenderInformation();
	}
}







@@ -39,854 +39,849 @@
 ort 
-net.shadowfacts.enfusion.block.EBlocks;%0Aimport net.shadowfacts.enfusion.client.gui.ECreativeTabs;%0Aimport net.shadowfacts.enfusion.config.Configurator;%0Aimport net.shadowfacts.enfusion.item.EItems;%0Aimport net.shadowfacts.enfusion.recipes.ERecipes;%0Aimport net.shadowfacts.enfusion.world.generation.OreGenerator;%0Aimport net.shadowfacts.shadowcore.Log;%0Aimport net.shadowfacts.shadowcore.command.CommandHandler;%0Aimport cpw.mods.fml.common.Mod;%0Aimport cpw.mods.fml.common.Mod.EventHandler;%0Aimport cpw.mods.fml.common.Mod.Instance;%0Aimport cpw.mods.fml.common.SidedProxy;%0Aimport cpw.mods.fml.common.event.FMLInitializationEvent;%0Aimport cpw.mods.fml.common.event.FMLPostInitializationEvent;%0Aimport cpw.mods.fml.common.event.FMLPreInitializationEvent;%0Aimport cpw.mods.fml.common.event.FMLServerStartingEvent;%0Aimport cpw.mods.fml.common.registry.GameRegistry
+cpw.mods.fml.common.Mod;%0Aimport cpw.mods.fml.common.Mod.EventHandler;%0Aimport cpw.mods.fml.common.Mod.Instance;%0Aimport cpw.mods.fml.common.SidedProxy;%0Aimport cpw.mods.fml.common.event.FMLInitializationEvent;%0Aimport cpw.mods.fml.common.event.FMLPostInitializationEvent;%0Aimport cpw.mods.fml.common.event.FMLPreInitializationEvent;%0Aimport cpw.mods.fml.common.network.NetworkRegistry;%0Aimport cpw.mods.fml.common.registry.GameRegistry;%0A%0Aimport net.shadowfacts.enfusion.block.EBlocks;%0Aimport net.shadowfacts.enfusion.client.gui.ECreativeTabs;%0Aimport net.shadowfacts.enfusion.client.gui.EFGuiHandler;%0Aimport net.shadowfacts.enfusion.config.Configurator;%0Aimport net.shadowfacts.enfusion.item.EItems;%0Aimport net.shadowfacts.enfusion.recipes.ERecipes;%0Aimport net.shadowfacts.enfusion.world.generation.OreGenerator;%0Aimport net.shadowfacts.shadowcore.Log
 ;%0A%0A@
@@ -1591,97 +1591,8 @@
 ;%0A%09%0A
-%09%0A%09// Custom Creative Tab%0A%09public static ECreativeTabs zTab = new ECreativeTabs();%0A%09%0A%09%0A%09%0A
 %09// 
@@ -2147,16 +2147,120 @@
 .load();
+%0A%0A%09%09// Register GUI handler%0A%09%09NetworkRegistry.INSTANCE.registerGuiHandler(instance, new EFGuiHandler());
 %0A%09%7D%0A%0A%09@E

Remove old code