The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

* move tectech and delete some gross reflection in gt++

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

17 files changed, 423 insertions, 425 deletions

diff --git a/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java
new file mode 100644
index 0000000000..403198d6df
--- /dev/null
+++ b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java
@@ -0,0 +1,193 @@
+package gtPlusPlus.everglades;
+
+import static gregtech.api.enums.Mods.GTPlusPlusEverglades;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
+import net.minecraft.block.Block;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.common.config.Configuration;
+
+import bwcrossmod.galacticgreg.MTEVoidMinerBase;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.enums.Mods;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.lib.GTPPCore.Everglades;
+import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.MaterialsOres;
+import gtPlusPlus.everglades.biome.BiomeEverglades;
+import gtPlusPlus.everglades.block.DarkWorldContentLoader;
+import gtPlusPlus.everglades.dimension.DimensionEverglades;
+import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base;
+import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer;
+import gtPlusPlus.everglades.gen.gt.WorldGen_Ores;
+import gtPlusPlus.preloader.PreloaderCore;
+import gtPlusPlus.xmod.gregtech.HandlerGT;
+import gtPlusPlus.xmod.gregtech.api.util.GTPPConfig;
+
+@Mod(
+    modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES,
+    name = Everglades.NAME,
+    version = Everglades.VERSION,
+    dependencies = "required-after:Forge; after:dreamcraft; after:IC2; required-after:gregtech; required-after:miscutils;")
+public class GTPPEverglades implements ActionListener {
+
+    // Mod Instance
+    @Mod.Instance(Mods.Names.G_T_PLUS_PLUS_EVERGLADES)
+    public static GTPPEverglades instance;
+
+    // Dark World Handler
+    protected static volatile BiomeEverglades Everglades_Biome;
+    protected static volatile DimensionEverglades Everglades_Dimension;
+
+    // Pre-Init
+    @Mod.EventHandler
+    public void preInit(final FMLPreInitializationEvent event) {
+        Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION);
+
+        // Setup
+        setVars(event);
+
+        setEvergladesBiome(new BiomeEverglades());
+        Everglades_Dimension = new DimensionEverglades();
+
+        // Load Dark World
+        getEvergladesBiome().instance = instance;
+        Everglades_Dimension.instance = instance;
+        getEvergladesBiome().preInit(event);
+
+        // Load/Set Custom Ore Gen
+        HandlerGT.sCustomWorldgenFile = new GTPPConfig(
+            new Configuration(
+                new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
+    }
+
+    @EventHandler
+    public void load(final FMLInitializationEvent e) {
+        Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION);
+
+        // Load World and Biome
+        GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE);
+        getEvergladesBiome().load();
+        Everglades_Dimension.load();
+        addToVoidMinerDrops();
+    }
+
+    public static synchronized void GenerateOreMaterials() {
+        MaterialGenerator.generateOreMaterial(MaterialsOres.CROCROITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.GEIKIELITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.NICHROMITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.TITANITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.ZIMBABWEITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRCONILITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.GADOLINITE_CE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.GADOLINITE_Y);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.LEPERSONNITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.SAMARSKITE_Y);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.SAMARSKITE_YB);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.XENOTIME);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.YTTRIAITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.YTTRIALITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.YTTROCERITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRCON);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.POLYCRASE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRCOPHYLLITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRKELITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.LANTHANITE_LA);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.LANTHANITE_CE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.LANTHANITE_ND);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_Y);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_CD);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_LA);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_ND);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.HIBONITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.CERITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.FLUORCAPHITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.FLORENCITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.CRYOLITE);
+
+        MaterialGenerator.generateOreMaterial(MaterialsOres.LAUTARITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.LAFOSSAITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.DEMICHELEITE_BR);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.COMANCHEITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.PERROUDITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.HONEAITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.ALBURNITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.MIESSIITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.KASHINITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.IRARSITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.GREENOCKITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.RADIOBARITE);
+        MaterialGenerator.generateOreMaterial(MaterialsOres.DEEP_EARTH_REACTOR_FUEL_DEPOSIT);
+
+    }
+
+    protected synchronized void setVars(FMLPreInitializationEvent event) {
+        // Init WorldGen config.
+        HandlerGT.sCustomWorldgenFile = new GTPPConfig(
+            new Configuration(
+                new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
+
+        if (DimensionManager.isDimensionRegistered(DimensionEverglades.DIMID)) {
+            DimensionEverglades.DIMID = DimensionManager.getNextFreeDimId();
+        }
+
+        /*
+         * Set World Generation Values
+         */
+        WorldGen_Ores.generateValidOreVeins();
+        WorldGen_GT_Base.oreveinPercentage = 64;
+        WorldGen_GT_Base.oreveinAttempts = 16;
+        WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4;
+        if (PreloaderCore.DEBUG_MODE || GTPPCore.DEVENV) {
+            WorldGen_GT_Base.debugWorldGen = true;
+        }
+        DarkWorldContentLoader.run();
+    }
+
+    public void addToVoidMinerDrops() {
+        for (WorldGen_GT_Ore_Layer t : WorldGen_Ores.validOreveins.values()) {
+            addVMDrop(t.mPrimaryMeta, 0, t.mWeight);
+            addVMDrop(t.mSecondaryMeta, 0, t.mWeight);
+            addVMDrop(t.mBetweenMeta, 0, t.mWeight / 8f);
+            addVMDrop(t.mSporadicMeta, 0, t.mWeight / 8f);
+        }
+    }
+
+    public void addVMDrop(Block block, int meta, float weight) {
+        MTEVoidMinerBase.addBlockToDimensionList(GTPPCore.EVERGLADES_ID, block, meta, weight);
+    }
+
+    @EventHandler
+    public void serverLoad(FMLServerStartingEvent event) {
+        getEvergladesBiome().serverLoad(event);
+    }
+
+    @EventHandler
+    public static void postInit(final FMLPostInitializationEvent e) {
+        Logger.INFO("Finished loading Everglades plugin for GT++.");
+    }
+
+    public static synchronized BiomeEverglades getEvergladesBiome() {
+        return Everglades_Biome;
+    }
+
+    public static synchronized void setEvergladesBiome(BiomeEverglades darkWorld_Biome) {
+        Everglades_Biome = darkWorld_Biome;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+}
diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java
deleted file mode 100644
index 3cb8893b16..0000000000
--- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package gtPlusPlus.everglades;
-
-import static gregtech.api.enums.Mods.GTPlusPlusEverglades;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-
-import net.minecraft.block.Block;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.config.Configuration;
-
-import com.github.bartimaeusnek.crossmod.galacticgreg.GT_TileEntity_VoidMiner_Base;
-
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.Mods;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.CORE.Everglades;
-import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.material.ORES;
-import gtPlusPlus.everglades.biome.Biome_Everglades;
-import gtPlusPlus.everglades.block.DarkWorldContentLoader;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
-import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base;
-import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer;
-import gtPlusPlus.everglades.gen.gt.WorldGen_Ores;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
-import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config;
-
-@Mod(
-    modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES,
-    name = Everglades.NAME,
-    version = Everglades.VERSION,
-    dependencies = "required-after:Forge; after:dreamcraft; after:IC2; required-after:gregtech; required-after:miscutils;")
-public class GTplusplus_Everglades implements ActionListener {
-
-    // Mod Instance
-    @Mod.Instance(Mods.Names.G_T_PLUS_PLUS_EVERGLADES)
-    public static GTplusplus_Everglades instance;
-
-    // Dark World Handler
-    protected static volatile Biome_Everglades Everglades_Biome;
-    protected static volatile Dimension_Everglades Everglades_Dimension;
-
-    // Pre-Init
-    @Mod.EventHandler
-    public void preInit(final FMLPreInitializationEvent event) {
-        Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION);
-
-        // Setup
-        setVars(event);
-
-        setEvergladesBiome(new Biome_Everglades());
-        Everglades_Dimension = new Dimension_Everglades();
-
-        // Load Dark World
-        getEvergladesBiome().instance = instance;
-        Everglades_Dimension.instance = instance;
-        getEvergladesBiome().preInit(event);
-
-        // Load/Set Custom Ore Gen
-        HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(
-            new Configuration(
-                new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
-    }
-
-    @EventHandler
-    public void load(final FMLInitializationEvent e) {
-        Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION);
-
-        // Load World and Biome
-        GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE);
-        getEvergladesBiome().load();
-        Everglades_Dimension.load();
-        addToVoidMinerDrops();
-    }
-
-    public static synchronized void GenerateOreMaterials() {
-        MaterialGenerator.generateOreMaterial(ORES.CROCROITE);
-        MaterialGenerator.generateOreMaterial(ORES.GEIKIELITE);
-        MaterialGenerator.generateOreMaterial(ORES.NICHROMITE);
-        MaterialGenerator.generateOreMaterial(ORES.TITANITE);
-        MaterialGenerator.generateOreMaterial(ORES.ZIMBABWEITE);
-        MaterialGenerator.generateOreMaterial(ORES.ZIRCONILITE);
-        MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_CE);
-        MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_Y);
-        MaterialGenerator.generateOreMaterial(ORES.LEPERSONNITE);
-        MaterialGenerator.generateOreMaterial(ORES.SAMARSKITE_Y);
-        MaterialGenerator.generateOreMaterial(ORES.SAMARSKITE_YB);
-        MaterialGenerator.generateOreMaterial(ORES.XENOTIME);
-        MaterialGenerator.generateOreMaterial(ORES.YTTRIAITE);
-        MaterialGenerator.generateOreMaterial(ORES.YTTRIALITE);
-        MaterialGenerator.generateOreMaterial(ORES.YTTROCERITE);
-        MaterialGenerator.generateOreMaterial(ORES.ZIRCON);
-        MaterialGenerator.generateOreMaterial(ORES.POLYCRASE);
-        MaterialGenerator.generateOreMaterial(ORES.ZIRCOPHYLLITE);
-        MaterialGenerator.generateOreMaterial(ORES.ZIRKELITE);
-        MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_LA);
-        MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_CE);
-        MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_ND);
-        MaterialGenerator.generateOreMaterial(ORES.AGARDITE_Y);
-        MaterialGenerator.generateOreMaterial(ORES.AGARDITE_CD);
-        MaterialGenerator.generateOreMaterial(ORES.AGARDITE_LA);
-        MaterialGenerator.generateOreMaterial(ORES.AGARDITE_ND);
-        MaterialGenerator.generateOreMaterial(ORES.HIBONITE);
-        MaterialGenerator.generateOreMaterial(ORES.CERITE);
-        MaterialGenerator.generateOreMaterial(ORES.FLUORCAPHITE);
-        MaterialGenerator.generateOreMaterial(ORES.FLORENCITE);
-        MaterialGenerator.generateOreMaterial(ORES.CRYOLITE);
-
-        MaterialGenerator.generateOreMaterial(ORES.LAUTARITE);
-        MaterialGenerator.generateOreMaterial(ORES.LAFOSSAITE);
-        MaterialGenerator.generateOreMaterial(ORES.DEMICHELEITE_BR);
-        MaterialGenerator.generateOreMaterial(ORES.COMANCHEITE);
-        MaterialGenerator.generateOreMaterial(ORES.PERROUDITE);
-        MaterialGenerator.generateOreMaterial(ORES.HONEAITE);
-        MaterialGenerator.generateOreMaterial(ORES.ALBURNITE);
-        MaterialGenerator.generateOreMaterial(ORES.MIESSIITE);
-        MaterialGenerator.generateOreMaterial(ORES.KASHINITE);
-        MaterialGenerator.generateOreMaterial(ORES.IRARSITE);
-        MaterialGenerator.generateOreMaterial(ORES.GREENOCKITE);
-        MaterialGenerator.generateOreMaterial(ORES.RADIOBARITE);
-        MaterialGenerator.generateOreMaterial(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT);
-
-    }
-
-    protected synchronized void setVars(FMLPreInitializationEvent event) {
-        // Init WorldGen config.
-        HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(
-            new Configuration(
-                new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
-
-        if (DimensionManager.isDimensionRegistered(Dimension_Everglades.DIMID)) {
-            Dimension_Everglades.DIMID = DimensionManager.getNextFreeDimId();
-        }
-
-        /*
-         * Set World Generation Values
-         */
-        WorldGen_Ores.generateValidOreVeins();
-        WorldGen_GT_Base.oreveinPercentage = 64;
-        WorldGen_GT_Base.oreveinAttempts = 16;
-        WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4;
-        if (CORE_Preloader.DEBUG_MODE || CORE.DEVENV) {
-            WorldGen_GT_Base.debugWorldGen = true;
-        }
-        DarkWorldContentLoader.run();
-    }
-
-    public void addToVoidMinerDrops() {
-        for (WorldGen_GT_Ore_Layer t : WorldGen_Ores.validOreveins.values()) {
-            addVMDrop(t.mPrimaryMeta, 0, t.mWeight);
-            addVMDrop(t.mSecondaryMeta, 0, t.mWeight);
-            addVMDrop(t.mBetweenMeta, 0, t.mWeight / 8f);
-            addVMDrop(t.mSporadicMeta, 0, t.mWeight / 8f);
-        }
-    }
-
-    public void addVMDrop(Block block, int meta, float weight) {
-        GT_TileEntity_VoidMiner_Base.addBlockToDimensionList(CORE.EVERGLADES_ID, block, meta, weight);
-    }
-
-    @EventHandler
-    public void serverLoad(FMLServerStartingEvent event) {
-        getEvergladesBiome().serverLoad(event);
-    }
-
-    @EventHandler
-    public static void postInit(final FMLPostInitializationEvent e) {
-        Logger.INFO("Finished loading Everglades plugin for GT++.");
-    }
-
-    public static synchronized Biome_Everglades getEvergladesBiome() {
-        return Everglades_Biome;
-    }
-
-    public static synchronized void setEvergladesBiome(Biome_Everglades darkWorld_Biome) {
-        Everglades_Biome = darkWorld_Biome;
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent arg0) {
-        // TODO Auto-generated method stub
-
-    }
-}
diff --git a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java
index f9b57b14c8..8394bd8385 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java
@@ -14,16 +14,16 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.everglades.dimension.DimensionEverglades;
 
-public class Biome_Everglades {
+public class BiomeEverglades {
 
     public static BiomeGenEverglades biome = new BiomeGenEverglades();
 
     public Object instance;
 
-    public Biome_Everglades() {}
+    public BiomeEverglades() {}
 
     public void load() {
         BiomeDictionary.registerBiomeType(biome, BiomeDictionary.Type.DEAD);
@@ -38,14 +38,14 @@ public class Biome_Everglades {
 
         @SuppressWarnings("unchecked")
         public BiomeGenEverglades() {
-            super(CORE.EVERGLADESBIOME_ID);
+            super(GTPPCore.EVERGLADESBIOME_ID);
             // this.setBiomeID();
-            this.theBiomeDecorator = new BiomeGenerator_Custom();
+            this.theBiomeDecorator = new CustomBiomeGenerator();
             this.theBiomeDecorator.treesPerChunk = 10;
             // Logger.INFO("Dark World Temperature Category: "+getTempCategory());
             this.setBiomeName("Toxic Everglades");
-            this.topBlock = Dimension_Everglades.blockTopLayer;
-            this.fillerBlock = Dimension_Everglades.blockSecondLayer;
+            this.topBlock = DimensionEverglades.blockTopLayer;
+            this.fillerBlock = DimensionEverglades.blockSecondLayer;
             this.enableRain = true;
             this.enableSnow = false;
             this.rainfall = 0.7F;
diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java
index fce5efca36..4df290b560 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java
@@ -46,26 +46,26 @@ import net.minecraftforge.event.terraingen.OreGenEvent;
 import net.minecraftforge.event.terraingen.TerrainGen;
 
 import gtPlusPlus.everglades.gen.WorldGenDeadLilly;
-import gtPlusPlus.everglades.gen.WorldGenMinable_Custom;
+import gtPlusPlus.everglades.gen.WorldGenMinableCustom;
 
-public class BiomeGenerator_Custom extends BiomeDecorator {
+public class CustomBiomeGenerator extends BiomeDecorator {
 
     public WorldGenerator fluoriteGen;
 
-    public BiomeGenerator_Custom() {
+    public CustomBiomeGenerator() {
         // Basic Blocks
-        this.sandGen = new WorldGenMinable_Custom(Blocks.sand, 12);
-        this.gravelAsSandGen = new WorldGenMinable_Custom(Blocks.gravel, 8);
-        this.dirtGen = new WorldGenMinable_Custom(Blocks.dirt, 32);
-        this.gravelGen = new WorldGenMinable_Custom(Blocks.gravel, 12);
+        this.sandGen = new WorldGenMinableCustom(Blocks.sand, 12);
+        this.gravelAsSandGen = new WorldGenMinableCustom(Blocks.gravel, 8);
+        this.dirtGen = new WorldGenMinableCustom(Blocks.dirt, 32);
+        this.gravelGen = new WorldGenMinableCustom(Blocks.gravel, 12);
 
         // Oregen
-        this.coalGen = new WorldGenMinable_Custom(Blocks.coal_ore, 16);
-        this.ironGen = new WorldGenMinable_Custom(Blocks.iron_ore, 12);
-        this.goldGen = new WorldGenMinable_Custom(Blocks.gold_ore, 12);
-        this.redstoneGen = new WorldGenMinable_Custom(Blocks.redstone_ore, 10);
-        this.diamondGen = new WorldGenMinable_Custom(Blocks.diamond_ore, 12);
-        this.lapisGen = new WorldGenMinable_Custom(Blocks.lapis_ore, 8);
+        this.coalGen = new WorldGenMinableCustom(Blocks.coal_ore, 16);
+        this.ironGen = new WorldGenMinableCustom(Blocks.iron_ore, 12);
+        this.goldGen = new WorldGenMinableCustom(Blocks.gold_ore, 12);
+        this.redstoneGen = new WorldGenMinableCustom(Blocks.redstone_ore, 10);
+        this.diamondGen = new WorldGenMinableCustom(Blocks.diamond_ore, 12);
+        this.lapisGen = new WorldGenMinableCustom(Blocks.lapis_ore, 8);
 
         // Nature
         this.yellowFlowerGen = new WorldGenFlowers(Blocks.yellow_flower);
diff --git a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java
index fe799fbe42..e0c96d88b4 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java
@@ -6,7 +6,7 @@ import net.minecraft.world.gen.layer.IntCache;
 
 public class GenLayerBiomes extends GenLayer {
 
-    protected BiomeGenBase[] allowedBiomes = { Biome_Everglades.biome, };
+    protected BiomeGenBase[] allowedBiomes = { BiomeEverglades.biome, };
 
     public GenLayerBiomes(long seed) {
         super(seed);
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
index eafa67980d..16ad852e75 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
@@ -21,9 +21,9 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+import gtPlusPlus.everglades.dimension.DimensionEverglades;
 import gtPlusPlus.everglades.world.TeleporterDimensionMod;
 
 public class BlockEvergladesPortal extends BlockBreakable implements ITileTooltip {
@@ -75,7 +75,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
 
         for (BlockPos side : portal.getSurroundingBlocks()) {
             Block b = side.getBlockAtPos();
-            if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) {
+            if (b == DimensionEverglades.blockPortalFrame || b == DimensionEverglades.portalBlock) {
                 blockCount++;
             }
         }
@@ -135,12 +135,12 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
     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_Everglades.blockPortalFrame
-            || par1World.getBlock(par2 + 1, par3, par4) == Dimension_Everglades.blockPortalFrame) {
+        if (par1World.getBlock(par2 - 1, par3, par4) == DimensionEverglades.blockPortalFrame
+            || par1World.getBlock(par2 + 1, par3, par4) == DimensionEverglades.blockPortalFrame) {
             b0 = 1;
         }
-        if (par1World.getBlock(par2, par3, par4 - 1) == Dimension_Everglades.blockPortalFrame
-            || par1World.getBlock(par2, par3, par4 + 1) == Dimension_Everglades.blockPortalFrame) {
+        if (par1World.getBlock(par2, par3, par4 - 1) == DimensionEverglades.blockPortalFrame
+            || par1World.getBlock(par2, par3, par4 + 1) == DimensionEverglades.blockPortalFrame) {
             b1 = 1;
         }
         if (b0 == b1) {
@@ -158,7 +158,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
                     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_Everglades.blockPortalFrame) {
+                            if (j1 != DimensionEverglades.blockPortalFrame) {
                                 return false;
                             }
                         }
@@ -189,7 +189,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
         World par1World = portal.world;
         for (BlockPos side : portal.getSurroundingBlocks()) {
             Block b = side.getBlockAtPos();
-            if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) {
+            if (b == DimensionEverglades.blockPortalFrame || b == DimensionEverglades.portalBlock) {
                 blockCount++;
             }
         }
@@ -208,22 +208,22 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
         for (i1 = y; par1World.getBlock(x, i1 - 1, z) == this; --i1) {
             ;
         }
-        if (par1World.getBlock(x, i1 - 1, z) != Dimension_Everglades.blockPortalFrame) {
+        if (par1World.getBlock(x, i1 - 1, z) != DimensionEverglades.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_Everglades.blockPortalFrame) {
+            if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == DimensionEverglades.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_Everglades.blockPortalFrame
+                    if ((par1World.getBlock(x + b0, y, z + b1) != DimensionEverglades.blockPortalFrame
                         || par1World.getBlock(x - b0, y, z - b1) != this)
-                        && (par1World.getBlock(x - b0, y, z - b1) != Dimension_Everglades.blockPortalFrame
+                        && (par1World.getBlock(x - b0, y, z - b1) != DimensionEverglades.blockPortalFrame
                             || par1World.getBlock(x + b0, y, z + b1) != this)) {
                         par1World.setBlockToAir(x, y, z);
                     }
@@ -288,14 +288,14 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
             && ((par5Entity instanceof EntityPlayerMP thePlayer))) {
             if (thePlayer.timeUntilPortal > 0) {
                 thePlayer.timeUntilPortal = 100;
-            } else if (thePlayer.dimension != Dimension_Everglades.DIMID) {
+            } else if (thePlayer.dimension != DimensionEverglades.DIMID) {
                 thePlayer.timeUntilPortal = 100;
                 thePlayer.mcServer.getConfigurationManager()
                     .transferPlayerToDimension(
                         thePlayer,
-                        Dimension_Everglades.DIMID,
+                        DimensionEverglades.DIMID,
                         new TeleporterDimensionMod(
-                            thePlayer.mcServer.worldServerForDimension(Dimension_Everglades.DIMID)));
+                            thePlayer.mcServer.worldServerForDimension(DimensionEverglades.DIMID)));
             } else {
                 thePlayer.timeUntilPortal = 100;
                 thePlayer.mcServer.getConfigurationManager()
@@ -322,33 +322,33 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
      * A randomly called display update to be able to add particles or other items for display
      */
     public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
-        if (CORE.RANDOM.nextInt(100) == 0) {
+        if (GTPPCore.RANDOM.nextInt(100) == 0) {
             par1World.playSound(
                 par2 + 0.5D,
                 par3 + 0.5D,
                 par4 + 0.5D,
                 "portal.portal",
                 0.5F,
-                CORE.RANDOM.nextFloat() * 0.4F + 0.8F,
+                GTPPCore.RANDOM.nextFloat() * 0.4F + 0.8F,
                 false);
         }
         for (int l = 0; l < 4; ++l) {
-            double d0 = par2 + CORE.RANDOM.nextFloat();
-            double d1 = par3 + CORE.RANDOM.nextFloat();
-            double d2 = par4 + CORE.RANDOM.nextFloat();
+            double d0 = par2 + GTPPCore.RANDOM.nextFloat();
+            double d1 = par3 + GTPPCore.RANDOM.nextFloat();
+            double d2 = par4 + GTPPCore.RANDOM.nextFloat();
             double d3 = 0.0D;
             double d4 = 0.0D;
             double d5 = 0.0D;
-            int i1 = CORE.RANDOM.nextInt(2) * 2 - 1;
-            d3 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D;
-            d4 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D;
-            d5 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D;
+            int i1 = GTPPCore.RANDOM.nextInt(2) * 2 - 1;
+            d3 = (GTPPCore.RANDOM.nextFloat() - 0.5D) * 0.5D;
+            d4 = (GTPPCore.RANDOM.nextFloat() - 0.5D) * 0.5D;
+            d5 = (GTPPCore.RANDOM.nextFloat() - 0.5D) * 0.5D;
             if (par1World.getBlock(par2 - 1, par3, par4) != this && par1World.getBlock(par2 + 1, par3, par4) != this) {
                 d0 = par2 + 0.5D + 0.25D * i1;
-                d3 = CORE.RANDOM.nextFloat() * 2.0F * i1;
+                d3 = GTPPCore.RANDOM.nextFloat() * 2.0F * i1;
             } else {
                 d2 = par4 + 0.5D + 0.25D * i1;
-                d5 = CORE.RANDOM.nextFloat() * 2.0F * i1;
+                d5 = GTPPCore.RANDOM.nextFloat() * 2.0F * i1;
             }
             par1World.spawnParticle("reddust", d0 + 0.1D, d1, d2, d3, d4, d5);
             par1World.spawnParticle("smoke", d0, d1 + 0.1D, d2, 0, 0, 0);
diff --git a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java
index 7cbc1cb5e0..dd6a35d008 100644
--- a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java
+++ b/