% 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 {