% Refactored all Everglades stuff to it's own package.

$ Fixed inverted EIO tooltip logic.

36 files changed, 176 insertions, 176 deletions

diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
index 200e5a6bf4..cd6f13ffa6 100644
--- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
@@ -165,8 +165,8 @@ public class ConfigHandler {
 				"Disables Zombie Reinforcement on hard difficutly.");
 	
 		//Biomes
-		DARKWORLD_ID = config.getInt("darkworld_ID", "worldgen", 227, 1, 254, "The ID of the Dark Dimension.");
-		DARKBIOME_ID = config.getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension.");
+		EVERGLADES_ID = config.getInt("darkworld_ID", "worldgen", 227, 1, 254, "The ID of the Dark Dimension.");
+		EVERGLADESBIOME_ID = config.getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension.");
 	
 		//Blacklisted Accelerator TileEntities
 		BlacklistedTileEntiyClassNames = new String[] { "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry" };
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 35b5f9597c..fe090a398d 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -11,7 +11,6 @@ import net.minecraft.util.EnumChatFormatting;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_OreDictUnificator;
 
-import gtPlusPlus.GTplusplus_Secondary;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.common.compat.COMPAT_Baubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -56,6 +55,7 @@ import gtPlusPlus.core.util.debug.DEBUG_INIT;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.everglades.GTplusplus_Everglades;
 import gtPlusPlus.xmod.eio.material.MaterialEIO;
 import net.minecraftforge.common.util.EnumHelper;
 import net.minecraftforge.fluids.Fluid;
