Move sources and resources

27 files changed, 0 insertions, 4369 deletions

diff --git a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
deleted file mode 100644
index 0709f0b1ff..0000000000
--- a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package gtPlusPlus.everglades;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-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;
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.CORE.Everglades;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.material.ORES;
-import gtPlusPlus.everglades.biome.Biome_Everglades;
-import gtPlusPlus.everglades.block.DarkWorldContentLoader;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
-import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base;
-import gtPlusPlus.everglades.gen.gt.WorldGen_Ores;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
-import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.config.Configuration;
-
-@MCVersion(value = "1.7.10")
-@Mod(modid = Everglades.MODID, name = Everglades.NAME, version = Everglades.VERSION, dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; required-after:miscutils;")
-public class GTplusplus_Everglades implements ActionListener {
-
-	//Mod Instance
-	@Mod.Instance(Everglades.MODID)
-	public static GTplusplus_Everglades instance;
-
-	// Dark World Handler
-	protected static volatile Biome_Everglades Everglades_Biome;
-	protected static volatile Dimension_Everglades Everglades_Dimension;
-	public static int globalEvergladesPortalSpawnTimer = 0;
-
-	// Pre-Init
-	@Mod.EventHandler
-	public void preInit(final FMLPreInitializationEvent event) {
-		Logger.INFO("Loading " + Everglades.MODID + " V" + Everglades.VERSION);
-
-		//Setup
-		setVars(event);
-
-		setEvergladesBiome(new Biome_Everglades());
-		Everglades_Dimension = new Dimension_Everglades();
-
-		// Load Dark World
-		getEvergladesBiome().instance = instance;
-		Everglades_Dimension.instance = instance;
-		getEvergladesBiome().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 " + Everglades.MODID + " V" +Everglades.VERSION);
-
-		//Load World and Biome
-		GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE);
-		getEvergladesBiome().load();
-		Everglades_Dimension.load();
-
-	}
-
-	public static synchronized void GenerateOreMaterials() {
-		MaterialGenerator.generateOreMaterial(ORES.CROCROITE);
-		MaterialGenerator.generateOreMaterial(ORES.GEIKIELITE);
-		MaterialGenerator.generateOreMaterial(ORES.NICHROMITE);
-		MaterialGenerator.generateOreMaterial(ORES.TITANITE);
-		MaterialGenerator.generateOreMaterial(ORES.ZIMBABWEITE);
-		MaterialGenerator.generateOreMaterial(ORES.ZIRCONILITE);
-		MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_CE);
-		MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_Y);
-		MaterialGenerator.generateOreMaterial(ORES.LEPERSONNITE);
-		MaterialGenerator.generateOreMaterial(ORES.SAMARSKITE_Y);
-		MaterialGenerator.generateOreMaterial(ORES.SAMARSKITE_YB);
-		MaterialGenerator.generateOreMaterial(ORES.XENOTIME);
-		MaterialGenerator.generateOreMaterial(ORES.YTTRIAITE);
-		MaterialGenerator.generateOreMaterial(ORES.YTTRIALITE);
-		MaterialGenerator.generateOreMaterial(ORES.YTTROCERITE);
-		MaterialGenerator.generateOreMaterial(ORES.ZIRCON);
-		MaterialGenerator.generateOreMaterial(ORES.POLYCRASE);
-		MaterialGenerator.generateOreMaterial(ORES.ZIRCOPHYLLITE);
-		MaterialGenerator.generateOreMaterial(ORES.ZIRKELITE);
-		MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_LA);
-		MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_CE);
-		MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_ND);
-		MaterialGenerator.generateOreMaterial(ORES.AGARDITE_Y);
-		MaterialGenerator.generateOreMaterial(ORES.AGARDITE_CD);
-		MaterialGenerator.generateOreMaterial(ORES.AGARDITE_LA);
-		MaterialGenerator.generateOreMaterial(ORES.AGARDITE_ND);
-		MaterialGenerator.generateOreMaterial(ORES.HIBONITE);
-		MaterialGenerator.generateOreMaterial(ORES.CERITE);
-		MaterialGenerator.generateOreMaterial(ORES.FLUORCAPHITE);
-		MaterialGenerator.generateOreMaterial(ORES.FLORENCITE);
-		MaterialGenerator.generateOreMaterial(ORES.CRYOLITE);
-
-		MaterialGenerator.generateOreMaterial(ORES.LAUTARITE);
-		MaterialGenerator.generateOreMaterial(ORES.LAFOSSAITE);
-		MaterialGenerator.generateOreMaterial(ORES.DEMICHELEITE_BR);
-		MaterialGenerator.generateOreMaterial(ORES.COMANCHEITE);
-		MaterialGenerator.generateOreMaterial(ORES.PERROUDITE);
-		MaterialGenerator.generateOreMaterial(ORES.HONEAITE);
-		MaterialGenerator.generateOreMaterial(ORES.ALBURNITE);
-		MaterialGenerator.generateOreMaterial(ORES.MIESSIITE);
-		MaterialGenerator.generateOreMaterial(ORES.KASHINITE);
-		MaterialGenerator.generateOreMaterial(ORES.IRARSITE);
-		MaterialGenerator.generateOreMaterial(ORES.GREENOCKITE);
-		MaterialGenerator.generateOreMaterial(ORES.RADIOBARITE);
-		MaterialGenerator.generateOreMaterial(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT);
-		
-		//Custom Ores
-		if (LoadedMods.Big_Reactors) {
-			MaterialGenerator.generateOreMaterial(ELEMENT.getInstance().YELLORIUM, false, false, true, new short[] {255, 242, 10});
-		}
-
-		if (!CORE.GTNH) {
-			MaterialGenerator.generateOreMaterial(
-					ELEMENT.getInstance().TRINIUM,
-					true,
-					false,
-					false,
-					ELEMENT.getInstance().TRINIUM_REFINED.getRGBA());
-		}
-		
-		
-		
-		/*
-		 * OSRS Materials
-		 */
-		
-		MaterialGenerator.generateOreMaterial(
-				ELEMENT.STANDALONE.GRANITE,
-				true,
-				false,
-				false,
-				ELEMENT.STANDALONE.GRANITE.getRGBA());		
-		MaterialGenerator.generateOreMaterial(
-				ELEMENT.STANDALONE.RUNITE,
-				true,
-				false,
-				false,
-				ELEMENT.STANDALONE.RUNITE.getRGBA());
-		
-
-		
-	}
-
-	protected synchronized void setVars(FMLPreInitializationEvent event){
-		//Init WorldGen config.
-		HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
-
-		if (DimensionManager.isDimensionRegistered(Dimension_Everglades.DIMID)){
-			Dimension_Everglades.DIMID = DimensionManager.getNextFreeDimId();
-		}
-
-		/*
-		 * Set World Generation Values
-		 */
-		WorldGen_Ores.generateValidOreVeins();
-		WorldGen_GT_Base.oreveinPercentage = 64;
-		WorldGen_GT_Base.oreveinAttempts = 16;
-		WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4;	
-		if (CORE_Preloader.DEBUG_MODE || CORE.DEVENV){
-			WorldGen_GT_Base.debugWorldGen = true;
-		}		
-		DarkWorldContentLoader.run();
-	}
-
-	@EventHandler
-	public void serverLoad(FMLServerStartingEvent event) {
-		getEvergladesBiome().serverLoad(event);
-	}
-
-	/*@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
-	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) {
-			DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ);
-		}
-
-		//What does this even do?
-		if (world.provider.dimensionId == -1) {
-			DarkWorld_Biome.generateNether(world, random, chunkX, chunkZ);
-		}
-		if (world.provider.dimensionId == 0) {
-			DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ);
-		}
-
-	}*/
-
-	@EventHandler
-	public static void postInit(final FMLPostInitializationEvent e) {
-		Logger.INFO("Finished loading Everglades plugin for GT++.");
-	}
-
-	public static synchronized Biome_Everglades getEvergladesBiome() {
-		return Everglades_Biome;
-	}
-
-	public static synchronized void setEvergladesBiome(Biome_Everglades darkWorld_Biome) {
-		Everglades_Biome = darkWorld_Biome;
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent arg0) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java
deleted file mode 100644
index 0f8acd75b4..0000000000
--- a/src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java
+++ /dev/null
@@ -1,351 +0,0 @@
-package gtPlusPlus.everglades.biome;
-
-import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*;
-import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.*;
-
-import java.util.Random;
-
-import net.minecraft.block.BlockFlower;
-import net.minecraft.block.material.Material;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeDecorator;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.feature.*;
-
-import gtPlusPlus.everglades.gen.WorldGenDeadLilly;
-import gtPlusPlus.everglades.gen.WorldGenMinable_Custom;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.terraingen.DecorateBiomeEvent;
-import net.minecraftforge.event.terraingen.OreGenEvent;
-import net.minecraftforge.event.terraingen.TerrainGen;
-
-public class BiomeGenerator_Custom extends BiomeDecorator {
-    
-    public WorldGenerator fluoriteGen;
-
-    public BiomeGenerator_Custom(){
-    	//Basic Blocks
-        this.sandGen = new WorldGenMinable_Custom(Blocks.sand, 12);
-        this.gravelAsSandGen = new WorldGenMinable_Custom(Blocks.gravel, 8);
-        this.dirtGen = new WorldGenMinable_Custom(Blocks.dirt, 32);
-        this.gravelGen = new WorldGenMinable_Custom(Blocks.gravel, 12);
-        
-        
-        //Oregen
-        this.coalGen = new WorldGenMinable_Custom(Blocks.coal_ore, 16);
-        this.ironGen = new WorldGenMinable_Custom(Blocks.iron_ore, 12);
-        this.goldGen = new WorldGenMinable_Custom(Blocks.gold_ore, 12);
-        this.redstoneGen = new WorldGenMinable_Custom(Blocks.redstone_ore, 10);
-        this.diamondGen = new WorldGenMinable_Custom(Blocks.diamond_ore, 12);
-        this.lapisGen = new WorldGenMinable_Custom(Blocks.lapis_ore, 8);
-        // this.fluoriteGen = new WorldGenMinable_Custom(ModBlocks.blockOreFluorite, 20);
-        
-        //Nature
-        this.yellowFlowerGen = new WorldGenFlowers(Blocks.yellow_flower);
-        this.mushroomBrownGen = new WorldGenFlowers(Blocks.brown_mushroom);
-        this.mushroomRedGen = new WorldGenFlowers(Blocks.red_mushroom);
-        this.bigMushroomGen = new WorldGenBigMushroom();
-        this.reedGen = new WorldGenReed();
-        this.cactusGen = new WorldGenCactus();
-        this.waterlilyGen = new WorldGenDeadLilly();
-        
-        this.flowersPerChunk = 1;
-        this.grassPerChunk = 5;
-        this.sandPerChunk = 3;
-        this.sandPerChunk2 = 5;
-        this.clayPerChunk = 7;
-        
-        this.generateLakes = true;
-    }
-
-    @Override
-	public void decorateChunk(World p_150512_1_, Random p_150512_2_, BiomeGenBase p_150512_3_, int p_150512_4_, int p_150512_5_)
-    {
-        if (this.currentWorld != null)
-        {
-            throw new RuntimeException("Already decorating!!");
-        }
-        else
-        {
-            this.currentWorld = p_150512_1_;
-            this.randomGenerator = p_150512_2_;
-            this.chunk_X = p_150512_4_;
-            this.chunk_Z = p_150512_5_;
-            this.genDecorations(p_150512_3_);
-            this.currentWorld = null;
-            this.randomGenerator = null;
-        }
-    }
-
-    @Override
-	protected void genDecorations(BiomeGenBase p_150513_1_)
-    {
-        MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Pre(currentWorld, randomGenerator, chunk_X, chunk_Z));
-        this.generateOres();
-        int i;
-        int j;
-        int k;
-
-        boolean doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, SAND);
-        for (i = 0; doGen && i < this.sandPerChunk2; ++i)
-        {
-            j = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            this.sandGen.generate(this.currentWorld, this.randomGenerator, j, this.currentWorld.getTopSolidOrLiquidBlock(j, k), k);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, CLAY);
-        for (i = 0; doGen && i < this.clayPerChunk; ++i)
-        {
-            j = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            this.clayGen.generate(this.currentWorld, this.randomGenerator, j, this.currentWorld.getTopSolidOrLiquidBlock(j, k), k);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, SAND_PASS2);
-        for (i = 0; doGen && i < this.sandPerChunk; ++i)
-        {
-            j = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            this.gravelAsSandGen.generate(this.currentWorld, this.randomGenerator, j, this.currentWorld.getTopSolidOrLiquidBlock(j, k), k);
-        }
-
-        i = this.treesPerChunk;
-
-        if (this.randomGenerator.nextInt(10) == 0)
-        {
-            ++i;
-        }
-
-        int l;
-        int i1;
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, TREE);
-        for (j = 0; doGen && j < i; ++j)
-        {
-            k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            i1 = this.currentWorld.getHeightValue(k, l);
-            WorldGenAbstractTree worldgenabstracttree = p_150513_1_.func_150567_a(this.randomGenerator);
-            worldgenabstracttree.setScale(1.0D, 1.0D, 1.0D);
-
-            if (worldgenabstracttree.generate(this.currentWorld, this.randomGenerator, k, i1, l))
-            {
-                worldgenabstracttree.func_150524_b(this.currentWorld, this.randomGenerator, k, i1, l);
-            }
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, BIG_SHROOM);
-        for (j = 0; doGen && j < this.bigMushroomsPerChunk; ++j)
-        {
-            k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            this.bigMushroomGen.generate(this.currentWorld, this.randomGenerator, k, this.currentWorld.getHeightValue(k, l), l);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, FLOWERS);
-        for (j = 0; doGen && j < this.flowersPerChunk; ++j)
-        {
-            k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            i1 = nextInt(this.currentWorld.getHeightValue(k, l) + 32);
-            String s = p_150513_1_.func_150572_a(this.randomGenerator, k, i1, l);
-            BlockFlower blockflower = BlockFlower.func_149857_e(s);
-
-            if (blockflower.getMaterial() != Material.air)
-            {
-                this.yellowFlowerGen.func_150550_a(blockflower, BlockFlower.func_149856_f(s));
-                this.yellowFlowerGen.generate(this.currentWorld, this.randomGenerator, k, i1, l);
-            }
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, GRASS);
-        for (j = 0; doGen && j < this.grassPerChunk; ++j)
-        {
-            k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2);
-            WorldGenerator worldgenerator = p_150513_1_.getRandomWorldGenForGrass(this.randomGenerator);
-            worldgenerator.generate(this.currentWorld, this.randomGenerator, k, i1, l);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, DEAD_BUSH);
-        for (j = 0; doGen && j < this.deadBushPerChunk; ++j)
-        {
-            k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2);
-            (new WorldGenDeadBush(Blocks.deadbush)).generate(this.currentWorld, this.randomGenerator, k, i1, l);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, LILYPAD);
-        for (j = 0; doGen && j < this.waterlilyPerChunk; ++j)
-        {
-            k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-
-            for (i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2); i1 > 0 && this.currentWorld.isAirBlock(k, i1 - 1, l); --i1)
-            {
-                ;
-            }
-
-            this.waterlilyGen.generate(this.currentWorld, this.randomGenerator, k, i1, l);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, SHROOM);
-        for (j = 0; doGen && j < this.mushroomsPerChunk; ++j)
-        {
-            if (this.randomGenerator.nextInt(4) == 0)
-            {
-                k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-                l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-                i1 = this.currentWorld.getHeightValue(k, l);
-                this.mushroomBrownGen.generate(this.currentWorld, this.randomGenerator, k, i1, l);
-            }
-
-            if (this.randomGenerator.nextInt(8) == 0)
-            {
-                k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-                l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-                i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2);
-                this.mushroomRedGen.generate(this.currentWorld, this.randomGenerator, k, i1, l);
-            }
-        }
-
-        if (doGen && this.randomGenerator.nextInt(4) == 0)
-        {
-            j = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            l = nextInt(this.currentWorld.getHeightValue(j, k) * 2);
-            this.mushroomBrownGen.generate(this.currentWorld, this.randomGenerator, j, l, k);
-        }
-
-        if (doGen && this.randomGenerator.nextInt(8) == 0)
-        {
-            j = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            l = nextInt(this.currentWorld.getHeightValue(j, k) * 2);
-            this.mushroomRedGen.generate(this.currentWorld, this.randomGenerator, j, l, k);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, REED);
-        for (j = 0; doGen && j < this.reedsPerChunk; ++j)
-        {
-            k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2);
-            this.reedGen.generate(this.currentWorld, this.randomGenerator, k, i1, l);
-        }
-
-        for (j = 0; doGen && j < 10; ++j)
-        {
-            k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2);
-            this.reedGen.generate(this.currentWorld, this.randomGenerator, k, i1, l);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, PUMPKIN);
-        if (doGen && this.randomGenerator.nextInt(32) == 0)
-        {
-            j = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            l = nextInt(this.currentWorld.getHeightValue(j, k) * 2);
-            (new WorldGenPumpkin()).generate(this.currentWorld, this.randomGenerator, j, l, k);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, CACTUS);
-        for (j = 0; doGen && j < this.cactiPerChunk; ++j)
-        {
-            k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2);
-            this.cactusGen.generate(this.currentWorld, this.randomGenerator, k, i1, l);
-        }
-
-        doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, LAKE);
-        if (doGen && this.generateLakes)
-        {
-            for (j = 0; j < 50; ++j)
-            {
-                k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-                l = this.randomGenerator.nextInt(this.randomGenerator.nextInt(248) + 8);
-                i1 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-                (new WorldGenLiquids(Blocks.flowing_water)).generate(this.currentWorld, this.randomGenerator, k, l, i1);
-            }
-
-            for (j = 0; j < 20; ++j)
-            {
-                k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-                l = this.randomGenerator.nextInt(this.randomGenerator.nextInt(this.randomGenerator.nextInt(240) + 8) + 8);
-                i1 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-                (new WorldGenLiquids(Blocks.flowing_lava)).generate(this.currentWorld, this.randomGenerator, k, l, i1);
-            }
-        }
-
-        MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(currentWorld, randomGenerator, chunk_X, chunk_Z));
-    }
-
-    /**
-     * Standard ore generation helper. Generates most ores.
-     */
-    @Override
-	protected void genStandardOre1(int p_76795_1_, WorldGenerator p_76795_2_, int p_76795_3_, int p_76795_4_)
-    {
-        for (int l = 0; l < p_76795_1_; ++l)
-        {
-            int i1 = this.chunk_X + this.randomGenerator.nextInt(16);
-            int j1 = this.randomGenerator.nextInt(p_76795_4_ - p_76795_3_) + p_76795_3_;
-            int k1 = this.chunk_Z + this.randomGenerator.nextInt(16);
-            p_76795_2_.generate(this.currentWorld, this.randomGenerator, i1, j1, k1);
-        }
-    }
-
-    /**
-     * Standard ore generation helper. Generates Lapis Lazuli.
-     */
-    @Override
-	protected void genStandardOre2(int p_76793_1_, WorldGenerator p_76793_2_, int p_76793_3_, int p_76793_4_)
-    {
-        for (int l = 0; l < p_76793_1_; ++l)
-        {
-            int i1 = this.chunk_X + this.randomGenerator.nextInt(16);
-            int j1 = this.randomGenerator.nextInt(p_76793_4_) + this.randomGenerator.nextInt(p_76793_4_) + (p_76793_3_ - p_76793_4_);
-            int k1 = this.chunk_Z + this.randomGenerator.nextInt(16);
-            p_76793_2_.generate(this.currentWorld, this.randomGenerator, i1, j1, k1);
-        }
-    }
-
-    /**
-     * Generates ores in the current chunk
-     */
-    @Override
-	protected void generateOres()
-    {
-        MinecraftForge.ORE_GEN_BUS.post(new OreGenEvent.Pre(currentWorld, randomGenerator, chunk_X, chunk_Z));
-        if (TerrainGen.generateOre(currentWorld, randomGenerator, dirtGen, chunk_X, chunk_Z, DIRT))
-        this.genStandardOre1(20, this.dirtGen, 0, 256);
-        if (TerrainGen.generateOre(currentWorld, randomGenerator, gravelGen, chunk_X, chunk_Z, GRAVEL))
-        this.genStandardOre1(10, this.gravelGen, 0, 256);
-        if (TerrainGen.generateOre(currentWorld, randomGenerator, coalGen, chunk_X, chunk_Z, COAL))
-        this.genStandardOre1(20, this.coalGen, 0, 128);
-        if (TerrainGen.generateOre(currentWorld, randomGenerator, ironGen, chunk_X, chunk_Z, IRON))
-        this.genStandardOre1(20, this.ironGen, 0, 64);
-        if (TerrainGen.generateOre(currentWorld, randomGenerator, goldGen, chunk_X, chunk_Z, GOLD))
-        this.genStandardOre1(2, this.goldGen, 0, 32);
-        if (TerrainGen.generateOre(currentWorld, randomGenerator, redstoneGen, chunk_X, chunk_Z, REDSTONE))
-        this.genStandardOre1(8, this.redstoneGen, 0, 16);
-        if (TerrainGen.generateOre(currentWorld, randomGenerator, diamondGen, chunk_X, chunk_Z, DIAMOND))
-        this.genStandardOre1(1, this.diamondGen, 0, 16);
-        if (TerrainGen.generateOre(currentWorld, randomGenerator, lapisGen, chunk_X, chunk_Z, LAPIS))
-        this.genStandardOre2(1, this.lapisGen, 16, 16);
-        MinecraftForge.ORE_GEN_BUS.post(new OreGenEvent.Post(currentWorld, randomGenerator, chunk_X, chunk_Z));
-    }
-
-    private int nextInt(int i) {
-        if (i <= 1)
-            return 0;
-        return this.randomGenerator.nextInt(i);
-	}
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java
deleted file mode 100644
index b31f6d034e..0000000000
--- a/src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package gtPlusPlus.everglades.biome;
-
-import java.lang.reflect.Field;
-import java.util.Random;
-
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.entity.monster.EntityPigZombie;
-import net.minecraft.entity.passive.EntityBat;
-import net.minecraft.entity.passive.EntitySquid;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.entity.monster.EntitySickBlaze;
-import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
-import net.minecraftforge.common.BiomeDictionary;
-import net.minecraftforge.common.BiomeManager;
-
-public class Biome_Everglades {
-
-	public static BiomeGenEverglades biome = new BiomeGenEverglades();
-
-	public Object instance;
-
-	public Biome_Everglades() {
-	}
-
-	public void load() {
-		BiomeDictionary.registerBiomeType(biome, BiomeDictionary.Type.DEAD);
-		BiomeManager.addSpawnBiome(biome);
-	}
-
-	public void generateNether(World world, Random random, int chunkX, int chunkZ) {
-	}
-
-	public void generateSurface(World world, Random random, int chunkX, int chunkZ) {
-	}
-
-	public void registerRenderers() {
-	}
-
-	public int addFuel(ItemStack fuel) {
-		return 0;
-	}
-
-	public void serverLoad(FMLServerStartingEvent event) {
-	}
-
-	public void preInit(FMLPreInitializationEvent event) {
-	}
-
-	static class BiomeGenEverglades extends BiomeGenBase {
-		@SuppressWarnings("unchecked")
-		public BiomeGenEverglades() {
-			super(CORE.EVERGLADESBIOME_ID);
-			//this.setBiomeID();
-			this.theBiomeDecorator = new BiomeGenerator_Custom();
-			this.theBiomeDecorator.treesPerChunk = 10;
-			//Logger.INFO("Dark World Temperature Category: "+getTempCategory());
-			this.setBiomeName("Toxic Everglades");
-			this.topBlock = Dimension_Everglades.blockTopLayer;
-			this.fillerBlock = Dimension_Everglades.blockSecondLayer;
-			this.enableRain = true;
-			this.enableSnow = false;
-			this.rainfall = 0.7F;
-			this.setHeight(new BiomeGenBase.Height(0.3F, 0.5F));
-			this.heightVariation = 0.4F;
-			this.waterColorMultiplier = 0x17290A;
-			this.rootHeight = -0.25f; //Ground level
-
-			this.spawnableMonsterList.clear();
-			this.spawnableCreatureList.clear();
-			this.spawnableWaterCreatureList.clear();
-			this.spawnableCaveCreatureList.clear();
-
-			//Enemies			
-			this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntitySickBlaze.class, 100, 2, 6));
-			this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityPigZombie.class, 75, 4, 16));
-			this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(Entity