$ Organized imports.

$ FindBugs fixes.

23 files changed, 118 insertions, 72 deletions

diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
index 33881c1e21..678d9b0c2b 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
@@ -1,11 +1,12 @@
 package gtPlusPlus.core.world.darkworld;
 
+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 net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
 import net.minecraftforge.common.DimensionManager;
 
 public class Dimension_DarkWorld {
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java
index 294d61f802..353eed083d 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java
@@ -5,9 +5,6 @@ import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.Ev
 
 import java.util.Random;
 
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.world.darkworld.gen.WorldGenDeadLilly;
-import gtPlusPlus.core.world.darkworld.gen.WorldGenMinable_Custom;
 import net.minecraft.block.BlockFlower;
 import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
@@ -15,8 +12,13 @@ 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.core.world.darkworld.gen.WorldGenDeadLilly;
+import gtPlusPlus.core.world.darkworld.gen.WorldGenMinable_Custom;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.terraingen.*;
+import net.minecraftforge.event.terraingen.DecorateBiomeEvent;
+import net.minecraftforge.event.terraingen.OreGenEvent;
+import net.minecraftforge.event.terraingen.TerrainGen;
 
 public class BiomeGenerator_Custom extends BiomeDecorator {
     /** The world the BiomeDecorator is currently decorating */
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
index f912fb7c6a..e9669d9b50 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
@@ -7,18 +7,20 @@ 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 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.core.world.darkworld.Dimension_DarkWorld;
+
 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.core.world.darkworld.Dimension_DarkWorld;
 import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.BiomeManager;
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java
index 1b7ab242e8..4353c6d540 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java
@@ -1,7 +1,9 @@
 package gtPlusPlus.core.world.darkworld.biome;
 
 import net.minecraft.world.WorldType;
-import net.minecraft.world.gen.layer.*;
+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 {
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java
index a16836bce0..95e21baa45 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java
@@ -1,9 +1,11 @@
 package gtPlusPlus.core.world.darkworld.block;
 
 import cpw.mods.fml.common.registry.LanguageRegistry;
+
+import net.minecraft.block.BlockGrass;
+
 import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import net.minecraft.block.BlockGrass;
 
 public class BlockDarkWorldGround extends BlockGrass implements ITileTooltip{
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java
index d8a05e9612..82acaf1ff4 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java
@@ -3,12 +3,14 @@ package gtPlusPlus.core.world.darkworld.block;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.core.creative.AddToCreativeTab;
+
 import net.minecraft.block.BlockDirt;
 import net.minecraft.world.ColorizerGrass;
 import net.minecraft.world.IBlockAccess;
 
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+
 public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileTooltip{
 
 	public BlockDarkWorldPollutedDirt() {
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java
index 74bf034cf7..b366b41ba0 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java
@@ -2,14 +2,9 @@ package gtPlusPlus.core.world.darkworld.block;
 
 import java.util.Random;
 
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-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 net.minecraft.block.Block;
 import net.minecraft.block.BlockBreakable;
 import net.minecraft.block.material.Material;
@@ -24,6 +19,12 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.core.world.darkworld.world.TeleporterDimensionMod;
+
 public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip{
 	IIcon gor = null, dol = null, st1 = null, st2 = null, st3 = null, st4 = null;
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java
index 1ab195d1aa..90c425d2d4 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java
@@ -1,11 +1,13 @@
 package gtPlusPlus.core.world.darkworld.block;
 
 import cpw.mods.fml.common.registry.LanguageRegistry;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+
 import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
 
 public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip{
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java
index 9f8ed377bc..8271713dfb 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java
@@ -1,6 +1,9 @@
 package gtPlusPlus.core.world.darkworld.block;
 
-import net.minecraft.block.material.*;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.material.MaterialLiquid;
+
 import net.minecraftforge.fluids.Fluid;
 
 public class BlockDarkWorldSludgeFluid extends Fluid {
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
index 94e35a97ed..b851e10343 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java
@@ -3,12 +3,13 @@ package gtPlusPlus.core.world.darkworld.block;
 import static gtPlusPlus.core.world.darkworld.Dimension_DarkWorld.*;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+
+import net.minecraft.init.Blocks;
+
 import gtPlusPlus.core.block.base.BlockBaseFluid;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTooltip;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.world.darkworld.item.ItemBlockToxicEverglades;
 import gtPlusPlus.core.world.darkworld.item.ItemDarkWorldPortalTrigger;
-import net.minecraft.init.Blocks;
 import net.minecraftforge.fluids.FluidRegistry;
 
 public class DarkWorldContentLoader {
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java b/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
index 82b21d7c0d..b8c86821f4 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
@@ -3,8 +3,6 @@ package gtPlusPlus.core.world.darkworld.chunk;
 import java.util.List;
 import java.util.Random;
 
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFalling;
 import net.minecraft.entity.EnumCreatureType;
@@ -17,9 +15,16 @@ import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraft.world.gen.*;
 import net.minecraft.world.gen.feature.WorldGenLakes;
-import net.minecraft.world.gen.structure.*;
+import net.minecraft.world.gen.structure.MapGenMineshaft;
+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 net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.terraingen.*;
+import net.minecraftforge.event.terraingen.ChunkProviderEvent;
+import net.minecraftforge.event.terraingen.PopulateChunkEvent;
+import net.minecraftforge.event.terraingen.TerrainGen;
 
 public class ChunkProviderModded implements IChunkProvider {
 	private Random rand;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenMinable_Custom.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenMinable_Custom.java
index 58937c8a40..2c9cda0017 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenMinable_Custom.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenMinable_Custom.java
@@ -4,13 +4,14 @@ import static gtPlusPlus.core.lib.CORE.PI;
 
 import java.util.Random;
 
-import gtPlusPlus.api.objects.Logger;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenMinable;
 
+import gtPlusPlus.api.objects.Logger;
+
 public class WorldGenMinable_Custom extends WorldGenMinable
 {
 	/** The block to generate. */
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java
index db926e7c6c..e71e884fc7 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java
@@ -1,14 +1,15 @@
 package gtPlusPlus.core.world.darkworld.gen.gt;
 
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
+
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+
 public abstract class WorldGen_GT {
 	public final String mWorldGenName;
 	public final boolean mEnabled;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
index 301a2154c2..f3dfb2cf08 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
@@ -3,18 +3,20 @@ package gtPlusPlus.core.world.darkworld.gen.gt;
 import java.util.*;
 
 import cpw.mods.fml.common.IWorldGenerator;
-import cpw.mods.fml.common.registry.GameRegistry;
+
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.feature.WorldGenMinable;
+
 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.xmod.gregtech.HANDLER_GT;
-import net.minecraft.block.Block;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.feature.WorldGenMinable;
 
 public class WorldGen_GT_Base implements IWorldGenerator {
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java
index 56818a055e..d34aa3604a 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java
@@ -5,16 +5,20 @@ import static gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_GT_Base.debugWorld
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Log;
 import gregtech.common.blocks.GT_Block_Ores;
 import gregtech.common.blocks.GT_TileEntity_Ores;
+
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
@@ -22,11 +26,6 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.IChunkProvider;
 
 public class WorldGen_GT_Ore_Layer
 extends WorldGen_GT {
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
index 4d15f2a068..0dc6750904 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
@@ -2,9 +2,10 @@ package gtPlusPlus.core.world.darkworld.gen.gt;
 
 import java.util.Hashtable;
 
+import net.minecraft.block.Block;
+
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gtPlusPlus.api.helpers.MaterialHelper;
+
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
@@ -12,7 +13,6 @@ 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 net.minecraft.block.Block;
 
 public class WorldGen_Ores {
 	
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java
index 41bc620722..1021f1aa1f 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java
@@ -2,13 +2,13 @@ package gtPlusPlus.core.world.darkworld.item;
 
 import java.util.List;
 
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTooltip;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
+import gtPlusPlus.api.interfaces.ITileTooltip;
+
 public class ItemBlockToxicEverglades extends ItemBlock {
 	
 	protected final int mID;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java
index f3fd499ce4..146f21de91 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java
@@ -2,18 +2,21 @@ package gtPlusPlus.core.world.darkworld.item;
 
 import java.util.List;
 
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.item.*;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 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;
+
 public class ItemDarkWorldPortalTrigger extends Item {
 	public ItemDarkWorldPortalTrigger() {
 		super();
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java b/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
index fd3d734e08..3437b0ebf1 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
@@ -1,8 +1,9 @@
 package gtPlusPlus.core.world.darkworld.object;
 
-import gtPlusPlus.api.objects.data.Pair;
 import net.minecraft.block.Block;
 
+import gtPlusPlus.api.objects.data.Pair;
+
 public class BoxedQuad<K,V,C,R> {
 
 	private final Pair<Block, Integer> key;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/TeleporterDimensionMod.java b/src/Java/gtPlusPlus/core/world/darkworld/world/TeleporterDimensionMod.java
index c53f90f07d..638f78d0c1 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/world/TeleporterDimensionMod.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/world/TeleporterDimensionMod.java
@@ -2,11 +2,14 @@ package gtPlusPlus.core.world.darkworld.world;
 
 import java.util.*;
 
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import net.minecraft.entity.Entity;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.*;
-import net.minecraft.world.*;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.Teleporter;
+import net.minecraft.world.WorldServer;
+
+import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 
 public class TeleporterDimensionMod extends Teleporter {
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldChunkManagerCustom.java b/src/Java/gtPlusPlus/core/world/darkworld/world/WorldChunkManagerCustom.java
index 9365beacf4..4977d1caf0 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldChunkManagerCustom.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/world/WorldChunkManagerCustom.java
@@ -1,18 +1,26 @@
 package gtPlusPlus.core.world.darkworld.world;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.world.darkworld.biome.GenLayerDarkWorld;
+
 import net.minecraft.crash.CrashReport;
 import net.minecraft.crash.CrashReportCategory;
 import net.minecraft.util.ReportedException;
-import net.minecraft.world.*;
-import net.minecraft.world.biome.*;
+import net.minecraft.world.ChunkPosition;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldType;
+import net.minecraft.world.biome.BiomeCache;
+import net.minecraft.world.biome.BiomeGenBase;
+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;
+
 public class WorldChunkManagerCustom extends WorldChunkManager {
 
 	private GenLayer genBiomes;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java b/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java
index fd0f7a9b74..c01537e565 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java
@@ -2,13 +2,15 @@ package gtPlusPlus.core.world.darkworld.world;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
-import gtPlusPlus.core.world.darkworld.chunk.ChunkProviderModded;
+
 import net.minecraft.util.Vec3;
 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;
+
 public class WorldProviderMod extends WorldProvider {
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
index ead327d85a..792e47085e 100644
--- a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
+++ b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
@@ -2,9 +2,6 @@ package gtPlusPlus.core.world.explosions;
 
 import java.util.*;
 
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
-import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.enchantment.EnchantmentProtection;
@@ -13,7 +10,13 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.*;
-import net.minecraft.world.*;
+import net.minecraft.world.ChunkPosition;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.World;
+
+import gtPlusPlus.api.objects.random.XSTR;
+import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
+import gtPlusPlus.core.util.math.MathUtils;
 
 public class MiningExplosion extends Explosion {
 	private final int field_77289_h = 16;