@@ -515,7 +515,7 @@ public final class ModItems {
 
 			//Ores
 			MaterialGenerator.generateOreMaterial(FLUORIDES.FLUORITE);
-			GTplusplus_Secondary.GenerateOreMaterials();
+			GTplusplus_Everglades.GenerateOreMaterials();
 
 
 		} catch (final Throwable r){
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index de3b7914f1..568d6badcc 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -54,8 +54,8 @@ public class CORE {
 	public static boolean isModUpToDate = Utils.isModUpToDate();
 
 	//Tweakables
-	public static int DARKBIOME_ID = 238;	
-	public static int DARKWORLD_ID = 227;
+	public static int EVERGLADESBIOME_ID = 238;	
+	public static int EVERGLADES_ID = 227;
 
 	//GT Vars;
 	public static final int GREG_FIRST_ID = 760;
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index e42b169c60..2588a88143 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -23,7 +23,7 @@ import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraftforge.oredict.OreDictionary;
@@ -165,7 +165,7 @@ public class RECIPES_General {
 				CI.sensor_HV, CI.fieldGenerator_MV, CI.sensor_HV,
 				CI.craftingToolHammer_Hard, ItemList.Casing_SolidSteel.get(1), CI.craftingToolSolderingIron,
 				CI.emitter_HV, CI.fieldGenerator_MV, CI.emitter_HV,
-				ItemUtils.getSimpleStack(Dimension_DarkWorld.blockPortalFrame, 2))){
+				ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2))){
 			Logger.INFO("Added a recipe for the Toxic Everglades Portal frame");
 		}
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index fa46b392e6..76182e61d9 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -11,7 +11,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
@@ -126,7 +126,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
 		}
 		
 	 else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) {
-		 GT_Values.RA.addLaserEngraverRecipe(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getSimpleStack(Dimension_DarkWorld.portalItem), 360*60*20, 4096);
+		 GT_Values.RA.addLaserEngraverRecipe(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getSimpleStack(Dimension_Everglades.portalItem), 360*60*20, 4096);
 	 }
 	 
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/DarkWorldPortalPosition.java b/src/Java/gtPlusPlus/core/world/darkworld/world/DarkWorldPortalPosition.java
deleted file mode 100644
index 9dcfb8cd2c..0000000000
--- a/src/Java/gtPlusPlus/core/world/darkworld/world/DarkWorldPortalPosition.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gtPlusPlus.core.world.darkworld.world;
-
-import net.minecraft.util.ChunkCoordinates;
-
-public class DarkWorldPortalPosition extends ChunkCoordinates {
-	public long field_85087_d;
-	final TeleporterDimensionMod field_85088_e;
-
-	public DarkWorldPortalPosition(TeleporterDimensionMod darkworldTeleporter, int par2, int par3, int par4, long par5) {
-		super(par2, par3, par4);
-		this.field_85088_e = darkworldTeleporter;
-		this.field_85087_d = par5;
-	}
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/GTplusplus_Secondary.java b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
index f29ae1afe0..9174442a43 100644
--- a/src/Java/gtPlusPlus/GTplusplus_Secondary.java
+++ b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
@@ -1,4 +1,4 @@
-package gtPlusPlus;
+package gtPlusPlus.everglades;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -17,11 +17,11 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.ORES;
-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.core.world.darkworld.gen.gt.WorldGen_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.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config;
 import net.minecraftforge.common.DimensionManager;
@@ -29,16 +29,16 @@ 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; after:miscutils;")
-public class GTplusplus_Secondary implements ActionListener {
+public class GTplusplus_Everglades implements ActionListener {
 
 	//Mod Instance
 	@Mod.Instance(Everglades.MODID)
-	public static GTplusplus_Secondary instance;
+	public static GTplusplus_Everglades instance;
 
 	// Dark World Handler
-	protected static volatile Biome_DarkWorld DarkWorld_Biome;
-	protected static volatile Dimension_DarkWorld DarkWorld_Dimension;
-	public static int globalDarkWorldPortalSpawnTimer = 0;
+	protected static volatile Biome_Everglades Everglades_Biome;
+	protected static volatile Dimension_Everglades Everglades_Dimension;
+	public static int globalEvergladesPortalSpawnTimer = 0;
 
 	// Pre-Init
 	@Mod.EventHandler
@@ -48,13 +48,13 @@ public class GTplusplus_Secondary implements ActionListener {
 		//Setup
 		setVars(event);
 		
-		setDarkBiome(new Biome_DarkWorld());
-		DarkWorld_Dimension = new Dimension_DarkWorld();
+		setEvergladesBiome(new Biome_Everglades());
+		Everglades_Dimension = new Dimension_Everglades();
 		
 		// Load Dark World
-		getDarkBiome().instance = instance;
-		DarkWorld_Dimension.instance = instance;
-		getDarkBiome().preInit(event);
+		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")));
@@ -65,14 +65,14 @@ public class GTplusplus_Secondary implements ActionListener {
 	public void load(final FMLInitializationEvent e) {
 		Logger.INFO("Begin resource allocation for " + Everglades.MODID + " V" +Everglades.VERSION);
 		
-		//Load Dark World and Biome
+		//Load World and Biome
 		GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE);
-		getDarkBiome().load();
-		DarkWorld_Dimension.load();
+		getEvergladesBiome().load();
+		Everglades_Dimension.load();
 
 	}
 	
-	public static void GenerateOreMaterials() {
+	public static synchronized void GenerateOreMaterials() {
 		MaterialGenerator.generateOreMaterial(ORES.CROCROITE);
 		MaterialGenerator.generateOreMaterial(ORES.GEIKIELITE);
 		MaterialGenerator.generateOreMaterial(ORES.NICHROMITE);
@@ -111,12 +111,12 @@ public class GTplusplus_Secondary implements ActionListener {
 		}
 	}
 
-	void setVars(FMLPreInitializationEvent event){
+	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_DarkWorld.DIMID)){
-			Dimension_DarkWorld.DIMID = DimensionManager.getNextFreeDimId();
+		if (DimensionManager.isDimensionRegistered(Dimension_Everglades.DIMID)){
+			Dimension_Everglades.DIMID = DimensionManager.getNextFreeDimId();
 		}
 		
 		/*
@@ -134,7 +134,7 @@ public class GTplusplus_Secondary implements ActionListener {
 
 	@EventHandler
 	public void serverLoad(FMLServerStartingEvent event) {
-		getDarkBiome().serverLoad(event);
+		getEvergladesBiome().serverLoad(event);
 	}
 
 	/*@Override
@@ -167,15 +167,15 @@ public class GTplusplus_Secondary implements ActionListener {
 
 	@EventHandler
 	public static void postInit(final FMLPostInitializationEvent e) {
-		Logger.INFO("Finished loading Toxic Everglades plugin for GT++.");
+		Logger.INFO("Finished loading Everglades plugin for GT++.");
 	}
 
-	public static synchronized Biome_DarkWorld getDarkBiome() {
-		return DarkWorld_Biome;
+	public static synchronized Biome_Everglades getEvergladesBiome() {
+		return Everglades_Biome;
 	}
 
-	public static synchronized void setDarkBiome(Biome_DarkWorld darkWorld_Biome) {
-		DarkWorld_Biome = darkWorld_Biome;
+	public static synchronized void setEvergladesBiome(Biome_Everglades darkWorld_Biome) {
+		Everglades_Biome = darkWorld_Biome;
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java b/src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java
index 353eed083d..83dedc376a 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java
+++ b/src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.biome;
+package gtPlusPlus.everglades.biome;
 
 import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*;
 import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.*;
@@ -13,8 +13,8 @@ import net.minecraft.world.biome.BiomeDecorator;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.*;
 
-import gtPlusPlus.core.world.darkworld.gen.WorldGenDeadLilly;
-import gtPlusPlus.core.world.darkworld.gen.WorldGenMinable_Custom;
+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;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java
index e9669d9b50..aadbfeb495 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
+++ b/src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.biome;
+package gtPlusPlus.everglades.biome;
 
 import java.lang.reflect.Field;
 import java.util.Random;
@@ -20,17 +20,17 @@ 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.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.BiomeManager;
 
-public class Biome_DarkWorld {
+public class Biome_Everglades {
 
-	public static BiomeGenDarkWorld biome = new BiomeGenDarkWorld();
+	public static BiomeGenEverglades biome = new BiomeGenEverglades();
 
 	public Object instance;
 
-	public Biome_DarkWorld() {
+	public Biome_Everglades() {
 	}
 
 	public void load() {
@@ -57,17 +57,17 @@ public class Biome_DarkWorld {
 	public void preInit(FMLPreInitializationEvent event) {
 	}
 
-	static class BiomeGenDarkWorld extends BiomeGenBase {
+	static class BiomeGenEverglades extends BiomeGenBase {
 		@SuppressWarnings("unchecked")
-		public BiomeGenDarkWorld() {
-			super(CORE.DARKBIOME_ID);
+		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("Dark World");
-			this.topBlock = Dimension_DarkWorld.blockTopLayer;
-			this.fillerBlock = Dimension_DarkWorld.blockSecondLayer;
+			//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;
@@ -99,7 +99,7 @@ public class Biome_DarkWorld {
 				Field mClone = mInternalBiomeList;
 				mTempList = (BiomeGenBase[]) mInternalBiomeList.get(null);
 				if (mTempList != null){
-					mTempList[CORE.DARKBIOME_ID] = this;
+					mTempList[CORE.EVERGLADESBIOME_ID] = this;
 					mInternalBiomeList.set(null, mTempList);
 					if (mTempList != mInternalBiomeList.get(null)){
 						ReflectionUtils.setFinalStatic(mInternalBiomeList, mTempList);
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerBiomes.java b/src/Java/gtPlusPlus/everglades/biome/GenLayerBiomes.java
index f7176f86fb..b69a8ea555 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerBiomes.java
+++ b/src/Java/gtPlusPlus/everglades/biome/GenLayerBiomes.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.biome;
+package gtPlusPlus.everglades.biome;
 
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.layer.GenLayer;
@@ -6,7 +6,7 @@ import net.minecraft.world.gen.layer.IntCache;
 
 public class GenLayerBiomes extends GenLayer {
 
-	protected BiomeGenBase[] allowedBiomes = { Biome_DarkWorld.biome, };
+	protected BiomeGenBase[] allowedBiomes = { Biome_Everglades.biome, };
 
 	public GenLayerBiomes(long seed) {
 		super(seed);
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java b/src/Java/gtPlusPlus/everglades/biome/GenLayerEverglades.java
index 4353c6d540..8034921dce 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java
+++ b/src/Java/gtPlusPlus/everglades/biome/GenLayerEverglades.java
@@ -1,13 +1,13 @@
-package gtPlusPlus.core.world.darkworld.biome;
+package gtPlusPlus.everglades.biome;
 
 import net.minecraft.world.WorldType;
 import net.minecraft.world.gen.layer.GenLayer;
 import net.minecraft.world.gen.layer.GenLayerVoronoiZoom;
 import net.minecraft.world.gen.layer.GenLayerZoom;
 
-public class GenLayerDarkWorld extends GenLayer {
+public class GenLayerEverglades extends GenLayer {
 
-	public GenLayerDarkWorld(long seed) {
+	public GenLayerEverglades(long seed) {
 		super(seed);
 	}
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java
index 95e21baa45..f68c97b3c5 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java
+++ b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.block;
+package gtPlusPlus.everglades.block;
 
 import cpw.mods.fml.common.registry.LanguageRegistry;
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java
index 82acaf1ff4..a1fcc588b5 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java
+++ b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.block;
+package gtPlusPlus.everglades.block;
 
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java
index 90c425d2d4..09dea46ab1 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java
+++ b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.block;
+package gtPlusPlus.everglades.block;
 
 import cpw.mods.fml.common.registry.LanguageRegistry;
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java
index 8271713dfb..3c0445c86d 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java
+++ b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.block;
+package gtPlusPlus.everglades.block;
 
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java b/src/Java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
index 061e2c8dc3..e64968888d 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java
+++ b/src/Java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.block;
+package gtPlusPlus.everglades.block;
 
 import java.util.Random;
 
@@ -24,13 +24,13 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
-import gtPlusPlus.core.world.darkworld.world.TeleporterDimensionMod;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+import gtPlusPlus.everglades.world.TeleporterDimensionMod;
 
-public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip{
+public class BlockEvergladesPortal extends BlockBreakable implements ITileTooltip{
 	IIcon gor = null, dol = null, st1 = null, st2 = null, st3 = null, st4 = null;
 
-	public BlockDarkWorldPortal() {
+	public BlockEvergladesPortal() {
 		super("portal", Material.portal, false);
 		this.setTickRandomly(true);
 		this.setHardness(-1.0F);
@@ -90,7 +90,7 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip
 
 		for (BlockPos side : portal.getSurroundingBlocks()) {
 			Block b = side.getBlockAtPos();
-			if (b == Dimension_DarkWorld.blockPortalFrame || b == Dimension_DarkWorld.portalBlock) {
+			if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) {
 				blockCount++;
 			}
 		}		
@@ -155,12 +155,12 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip
 	public boolean tryToCreatePortal(World par1World, int par2, int par3, int par4) {
 		byte b0 = 0;
 		byte b1 = 0;
-		if (par1World.getBlock(par2 - 1, par3, par4) == Dimension_DarkWorld.blockPortalFrame
-				|| par1World.getBlock(par2 + 1, par3, par4) == Dimension_DarkWorld.blockPortalFrame) {
+		if (par1World.getBlock(par2 - 1, par3, par4) == Dimension_Everglades.blockPortalFrame
+				|| par1World.getBlock(par2 + 1, par3, par4) == Dimension_Everglades.blockPortalFrame) {
 			b0 = 1;
 		}
-		if (par1World.getBlock(par2, par3, par4 - 1) == Dimension_DarkWorld.blockPortalFrame
-				|| par1World.getBlock(par2, par3, par4 + 1) == Dimension_DarkWorld.blockPortalFrame) {
+		if (par1World.getBlock(par2, par3, par4 - 1) == Dimension_Everglades.blockPortalFrame
+				|| par1World.getBlock(par2, par3, par4 + 1) == Dimension_Everglades.blockPortalFrame) {
 			b1 = 1;
 		}
 		if (b0 == b1) {
@@ -178,7 +178,7 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip
 					if (l != -1 && l != 2 || i1 != -1 && i1 != 3) {
 						Block j1 = par1World.getBlock(par2 + b0 * l, par3 + i1, par4 + b1 * l);
 						if (flag) {
-							if (j1 != Dimension_DarkWorld.blockPortalFrame) {
+							if (j1 != Dimension_Everglades.blockPortalFrame) {
 								return false;
 							}
 						}
@@ -211,7 +211,7 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip
 		World par1World = portal.world;
 		for (BlockPos side : portal.getSurroundingBlocks()) {
 			Block b = side.getBlockAtPos();
-			if (b == Dimension_DarkWorld.blockPortalFrame || b == Dimension_DarkWorld.portalBlock) {
+			if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) {
 				blockCount++;
 			}
 		}		
@@ -232,22 +232,22 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip
 		for (i1 = y; par1World.getBlock(x, i1 - 1, z) == this; --i1) {
 			;
 		}
-		if (par1World.getBlock(x, i1 - 1, z) != Dimension_DarkWorld.blockPortalFrame) {
+		if (par1World.getBlock(x, i1 - 1, z) != Dimension_Everglades.blockPortalFrame) {
 			par1World.setBlockToAir(x, y, z);
 		} else {
 			int j1;
 			for (j1 = 1; j1 < 4 && par1World.getBlock(x, i1 + j1, z) == this; ++j1) {
 				;
 			}
-			if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == Dimension_DarkWorld.blockPortalFrame) {
+			if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == Dimension_Everglades.blockPortalFrame) {
 				boolean flag = par1World.getBlock(x - 1, y, z) == this || par1World.getBlock(x + 1, y, z) == this;
 				boolean flag1 = par1World.getBlock(x, y, z - 1) == this || par1World.getBlock(x, y, z + 1) == this;
 				if (flag && flag1) {
 					par1World.setBlockToAir(x, y, z);
 				} else {
-					if ((par1World.getBlock(x + b0, y, z + b1) != Dimension_DarkWorld.blockPortalFrame || par1World
+					if ((par1World.getBlock(x + b0, y, z + b1) != Dimension_Everglades.blockPortalFrame || par1World
 							.getBlock(x - b0, y, z - b1) != this)
-							&& (par1World.getBlock(x - b0, y, z - b1) != Dimension_DarkWorld.blockPortalFrame || par1World.getBlock(x + b0, y,
+							&& (par1World.getBlock(x - b0, y, z - b1) != Dimension_Everglades.blockPortalFrame || par1World.getBlock(x + b0, y,
 									z + b1) != this)) {
 						par1World.setBlockToAir(x, y, z);
 					}
@@ -308,10 +308,10 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip
 			EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity;
 			if (thePlayer.timeUntilPortal > 0) {
 				thePlayer.timeUntilPortal = 100;
-			} else if (thePlayer.dimension != Dimension_DarkWorld.DIMID) {
+			} else if (thePlayer.dimension != Dimension_Everglades.DIMID) {
 				thePlayer.timeUntilPortal = 100;
-				thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, Dimension_DarkWorld.DIMID,
-						new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(Dimension_DarkWorld.DIMID)));
+				thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, Dimension_Everglades.DIMID,
+						new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(Dimension_Everglades.DIMID)));
 			} else {
 				thePlayer.timeUntilPortal = 100;
 				thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, 0,
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java b/src/Java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java
index b851e10343..9d0e425e3a 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
+++ b/src/Java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java
@@ -1,6 +1,6 @@
-package gtPlusPlus.core.world.darkworld.block;
+package gtPlusPlus.everglades.block;
 
-import static gtPlusPlus.core.world.darkworld.Dimension_DarkWorld.*;
+import static gtPlusPlus.everglades.dimension.Dimension_Everglades.*;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 
@@ -8,8 +8,8 @@ import net.minecraft.init.Blocks;
 
 import gtPlusPlus.core.block.base.BlockBaseFluid;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.world.darkworld.item.ItemBlockToxicEverglades;
-import gtPlusPlus.core.world.darkworld.item.ItemDarkWorldPortalTrigger;
+import gtPlusPlus.everglades.item.ItemBlockToxicEverglades;
+import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger;
 import net.minecraftforge.fluids.FluidRegistry;
 
 public class DarkWorldContentLoader {
@@ -41,7 +41,7 @@ public class DarkWorldContentLoader {
 	}
 
 	public synchronized static boolean initItems(){
-		portalItem = (ItemDarkWorldPortalTrigger) (new ItemDarkWorldPortalTrigger().setUnlocalizedName("everglades.trigger"));
+		portalItem = (ItemEvergladesPortalTrigger) (new ItemEvergladesPortalTrigger().setUnlocalizedName("everglades.trigger"));
 		GameRegistry.registerItem(portalItem, "everglades.trigger");	
 		return true;
 	}
@@ -50,7 +50,7 @@ public class DarkWorldContentLoader {
 
 		//Create Block Instances
 		blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, BlockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("fluidSludge");
-		portalBlock = new BlockDarkWorldPortal();
+		portalBlock = new BlockEvergladesPortal();
 		blockTopLayer = new BlockDarkWorldGround();
 		blockSecondLayer = new BlockDarkWorldPollutedDirt();
 		blockPortalFrame = new BlockDarkWorldPortalFrame();
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java b/src/Java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
index b8c86821f4..0ff265a4ae 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
+++ b/src/Java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.chunk;
+package gtPlusPlus.everglades.chunk;
 
 import java.util.List;
 import java.util.Random;
@@ -20,7 +20,7 @@ import net.minecraft.world.gen.structure.MapGenScatteredFeature;
 import net.minecraft.world.gen.structure.MapGenVillage;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.terraingen.ChunkProviderEvent;
 import net.minecraftforge.event.terraingen.PopulateChunkEvent;
@@ -173,11 +173,11 @@ public class ChunkProviderModded implements IChunkProvider {
 
 							for (int k3 = 0; k3 < 4; ++k3) {
 								if ((d15 += d16) > 0.0D) {
-									p_147424_3_[j3 += short1] = Dimension_DarkWorld.blockMainFiller;
+									p_147424_3_[j3 += short1] = Dimension_Everglades.blockMainFiller;
 								}
 								else if (k2 * 8 + l2 < b0) {
 									try {
-										p_147424_3_[j3 += short1] = Dimension_DarkWorld.blockFluidLakes; //River Fluid		 .
+										p_147424_3_[j3 += short1] = Dimension_Everglades.blockFluidLakes; //River Fluid		 .
 									}
 									catch (Throwable t){
 										p_147424_3_[j3 += short1] = Blocks.water; //River Fluid	Fallback										
@@ -397,7 +397,7 @@ public class ChunkProviderModded implements IChunkProvider {
 			l1 = this.rand.nextInt(256);
 			i2 = l + this.rand.nextInt(16) + 8;
 			try {
-				(new WorldGenLakes(Dimension_DarkWorld.blockFluidLakes)).generate(this.worldObj, this.rand, k1, l1, i2);
+				(new WorldGenLakes(Dimension_Everglades.blockFluidLakes)).generate(this.worldObj, this.rand, k1, l1, i2);
 			} catch (NullPointerException n){
 				n.getStackTrace();
 				(new WorldGenLakes(Blocks.lava)).generate(this.worldObj, this.rand, k1, l1, i2);
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java
index 678d9b0c2b..33b36a9ae0 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
+++ b/src/Java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java
@@ -1,20 +1,20 @@
-package gtPlusPlus.core.world.darkworld;
+package gtPlusPlus.everglades.dimension;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.world.darkworld.block.BlockDarkWorldPortal;
-import gtPlusPlus.core.world.darkworld.item.ItemDarkWorldPortalTrigger;
-import gtPlusPlus.core.world.darkworld.world.WorldProviderMod;
+import gtPlusPlus.everglades.block.BlockEvergladesPortal;
+import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger;
+import gtPlusPlus.everglades.world.WorldProviderMod;
 import net.minecraftforge.common.DimensionManager;
 
-public class Dimension_DarkWorld {
+public class Dimension_Everglades {
 
 	public Object instance;
-	public static int DIMID = CORE.DARKWORLD_ID;
-	public static BlockDarkWorldPortal portalBlock;
-	public static ItemDarkWorldPortalTrigger portalItem;
+	public static int DIMID = CORE.EVERGLADES_ID;
+	public static BlockEvergladesPortal portalBlock;
+	public static ItemEvergladesPortalTrigger portalItem;
 	public static Block blockTopLayer;
 	public static Block blockSecondLayer;
 	public static Block blockMainFiller = Blocks.stone;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenDeadLilly.java b/src/Java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java
index 22c3b5a090..0314f71eec 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenDeadLilly.java
+++ b/src/Java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.gen;
+package gtPlusPlus.everglades.gen;
 
 import java.util.Random;
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenMinable_Custom.java b/src/Java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java
index 2c9cda0017..303f7353f0 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenMinable_Custom.java
+++ b/src/Java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.gen;
+package gtPlusPlus.everglades.gen;
 
 import static gtPlusPlus.core.lib.CORE.PI;
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
index e71e884fc7..2035cfe096 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java
+++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.gen.gt;
+package gtPlusPlus.everglades.gen.gt;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
index f3dfb2cf08..5b7b34ae0f 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
+++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.gen.gt;
+package gtPlusPlus.everglades.gen.gt;
 
 import java.util.*;
 
@@ -15,7 +15,7 @@ import gregtech.api.util.GT_Log;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 
 public class WorldGen_GT_Base implements IWorldGenerator {
@@ -73,14 +73,14 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 	@Override
 	public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator,
 			IChunkProvider chunkProvider) {
-		if (world.provider.dimensionId == Dimension_DarkWorld.DIMID) {
+		if (world.provider.dimensionId == Dimension_Everglades.DIMID) {
 			generateSafely(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider);
 		}
 	}
 
 	public synchronized void generateSafely(Random random, int chunkX, int chunkZ, World world,
 			IChunkProvider chunkGenerator, IChunkProvider chunkProvider) {
-		int xDim = Dimension_DarkWorld.DIMID;
+		int xDim = Dimension_Everglades.DIMID;
 		switch (world.provider.dimensionId) {
 			case -1: // Nether
 				// generateNether(world, random, chunkX * 16, chunkZ * 16);
@@ -96,19 +96,19 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 					break;
 				}
 				else {
-					generateDarkWorld(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider);
+					generateEverglades(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider);
 					break;
 				}
 		}
 	}
 
-	private synchronized void generateDarkWorld(Random aRandom, int aX, int aZ, World aWorld,
+	private synchronized void generateEverglades(Random aRandom, int aX, int aZ, World aWorld,
 			IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
 		Logger.WORLD("Trying to Generate Dimension.");
 		synchronized (listLock) {
 			Logger.WORLD("Locked List addition.");
 			if (WorldGen_GT_Base.mList.add(new WorldGenContainer(new XSTR(Math.abs(aRandom.nextInt()) + 1), aX, aZ,
-					Dimension_DarkWorld.DIMID,
+					Dimension_Everglades.DIMID,
 					aWorld, aChunkGenerator, aChunkProvider,
 					aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName))){
 				Logger.WORLD("Locked List addition. Success.");				
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
index d34aa3604a..fe4897fd0d 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java
+++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
@@ -1,6 +1,6 @@
-package gtPlusPlus.core.world.darkworld.gen.gt;
+package gtPlusPlus.everglades.gen.gt;
 
-import static gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_GT_Base.debugWorldGen;
+import static gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base.debugWorldGen;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -24,7 +24,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 
 public class WorldGen_GT_Ore_Layer
@@ -156,7 +156,7 @@ extends WorldGen_GT {
 			Logger.WORLD("[World Generation Debug] Special Empty Vein placed.");
 			return ORE_PLACED;
 		}
-		if (aDimensionType != Dimension_DarkWorld.DIMID) {
+		if (aDimensionType != Dimension_Everglades.DIMID) {
 			/* // Debug code, but spams log
             if (debugWorldGen) {
                 GT_Log.out.println(
@@ -182,9 +182,9 @@ extends WorldGen_GT {
 		if (wX >= eX) {  //No overlap between orevein and this chunk exists in X
 			Block tBlock = aWorld.getBlock(aChunkX + 8, tMinY, aChunkZ + 8);
 			if (tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Blocks.stone) ||
-					tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_DarkWorld.blockSecondLayer) ||
-					tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_DarkWorld.blockMainFiller) ||
-					tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_DarkWorld.blockSecondaryFiller) ||
+					tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_Everglades.blockSecondLayer) ||
+					tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_Everglades.blockMainFiller) ||
+					tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_Everglades.blockSecondaryFiller) ||
 					tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Blocks.netherrack) ||
 					tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Blocks.end_stone) ||
 					tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, GregTech_API.sBlockGranites) ||
@@ -457,9 +457,9 @@ extends WorldGen_GT {
 				tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt) ||
 				tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites) ||
 				(mUpdated && tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, mStoneTypes)) ||
-				tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockSecondLayer) ||
-				tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockMainFiller) ||
-				tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockSecondaryFiller) ||
+				tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondLayer) ||
+				tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockMainFiller) ||
+				tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondaryFiller) ||
 				tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sandstone)) {
 
 			if (aWorld.setBlock(aX, aY, aZ, tOreBlock, 0, 3)){
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java
index 0dc6750904..3b9108149a 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
+++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.gen.gt;
+package gtPlusPlus.everglades.gen.gt;
 
 import java.util.Hashtable;
 
@@ -12,7 +12,7 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.ORES;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.world.darkworld.object.BoxedQuad;
+import gtPlusPlus.everglades.object.BoxedQuad;
 
 public class WorldGen_Ores {
 	
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java b/src/Java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java
index 1021f1aa1f..ce4182c598 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java
+++ b/src/Java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.item;
+package gtPlusPlus.everglades.item;
 
 import java.util.List;
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java b/src/Java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java
index 146f21de91..3119de19b9 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java
+++ b/src/Java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.item;
+package gtPlusPlus.everglades.item;
 
 import java.util.List;
 
@@ -15,10 +15,10 @@ import net.minecraft.world.World;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 
-public class ItemDarkWorldPortalTrigger extends Item {
-	public ItemDarkWorldPortalTrigger() {
+public class ItemEvergladesPortalTrigger extends Item {
+	public ItemEvergladesPortalTrigger() {
 		super();
 		this.maxStackSize = 1;
 		setMaxDamage(64);
@@ -86,7 +86,7 @@ public class ItemDarkWorldPortalTrigger extends Item {
 		Block i1 = par3World.getBlock(par4, par5, par6);
 		if (i1 == Blocks.air) {
 			par3World.playSoundEffect(par4 + 0.5D, par5 + 0.5D, par6 + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F);
-			if (Dimension_DarkWorld.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)){
+			if (Dimension_Everglades.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)){
 				//Make a Portal
 			}
 			else {
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java b/src/Java/gtPlusPlus/everglades/object/BoxedQuad.java
index 3437b0ebf1..d0fbc4247b 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
+++ b/src/Java/gtPlusPlus/everglades/object/BoxedQuad.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.object;
+package gtPlusPlus.everglades.object;
 
 import net.minecraft.block.Block;
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/CustomWorldType.java b/src/Java/gtPlusPlus/everglades/world/CustomWorldType.java
index eb9c284543..5a5344ca65 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/world/CustomWorldType.java
+++ b/src/Java/gtPlusPlus/everglades/world/CustomWorldType.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.world;
+package gtPlusPlus.everglades.world;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/Java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java b/src/Java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java
new file mode 100644
index 0000000000..227d32502b
--- /dev/null
+++ b/src/Java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java
@@ -0,0 +1,14 @@
+package gtPlusPlus.everglades.world;
+
+import net.minecraft.util.ChunkCoordinates;
+
+public class EvergladesPortalPosition extends ChunkCoordinates {
+	public long field_85087_d;
+	final TeleporterDimensionMod field_85088_e;
+
+	public EvergladesPortalPosition(TeleporterDimensionMod gladesTeleporter, int par2, int par3, int par4, long par5) {
+		super(par2, par3, par4);
+		this.field_85088_e = gladesTeleporter;
+		this.field_85087_d = par5;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/TeleporterDimensionMod.java b/src/Java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java
index 638f78d0c1..e67a882638 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/world/TeleporterDimensionMod.java
+++ b/src/Java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.world;
+package gtPlusPlus.everglades.world;
 
 import java.util.*;
 
@@ -9,7 +9,7 @@ import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.Teleporter;
 import net.minecraft.world.WorldServer;
 
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 
 public class TeleporterDimensionMod extends Teleporter {
 
@@ -60,7 +60,7 @@ public class TeleporterDimensionMod extends Teleporter {
 						int l1 = j + j1;
 						int i2 = k + i1 * b1 - l * b0;
 						boolean flag = j1 < 0;
-						this.worldServerInstance.setBlock(k1, l1, i2, flag ? Dimension_DarkWorld.blockPortalFrame : Blocks.air);
+						this.worldServerInstance.setBlock(k1, l1, i2, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air);
 					}
 				}
 			}
@@ -105,8 +105,8 @@ public class TeleporterDimensionMod extends Teleporter {
 					double d5 = l1 + 0.5D - par1Entity.posZ;
 
 					for (int i2 = this.worldServerInstance.getActualHeight() - 1; i2 >= 0; --i2) {
-						if (this.worldServerInstance.getBlock(l3, i2, l1) == Dimension_DarkWorld.portalBlock) {
-							while (this.worldServerInstance.getBlock(l3, i2 - 1, l1) == Dimension_DarkWorld.portalBlock) {
+						if (this.worldServerInstance.getBlock(l3, i2, l1) == Dimension_Everglades.portalBlock) {
+							while (this.worldServerInstance.getBlock(l3, i2 - 1, l1) == Dimension_Everglades.portalBlock) {
 								--i2;
 							}
 
@@ -137,19 +137,19 @@ public class TeleporterDimensionMod extends Teleporter {
 			d7 = k + 0.5D;
 			int i4 = -1;
 
-			if (this.worldServerInstance.getBlock(i - 1, j, k) == Dimension_DarkWorld.portalBlock) {
+			if (this.worldServerInstance.getBlock(i - 1, j, k) == Dimension_Everglades.portalBlock) {
 				i4 = 2;
 			}
 
-			if (this.worldServerInstance.getBlock(i + 1, j, k) == Dimension_DarkWorld.portalBlock) {
+			if (this.worldServerInstance.getBlock(i + 1, j, k) == Dimension_Everglades.portalBlock) {
 				i4 = 0;
 			}
 
-			if (this.worldServerInstance.getBlock(i, j, k - 1) == Dimension_DarkWorld.portalBlock) {
+			if (this.worldServerInstance.getBlock(i, j, k - 1) == Dimension_Everglades.portalBlock) {
 				i4 = 3;
 			}
 
-			if (this.worldServerInstance.getBlock(i, j, k + 1) == Dimension_DarkWorld.portalBlock) {
+			if (this.worldServerInstance.getBlock(i, j, k + 1) == Dimension_Everglades.portalBlock) {
 				i4 = 1;
 			}
 
@@ -402,7 +402,7 @@ public class TeleporterDimensionMod extends Teleporter {
 						i4 = j2 + k3;
 						j4 = k2 + (j3 - 1) * l2 - i3 * l5;
 						flag = k3 < 0;
-						this.worldServerInstance.setBlock(l3, i4, j4, flag ? Dimension_DarkWorld.blockPortalFrame : Blocks.air);
+						this.worldServerInstance.setBlock(l3, i4, j4, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air);
 					}
 				}
 			}
@@ -415,7 +415,7 @@ public class TeleporterDimensionMod extends Teleporter {
 					i4 = j2 + k3;
 					j4 = k2 + (j3 - 1) * l2;
 					flag = j3 == 0 || j3 == 3 || k3 == -1 || k3 == 3;
-					this.worldServerInstance.setBlock(l3, i4, j4, flag ? Dimension_DarkWorld.blockPortalFrame : Dimension_DarkWorld.portalBlock, 0, 2);
+					this.worldServerInstance.setBlock(l3, i4, j4, flag ? Dimension_Everglades.blockPortalFrame : Dimension_Everglades.portalBlock, 0, 2);
 				}
 			}
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldChunkManagerCustom.java b/src/Java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java
index 4977d1caf0..fc1b2ac425 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldChunkManagerCustom.java
+++ b/src/Java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.world;
+package gtPlusPlus.everglades.world;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,7 +19,7 @@ import net.minecraft.world.biome.WorldChunkManager;
 import net.minecraft.world.gen.layer.GenLayer;
 import net.minecraft.world.gen.layer.IntCache;
 
-import gtPlusPlus.core.world.darkworld.biome.GenLayerDarkWorld;
+import gtPlusPlus.everglades.biome.GenLayerEverglades;
 
 public class WorldChunkManagerCustom extends WorldChunkManager {
 
@@ -41,7 +41,7 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
 	public WorldChunkManagerCustom(long seed, WorldType worldType) {
 		this();
 		// i changed this to my GenLayerDarkWorld
-		GenLayer[] agenlayer = GenLayerDarkWorld.makeTheWorld(seed, worldType);
+		GenLayer[] agenlayer = GenLayerEverglades.makeTheWorld(seed, worldType);
 
 		agenlayer = getModdedBiomeGenerators(worldType, seed, agenlayer);
 		this.genBiomes = agenlayer[0];
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java b/src/Java/gtPlusPlus/everglades/world/WorldProviderMod.java
index c01537e565..b5945bcd21 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java
+++ b/src/Java/gtPlusPlus/everglades/world/WorldProviderMod.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.world.darkworld.world;
+package gtPlusPlus.everglades.world;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -8,8 +8,8 @@ import net.minecraft.world.WorldProvider;
 import net.minecraft.world.WorldType;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
-import gtPlusPlus.core.world.darkworld.chunk.ChunkProviderModded;
+import gtPlusPlus.everglades.chunk.ChunkProviderModded;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 
 public class WorldProviderMod extends WorldProvider {
 
@@ -18,7 +18,7 @@ public class WorldProviderMod extends WorldProvider {
 		this.worldChunkMgr = new WorldChunkManagerCustom(this.worldObj.getSeed(), WorldType.AMPLIFIED);
 		this.isHellWorld = false;
 		this.hasNoSky = false;
-		this.dimensionId = Dimension_DarkWorld.DIMID;
+		this.dimensionId = Dimension_Everglades.DIMID;
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
index 667b5d2e51..bed1ec1c3a 100644
--- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
+++ b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
@@ -18,20 +18,20 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 
 public class HandlerTooltip_EIO {
 
-	Item mIngot;
-	ItemStack mPulsatingIron;
-	ItemStack mConductiveIron;
-	ItemStack mRedstoneAlloy;
-	ItemStack mElectricalSteel;
-	ItemStack mEnergeticAlloy;
-	ItemStack mVibrantAlloy;
-	ItemStack mSoularium;
-	ItemStack mDarkIron;
+	private static volatile Item mIngot;
+	private static volatile ItemStack mPulsatingIron;
+	private static volatile ItemStack mConductiveIron;
+	private static volatile ItemStack mRedstoneAlloy;
+	private static volatile ItemStack mElectricalSteel;
+	private static volatile ItemStack mEnergeticAlloy;
+	private static volatile ItemStack mVibrantAlloy;
+	private static volatile ItemStack mSoularium;
+	private static volatile ItemStack mDarkIron;
 
 	@SubscribeEvent
 	public void onItemTooltip(ItemTooltipEvent event){
 		//Is EIO loaded?
-		if (disableEnderIOIngotTooltips && LoadedMods.EnderIO){
+		if (!disableEnderIOIngotTooltips && LoadedMods.EnderIO){
 
 			//Is the EIO Ingot Item null?
 			//If it is, reflect in.
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index 1b3b682ea4..f510cd08ba 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -9,7 +9,7 @@ import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.handler.OldCircuitHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_GT;
+import gtPlusPlus.everglades.gen.gt.WorldGen_GT;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config;
 import gtPlusPlus.xmod.gregtech.api.world.GTPP_Worldgen;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
index d60065b367..b47ae47574 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
@@ -20,7 +20,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.world.darkworld.block.DarkWorldContentLoader;
+import gtPlusPlus.everglades.block.DarkWorldContentLoader;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import ic2.core.init.BlocksItems;